ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-pci: fix hot unplug. 

Hot unplug failed because it tried to free the virtio device two times.

This fix the issue by removing the call to virtio_bus_destroy_device.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Message-id: 1363624648-16906-4-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
KONRAD Frederic 2013-03-18 17:37:20 +01:00 committed by Anthony Liguori
parent cbd19063e7
commit 10479a8089
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/virtio-pci.c
View File

@ -1412,13 +1412,6 @@ static void virtio_pci_device_plugged(DeviceState *d)
proxy->host_features); proxy->host_features);
} }
/* This is called by virtio-bus just before the device is unplugged. */
static void virtio_pci_device_unplug(DeviceState *d)
{
VirtIOPCIProxy *dev = VIRTIO_PCI(d);
virtio_pci_stop_ioeventfd(dev);
}
static int virtio_pci_init(PCIDevice *pci_dev) static int virtio_pci_init(PCIDevice *pci_dev)
{ {
VirtIOPCIProxy *dev = VIRTIO_PCI(pci_dev); VirtIOPCIProxy *dev = VIRTIO_PCI(pci_dev);
@ -1433,10 +1426,7 @@ static int virtio_pci_init(PCIDevice *pci_dev)
static void virtio_pci_exit(PCIDevice *pci_dev) static void virtio_pci_exit(PCIDevice *pci_dev)
{ {
VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev);
VirtioBusState *bus = VIRTIO_BUS(&proxy->bus); virtio_pci_stop_ioeventfd(proxy);
BusState *qbus = BUS(&proxy->bus);
virtio_bus_destroy_device(bus);
qbus_free(qbus);
virtio_exit_pci(pci_dev); virtio_exit_pci(pci_dev);
} }
@ -1503,7 +1493,6 @@ static void virtio_pci_bus_class_init(ObjectClass *klass, void *data)
k->set_guest_notifiers = virtio_pci_set_guest_notifiers; k->set_guest_notifiers = virtio_pci_set_guest_notifiers;
k->vmstate_change = virtio_pci_vmstate_change; k->vmstate_change = virtio_pci_vmstate_change;
k->device_plugged = virtio_pci_device_plugged; k->device_plugged = virtio_pci_device_plugged;
k->device_unplug = virtio_pci_device_unplug;
} }
static const TypeInfo virtio_pci_bus_info = { static const TypeInfo virtio_pci_bus_info = {