diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2012-05-16 18:50:10 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-21 15:40:51 -0500 |
| commit | 4accd107d0fd4a6fd7d2ad4f3365c67623834262 (patch) | |
| tree | 113510c7accdc9601121b648d6390a03dc83ebbd /hw/xen_platform.c | |
| parent | a340046614644a8958883954b96e92a87a5e78f7 (diff) | |
| download | focaccia-qemu-4accd107d0fd4a6fd7d2ad4f3365c67623834262.tar.gz focaccia-qemu-4accd107d0fd4a6fd7d2ad4f3365c67623834262.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. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/xen_platform.c')
| -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 a9c52a6e36..0214f370b2 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); } } |