diff options
| author |   Anthony PERARD <anthony.perard@citrix.com> | 2012-05-17 10:31:20 +0000 |
|---|---|---|
| committer |   Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-05-17 10:52:29 +0000 |
| commit | a4f1a7589ad0926fc8db1a6c56d1c3e015be565c (patch) | |
| tree | 247e008a2ba1081d0a02b8667cadff15b7f6a211 | |
| parent | xen_disk: properly update stats in ioreq_release() (diff) | |
| download | qemu-kvm-a4f1a7589ad0926fc8db1a6c56d1c3e015be565c.tar.gz qemu-kvm-a4f1a7589ad0926fc8db1a6c56d1c3e015be565c.tar.bz2 qemu-kvm-a4f1a7589ad0926fc8db1a6c56d1c3e015be565c.zip | |
xen: Fix PV-on-HVM
In the context of PV-on-HVM under Xen, the emulated nics are supposed to be
unplug before the guest drivers are initialized, when the guest write to a
specific IO port.
Without this patch, the guest end up with two nics with the same MAC, the
emulated nic and the PV nic.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/xen_platform.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/xen_platform.c b/hw/xen_platform.c index a9c52a6e3..0214f370b 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -87,7 +87,10 @@ static void unplug_nic(PCIBus *b, PCIDevice *d) { if (pci_get_word(d->config + PCI_CLASS_DEVICE) == PCI_CLASS_NETWORK_ETHERNET) { - qdev_unplug(&(d->qdev), NULL); + /* Until qdev_free includes a call to object_unparent, we call it here + */ + object_unparent(&d->qdev.parent_obj); + qdev_free(&d->qdev); } } |