| Message ID | 1459673515-14354-1-git-send-email-mst@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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 > >
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 >>>
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 > >>> >
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)