On Sun, May 08, 2022 at 12:34:30PM +0200, Bernhard Beschow wrote:
> Commit 0f8445820f11a69154309863960328dda3dc1ad4 'xen: piix reuse pci
> generic class init function' already resolved redundant code which in
> turn rendered piix3-ide-xen redundant.
>
> Signed-off-by: Bernhard Beschow <shen...@gmail.com>
Cc xen maintainers for review please.
> ---
> hw/i386/pc_piix.c | 3 +--
> hw/ide/piix.c | 7 -------
> 2 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 4c185c72d0..27dfde4917 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -244,8 +244,7 @@ static void pc_init1(MachineState *machine,
> if (pcmc->pci_enabled) {
> PCIDevice *dev;
>
> - dev = pci_create_simple(pci_bus, piix3_devfn + 1,
> - xen_enabled() ? "piix3-ide-xen" :
> "piix3-ide");
> + dev = pci_create_simple(pci_bus, piix3_devfn + 1, "piix3-ide");
> pci_ide_create_devs(dev);
> idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
> idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
> diff --git a/hw/ide/piix.c b/hw/ide/piix.c
> index ce89fd0aa3..2345fe9e1d 100644
> --- a/hw/ide/piix.c
> +++ b/hw/ide/piix.c
> @@ -241,12 +241,6 @@ static const TypeInfo piix3_ide_info = {
> .class_init = piix3_ide_class_init,
> };
>
> -static const TypeInfo piix3_ide_xen_info = {
> - .name = "piix3-ide-xen",
> - .parent = TYPE_PCI_IDE,
> - .class_init = piix3_ide_class_init,
> -};
> -
> /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */
> static void piix4_ide_class_init(ObjectClass *klass, void *data)
> {
> @@ -272,7 +266,6 @@ static const TypeInfo piix4_ide_info = {
> static void piix_ide_register_types(void)
> {
> type_register_static(&piix3_ide_info);
> - type_register_static(&piix3_ide_xen_info);
> type_register_static(&piix4_ide_info);
> }
>
> --
> 2.36.1
