[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 42/43] hw/isa/piix: Drop the "3" from the PIIX base class
From: |
Bernhard Beschow |
Subject: |
[PATCH v2 42/43] hw/isa/piix: Drop the "3" from the PIIX base class |
Date: |
Sat, 22 Oct 2022 17:05:07 +0200 |
Now that the base class is used for both PIIX3 and PIIX4, the "3"
became misleading.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/i386/acpi-build.c | 2 +-
hw/isa/piix.c | 8 ++++----
include/hw/southbridge/piix.h | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 4f54b61904..c006db72e8 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1298,7 +1298,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 c8c1a99bf1..a361261940 100644
--- a/hw/isa/piix.c
+++ b/hw/isa/piix.c
@@ -463,7 +463,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,
@@ -513,7 +513,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,
};
@@ -553,7 +553,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,
};
@@ -602,7 +602,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 c9fa0f1aa6..c21b69e2be 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -75,9 +75,9 @@ struct PIIXState {
};
typedef struct PIIXState PIIXState;
-#define TYPE_PIIX3_PCI_DEVICE "pci-piix3"
+#define TYPE_PIIX_PCI_DEVICE "pci-piix"
DECLARE_INSTANCE_CHECKER(PIIXState, PIIX_PCI_DEVICE,
- TYPE_PIIX3_PCI_DEVICE)
+ TYPE_PIIX_PCI_DEVICE)
#define TYPE_PIIX3_DEVICE "PIIX3"
#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
--
2.38.1
- [PATCH v2 34/43] hw/isa/piix4: Rename reset control operations to match PIIX3, (continued)
- [PATCH v2 34/43] hw/isa/piix4: Rename reset control operations to match PIIX3, Bernhard Beschow, 2022/10/22
- [PATCH v2 35/43] hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_", Bernhard Beschow, 2022/10/22
- [PATCH v2 37/43] hw/isa/piix: Harmonize names of reset control memory regions, Bernhard Beschow, 2022/10/22
- [PATCH v2 36/43] hw/isa/piix3: Merge hw/isa/piix4.c, Bernhard Beschow, 2022/10/22
- [PATCH v2 38/43] hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4, Bernhard Beschow, 2022/10/22
- [PATCH v2 39/43] hw/isa/piix: Rename functions to be shared for interrupt triggering, Bernhard Beschow, 2022/10/22
- [PATCH v2 40/43] hw/isa/piix: Consolidate IRQ triggering, Bernhard Beschow, 2022/10/22
- [PATCH v2 41/43] hw/isa/piix: Share PIIX3 base class with PIIX4, Bernhard Beschow, 2022/10/22
- [PATCH v2 42/43] hw/isa/piix: Drop the "3" from the PIIX base class,
Bernhard Beschow <=
- [PATCH v2 43/43] hw/i386/acpi-build: Resolve PIIX ISA bridge rather than ACPI controller, Bernhard Beschow, 2022/10/22