Merge remote-tracking branch 'mst/for_anthony' into staging

This commit is contained in:
Anthony Liguori 2011-08-04 17:15:22 -05:00
commit 81e34a2401
10 changed files with 79 additions and 31 deletions

View file

@ -1073,6 +1073,6 @@ void virtio_net_exit(VirtIODevice *vdev)
qemu_bh_delete(n->tx_bh);
}
virtio_cleanup(&n->vdev);
qemu_del_vlan_client(&n->nic->nc);
virtio_cleanup(&n->vdev);
}