Signed-off-by: Mark Cave-Ayland <[email protected]>
Reviewed-by: Peter Maydell <[email protected]>
---
include/hw/isa/i8259_internal.h | 4 ++--
hw/i386/kvm/i8259.c | 4 ++--
hw/intc/i8259.c | 2 +-
hw/intc/i8259_common.c | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h
index 7a2f9addaf..e039d6f067 100644
--- a/include/hw/isa/i8259_internal.h
+++ b/include/hw/isa/i8259_internal.h
@@ -32,9 +32,9 @@
#define TYPE_I8259_COMMON "i8259-common"
-OBJECT_DECLARE_TYPE(I8259CommonState, PICCommonClass, I8259_COMMON)
+OBJECT_DECLARE_TYPE(I8259CommonState, I8259CommonClass, I8259_COMMON)
-struct PICCommonClass {
+struct I8259CommonClass {
DeviceClass parent_class;
void (*pre_save)(I8259CommonState *s);
diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c
index f10643a120..68607d721d 100644
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@@ -29,7 +29,7 @@ DECLARE_CLASS_CHECKERS(KVMPICClass, KVM_PIC,
* @parent_realize: The parent's realizefn.
*/
struct KVMPICClass {
- PICCommonClass parent_class;
+ I8259CommonClass parent_class;
DeviceRealize parent_realize;
};
@@ -142,7 +142,7 @@ qemu_irq *kvm_i8259_init(ISABus *bus)
static void kvm_i8259_class_init(ObjectClass *klass, const void *data)
{
KVMPICClass *kpc = KVM_PIC_CLASS(klass);
- PICCommonClass *k = I8259_COMMON_CLASS(klass);
+ I8259CommonClass *k = I8259_COMMON_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
device_class_set_legacy_reset(dc, kvm_pic_reset);
diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index 45db87a2ad..547e86c5f4 100644
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -44,7 +44,7 @@ DECLARE_CLASS_CHECKERS(PICClass, PIC,
* @parent_realize: The parent's realizefn.
*/
struct PICClass {
- PICCommonClass parent_class;
+ I8259CommonClass parent_class;
DeviceRealize parent_realize;
};
diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c
index 17040bdb1e..ac8dc7cf00 100644
--- a/hw/intc/i8259_common.c
+++ b/hw/intc/i8259_common.c
@@ -56,7 +56,7 @@ void pic_reset_common(I8259CommonState *s)
static int pic_dispatch_pre_save(void *opaque)
{
I8259CommonState *s = opaque;
- PICCommonClass *info = I8259_COMMON_GET_CLASS(s);
+ I8259CommonClass *info = I8259_COMMON_GET_CLASS(s);
if (info->pre_save) {
info->pre_save(s);
@@ -68,7 +68,7 @@ static int pic_dispatch_pre_save(void *opaque)
static int pic_dispatch_post_load(void *opaque, int version_id)
{
I8259CommonState *s = opaque;
- PICCommonClass *info = I8259_COMMON_GET_CLASS(s);
+ I8259CommonClass *info = I8259_COMMON_GET_CLASS(s);
if (info->post_load) {
info->post_load(s);
@@ -223,7 +223,7 @@ static const TypeInfo pic_common_type = {
.name = TYPE_I8259_COMMON,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(I8259CommonState),
- .class_size = sizeof(PICCommonClass),
+ .class_size = sizeof(I8259CommonClass),
.class_init = pic_common_class_init,
.abstract = true,
.interfaces = (const InterfaceInfo[]) {
--
2.43.0
