SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/ide/piix: Remove redundant "piix3-ide-xen" device class

Browse Source 
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 <shentey@gmail.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <20220513180957.90514-2-shentey@gmail.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
This commit is contained in:
Bernhard Beschow 2022-05-13 20:09:55 +02:00 committed by Anthony PERARD
parent 05911658cb
commit 7851b21a81
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/i386/pc_piix.c
View File

@ -246,8 +246,7 @@ static void pc_init1(MachineState *machine,
if (pcmc->pci_enabled) { if (pcmc->pci_enabled) {
PCIDevice *dev; PCIDevice *dev;
dev = pci_create_simple(pci_bus, piix3_devfn + 1, dev = pci_create_simple(pci_bus, piix3_devfn + 1, "piix3-ide");
xen_enabled() ? "piix3-ide-xen" : "piix3-ide");
pci_ide_create_devs(dev); pci_ide_create_devs(dev);
idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0"); idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1"); idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");

7
hw/ide/piix.c
View File

@ -241,12 +241,6 @@ static const TypeInfo piix3_ide_info = {
.class_init = piix3_ide_class_init, .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 */ /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */
static void piix4_ide_class_init(ObjectClass *klass, void *data) 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) static void piix_ide_register_types(void)
{ {
type_register_static(&piix3_ide_info); type_register_static(&piix3_ide_info);
type_register_static(&piix3_ide_xen_info);
type_register_static(&piix4_ide_info); type_register_static(&piix4_ide_info);
} }