[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 32/32] hw/isa/piix: Drop the "3" from the PIIX base class
From: |
Bernhard Beschow |
Subject: |
[PATCH 32/32] hw/isa/piix: Drop the "3" from the PIIX base class |
Date: |
Sun, 4 Dec 2022 20:05:53 +0100 |
Now that the base class is used for both PIIX3 and PIIX4, the "3"
became misleading.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20221022150508.26830-43-shentey@gmail.com>
---
hw/isa/piix.c | 8 ++++----
include/hw/southbridge/piix.h | 6 ++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/isa/piix.c b/hw/isa/piix.c
index 70fe1166c1..84b27b36ea 100644
--- a/hw/isa/piix.c
+++ b/hw/isa/piix.c
@@ -469,7 +469,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,
@@ -519,7 +519,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,
};
@@ -559,7 +559,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,
};
@@ -608,7 +608,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 a489f52d1b..65ad8569da 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -72,11 +72,9 @@ struct PIIXState {
bool has_usb;
bool smm_enabled;
};
-typedef struct PIIXState PIIXState;
-#define TYPE_PIIX3_PCI_DEVICE "pci-piix3"
-DECLARE_INSTANCE_CHECKER(PIIXState, PIIX_PCI_DEVICE,
- TYPE_PIIX3_PCI_DEVICE)
+#define TYPE_PIIX_PCI_DEVICE "pci-piix"
+OBJECT_DECLARE_SIMPLE_TYPE(PIIXState, PIIX_PCI_DEVICE)
#define TYPE_PIIX3_DEVICE "PIIX3"
#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
--
2.38.1
- [PATCH 19/32] hw/isa/piix3: Rename typedef PIIX3State to PIIXState, (continued)
- [PATCH 19/32] hw/isa/piix3: Rename typedef PIIX3State to PIIXState, Bernhard Beschow, 2022/12/04
- [PATCH 23/32] hw/isa/piix4: Reuse struct PIIXState from PIIX3, Bernhard Beschow, 2022/12/04
- [PATCH 24/32] hw/isa/piix4: Rename reset control operations to match PIIX3, Bernhard Beschow, 2022/12/04
- [PATCH 25/32] hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_", Bernhard Beschow, 2022/12/04
- [PATCH 27/32] hw/isa/piix: Harmonize names of reset control memory regions, Bernhard Beschow, 2022/12/04
- [PATCH 28/32] hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4, Bernhard Beschow, 2022/12/04
- [PATCH 26/32] hw/isa/piix3: Merge hw/isa/piix4.c, Bernhard Beschow, 2022/12/04
- [PATCH 30/32] hw/isa/piix: Consolidate IRQ triggering, Bernhard Beschow, 2022/12/04
- [PATCH 29/32] hw/isa/piix: Rename functions to be shared for interrupt triggering, Bernhard Beschow, 2022/12/04
- [PATCH 31/32] hw/isa/piix: Share PIIX3 base class with PIIX4, Bernhard Beschow, 2022/12/04
- [PATCH 32/32] hw/isa/piix: Drop the "3" from the PIIX base class,
Bernhard Beschow <=
- Re: [PATCH 00/32] Consolidate PIIX south bridges, Bernhard Beschow, 2022/12/04
- Re: [PATCH 00/32] Consolidate PIIX south bridges, Bernhard Beschow, 2022/12/18
- Re: [PATCH 00/32] Consolidate PIIX south bridges, Michael S. Tsirkin, 2022/12/20