* [Qemu-devel] [PATCH] xen: piix reuse pci generic class init function
@ 2016-04-03 8:52 Michael S. Tsirkin
2016-04-06 23:56 ` Stefano Stabellini
0 siblings, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2016-04-03 8:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefano Stabellini, John Snow, qemu-block
piix3_ide_xen_class_init is identical to piix3_ide_class_init
except it's buggy as it does not set exit and does not disable
hotplug properly.
Switch to the generic one.
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/ide/piix.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index df46147..0a4cbcb 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -258,22 +258,10 @@ static const TypeInfo piix3_ide_info = {
.class_init = piix3_ide_class_init,
};
-static void piix3_ide_xen_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
- PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
-
- k->realize = pci_piix_ide_realize;
- k->vendor_id = PCI_VENDOR_ID_INTEL;
- k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
- k->class_id = PCI_CLASS_STORAGE_IDE;
- set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
-}
-
static const TypeInfo piix3_ide_xen_info = {
.name = "piix3-ide-xen",
.parent = TYPE_PCI_IDE,
- .class_init = piix3_ide_xen_class_init,
+ .class_init = piix3_ide_class_init,
};
static void piix4_ide_class_init(ObjectClass *klass, void *data)
--
MST
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] xen: piix reuse pci generic class init function
2016-04-03 8:52 [Qemu-devel] [PATCH] xen: piix reuse pci generic class init function Michael S. Tsirkin
@ 2016-04-06 23:56 ` Stefano Stabellini
2016-04-07 3:48 ` Michael S. Tsirkin
0 siblings, 1 reply; 5+ messages in thread
From: Stefano Stabellini @ 2016-04-06 23:56 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: Stefano Stabellini, John Snow, qemu-devel, qemu-block
On Sun, 3 Apr 2016, Michael S. Tsirkin wrote:
> piix3_ide_xen_class_init is identical to piix3_ide_class_init
> except it's buggy as it does not set exit and does not disable
> hotplug properly.
>
> Switch to the generic one.
>
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Hey John,
are you going to take the patch or do you want me to handle it?
Cheers,
Stefano
> hw/ide/piix.c | 14 +-------------
> 1 file changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/hw/ide/piix.c b/hw/ide/piix.c
> index df46147..0a4cbcb 100644
> --- a/hw/ide/piix.c
> +++ b/hw/ide/piix.c
> @@ -258,22 +258,10 @@ static const TypeInfo piix3_ide_info = {
> .class_init = piix3_ide_class_init,
> };
>
> -static void piix3_ide_xen_class_init(ObjectClass *klass, void *data)
> -{
> - DeviceClass *dc = DEVICE_CLASS(klass);
> - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> -
> - k->realize = pci_piix_ide_realize;
> - k->vendor_id = PCI_VENDOR_ID_INTEL;
> - k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
> - k->class_id = PCI_CLASS_STORAGE_IDE;
> - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> -}
> -
> static const TypeInfo piix3_ide_xen_info = {
> .name = "piix3-ide-xen",
> .parent = TYPE_PCI_IDE,
> - .class_init = piix3_ide_xen_class_init,
> + .class_init = piix3_ide_class_init,
> };
>
> static void piix4_ide_class_init(ObjectClass *klass, void *data)
> --
> MST
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] xen: piix reuse pci generic class init function
2016-04-06 23:56 ` Stefano Stabellini
@ 2016-04-07 3:48 ` Michael S. Tsirkin
2016-04-07 13:56 ` John Snow
0 siblings, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2016-04-07 3:48 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: John Snow, qemu-devel, qemu-block
On Wed, Apr 06, 2016 at 04:56:12PM -0700, Stefano Stabellini wrote:
> On Sun, 3 Apr 2016, Michael S. Tsirkin wrote:
> > piix3_ide_xen_class_init is identical to piix3_ide_class_init
> > except it's buggy as it does not set exit and does not disable
> > hotplug properly.
> >
> > Switch to the generic one.
> >
> > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> Hey John,
>
> are you going to take the patch or do you want me to handle it?
>
> Cheers,
>
> Stefano
it's in my tree already.
>
> > hw/ide/piix.c | 14 +-------------
> > 1 file changed, 1 insertion(+), 13 deletions(-)
> >
> > diff --git a/hw/ide/piix.c b/hw/ide/piix.c
> > index df46147..0a4cbcb 100644
> > --- a/hw/ide/piix.c
> > +++ b/hw/ide/piix.c
> > @@ -258,22 +258,10 @@ static const TypeInfo piix3_ide_info = {
> > .class_init = piix3_ide_class_init,
> > };
> >
> > -static void piix3_ide_xen_class_init(ObjectClass *klass, void *data)
> > -{
> > - DeviceClass *dc = DEVICE_CLASS(klass);
> > - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> > -
> > - k->realize = pci_piix_ide_realize;
> > - k->vendor_id = PCI_VENDOR_ID_INTEL;
> > - k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
> > - k->class_id = PCI_CLASS_STORAGE_IDE;
> > - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> > -}
> > -
> > static const TypeInfo piix3_ide_xen_info = {
> > .name = "piix3-ide-xen",
> > .parent = TYPE_PCI_IDE,
> > - .class_init = piix3_ide_xen_class_init,
> > + .class_init = piix3_ide_class_init,
> > };
> >
> > static void piix4_ide_class_init(ObjectClass *klass, void *data)
> > --
> > MST
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] xen: piix reuse pci generic class init function
2016-04-07 3:48 ` Michael S. Tsirkin
@ 2016-04-07 13:56 ` John Snow
2016-04-07 16:58 ` Stefano Stabellini
0 siblings, 1 reply; 5+ messages in thread
From: John Snow @ 2016-04-07 13:56 UTC (permalink / raw)
To: Michael S. Tsirkin, Stefano Stabellini; +Cc: qemu-devel, qemu-block
On 04/06/2016 11:48 PM, Michael S. Tsirkin wrote:
> On Wed, Apr 06, 2016 at 04:56:12PM -0700, Stefano Stabellini wrote:
>> On Sun, 3 Apr 2016, Michael S. Tsirkin wrote:
>>> piix3_ide_xen_class_init is identical to piix3_ide_class_init
>>> except it's buggy as it does not set exit and does not disable
>>> hotplug properly.
>>>
>>> Switch to the generic one.
>>>
>>> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>
>> Hey John,
>>
>> are you going to take the patch or do you want me to handle it?
>>
>> Cheers,
>>
>> Stefano
>
> it's in my tree already.
>
Thank you. Apologies for being asleep at the wheel.
I've been somewhat distracted working on something else recently.
I'll trust your judgment when it comes to XEN.
Thanks,
--js
>>
>>> hw/ide/piix.c | 14 +-------------
>>> 1 file changed, 1 insertion(+), 13 deletions(-)
>>>
>>> diff --git a/hw/ide/piix.c b/hw/ide/piix.c
>>> index df46147..0a4cbcb 100644
>>> --- a/hw/ide/piix.c
>>> +++ b/hw/ide/piix.c
>>> @@ -258,22 +258,10 @@ static const TypeInfo piix3_ide_info = {
>>> .class_init = piix3_ide_class_init,
>>> };
>>>
>>> -static void piix3_ide_xen_class_init(ObjectClass *klass, void *data)
>>> -{
>>> - DeviceClass *dc = DEVICE_CLASS(klass);
>>> - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
>>> -
>>> - k->realize = pci_piix_ide_realize;
>>> - k->vendor_id = PCI_VENDOR_ID_INTEL;
>>> - k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
>>> - k->class_id = PCI_CLASS_STORAGE_IDE;
>>> - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>>> -}
>>> -
>>> static const TypeInfo piix3_ide_xen_info = {
>>> .name = "piix3-ide-xen",
>>> .parent = TYPE_PCI_IDE,
>>> - .class_init = piix3_ide_xen_class_init,
>>> + .class_init = piix3_ide_class_init,
>>> };
>>>
>>> static void piix4_ide_class_init(ObjectClass *klass, void *data)
>>> --
>>> MST
>>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] xen: piix reuse pci generic class init function
2016-04-07 13:56 ` John Snow
@ 2016-04-07 16:58 ` Stefano Stabellini
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Stabellini @ 2016-04-07 16:58 UTC (permalink / raw)
To: John Snow; +Cc: Stefano Stabellini, qemu-devel, qemu-block, Michael S. Tsirkin
On Thu, 7 Apr 2016, John Snow wrote:
> > On Wed, Apr 06, 2016 at 04:56:12PM -0700, Stefano Stabellini wrote:
> >> On Sun, 3 Apr 2016, Michael S. Tsirkin wrote:
> >>> piix3_ide_xen_class_init is identical to piix3_ide_class_init
> >>> except it's buggy as it does not set exit and does not disable
> >>> hotplug properly.
> >>>
> >>> Switch to the generic one.
> >>>
> >>> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> >>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >>
> >> Hey John,
> >>
> >> are you going to take the patch or do you want me to handle it?
> >>
> >> Cheers,
> >>
> >> Stefano
> >
> > it's in my tree already.
> >
>
> Thank you. Apologies for being asleep at the wheel.
> I've been somewhat distracted working on something else recently.
>
> I'll trust your judgment when it comes to XEN.
Thanks both of you.
Cheers,
Stefano
> >>
> >>> hw/ide/piix.c | 14 +-------------
> >>> 1 file changed, 1 insertion(+), 13 deletions(-)
> >>>
> >>> diff --git a/hw/ide/piix.c b/hw/ide/piix.c
> >>> index df46147..0a4cbcb 100644
> >>> --- a/hw/ide/piix.c
> >>> +++ b/hw/ide/piix.c
> >>> @@ -258,22 +258,10 @@ static const TypeInfo piix3_ide_info = {
> >>> .class_init = piix3_ide_class_init,
> >>> };
> >>>
> >>> -static void piix3_ide_xen_class_init(ObjectClass *klass, void *data)
> >>> -{
> >>> - DeviceClass *dc = DEVICE_CLASS(klass);
> >>> - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> >>> -
> >>> - k->realize = pci_piix_ide_realize;
> >>> - k->vendor_id = PCI_VENDOR_ID_INTEL;
> >>> - k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
> >>> - k->class_id = PCI_CLASS_STORAGE_IDE;
> >>> - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> >>> -}
> >>> -
> >>> static const TypeInfo piix3_ide_xen_info = {
> >>> .name = "piix3-ide-xen",
> >>> .parent = TYPE_PCI_IDE,
> >>> - .class_init = piix3_ide_xen_class_init,
> >>> + .class_init = piix3_ide_class_init,
> >>> };
> >>>
> >>> static void piix4_ide_class_init(ObjectClass *klass, void *data)
> >>> --
> >>> MST
> >>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-04-07 16:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-03 8:52 [Qemu-devel] [PATCH] xen: piix reuse pci generic class init function Michael S. Tsirkin
2016-04-06 23:56 ` Stefano Stabellini
2016-04-07 3:48 ` Michael S. Tsirkin
2016-04-07 13:56 ` John Snow
2016-04-07 16:58 ` Stefano Stabellini
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).