* [Qemu-devel] [PATCH 1.1 V2] xen: Fix PV-on-HVM
@ 2012-05-16 17:50 Anthony PERARD
2012-05-17 10:35 ` Stefano Stabellini
0 siblings, 1 reply; 3+ messages in thread
From: Anthony PERARD @ 2012-05-16 17:50 UTC (permalink / raw)
To: QEMU-devel; +Cc: Anthony PERARD, Stefano Stabellini, Xen Devel
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>
---
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 a9c52a6..0214f37 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);
}
}
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH 1.1 V2] xen: Fix PV-on-HVM
2012-05-16 17:50 [Qemu-devel] [PATCH 1.1 V2] xen: Fix PV-on-HVM Anthony PERARD
@ 2012-05-17 10:35 ` Stefano Stabellini
2012-05-17 10:50 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Stefano Stabellini @ 2012-05-17 10:35 UTC (permalink / raw)
To: Anthony PERARD
Cc: Stefano Stabellini, Michael S. Tsirkin, QEMU-devel, Xen Devel,
Anthony Liguori, Paolo Bonzini
On Wed, 16 May 2012, Anthony PERARD wrote:
> 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>
> ---
I think that the patch is correct and a good candidate for rc3. Any
comments?
> 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 a9c52a6..0214f37 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);
> }
> }
>
> --
> Anthony PERARD
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH 1.1 V2] xen: Fix PV-on-HVM
2012-05-17 10:35 ` Stefano Stabellini
@ 2012-05-17 10:50 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2012-05-17 10:50 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Anthony PERARD, Michael S. Tsirkin, QEMU-devel, Anthony Liguori,
Xen Devel
Il 17/05/2012 12:35, Stefano Stabellini ha scritto:
> On Wed, 16 May 2012, Anthony PERARD wrote:
>> 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>
>> ---
>
> I think that the patch is correct and a good candidate for rc3. Any
> comments?
Yes, it's certainly nice when patches become as simple as this one. :)
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>
>> 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 a9c52a6..0214f37 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);
>> }
>> }
>>
>> --
>> Anthony PERARD
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-17 10:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-16 17:50 [Qemu-devel] [PATCH 1.1 V2] xen: Fix PV-on-HVM Anthony PERARD
2012-05-17 10:35 ` Stefano Stabellini
2012-05-17 10:50 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).