Now that the base class is used for both PIIX3 and PIIX4, the "3" became misleading.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/i386/acpi-build.c | 2 +- hw/isa/piix.c | 10 +++++----- include/hw/southbridge/piix.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 0355bd3dda..8af75b1e22 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1276,7 +1276,7 @@ static void build_piix4_isa_bridge(Aml *table) * once PCI is converted to AcpiDevAmlIf and would be ble to generate * AML for bridge itself */ - obj = object_resolve_path_type("", TYPE_PIIX3_PCI_DEVICE, &ambiguous); + obj = object_resolve_path_type("", TYPE_PIIX_PCI_DEVICE, &ambiguous); assert(obj && !ambiguous); scope = aml_scope("_SB.PCI0"); diff --git a/hw/isa/piix.c b/hw/isa/piix.c index 25b86ddf17..f70855541b 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -90,7 +90,7 @@ struct PIIXState { typedef struct PIIXState PIIXState; DECLARE_INSTANCE_CHECKER(PIIXState, PIIX_PCI_DEVICE, - TYPE_PIIX3_PCI_DEVICE) + TYPE_PIIX_PCI_DEVICE) static void piix_set_irq_pic(PIIXState *piix, int pic_irq) { @@ -514,7 +514,7 @@ static void pci_piix_class_init(ObjectClass *klass, void *data) } static const TypeInfo piix_pci_type_info = { - .name = TYPE_PIIX3_PCI_DEVICE, + .name = TYPE_PIIX_PCI_DEVICE, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIXState), .instance_init = pci_piix_init, @@ -564,7 +564,7 @@ static void piix3_class_init(ObjectClass *klass, void *data) static const TypeInfo piix3_info = { .name = TYPE_PIIX3_DEVICE, - .parent = TYPE_PIIX3_PCI_DEVICE, + .parent = TYPE_PIIX_PCI_DEVICE, .instance_init = piix3_init, .class_init = piix3_class_init, }; @@ -604,7 +604,7 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data) static const TypeInfo piix3_xen_info = { .name = TYPE_PIIX3_XEN_DEVICE, - .parent = TYPE_PIIX3_PCI_DEVICE, + .parent = TYPE_PIIX_PCI_DEVICE, .instance_init = piix3_init, .class_init = piix3_xen_class_init, }; @@ -653,7 +653,7 @@ static void piix4_class_init(ObjectClass *klass, void *data) static const TypeInfo piix4_info = { .name = TYPE_PIIX4_PCI_DEVICE, - .parent = TYPE_PIIX3_PCI_DEVICE, + .parent = TYPE_PIIX_PCI_DEVICE, .instance_init = piix4_init, .class_init = piix4_class_init, }; diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 0edc23710c..60ff6d222a 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -24,7 +24,7 @@ */ #define PIIX_RCR_IOPORT 0xcf9 -#define TYPE_PIIX3_PCI_DEVICE "pci-piix3" +#define TYPE_PIIX_PCI_DEVICE "pci-piix" #define TYPE_PIIX3_DEVICE "PIIX3" #define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen" #define TYPE_PIIX4_PCI_DEVICE "piix4-isa" -- 2.37.3
