This will make the type name constant consistent with the name of the QOM type ("isa-pit").
Suggested-by: "Daniel P. Berrangé" <berra...@redhat.com> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- Changes v1 -> v2: * v1 subject was: "i8254: Rename TYPE_I8254 to TYPE_PIT" * Rename it to TYPE_ISA_PIT instead of TYPE_PIT, to be consistent with the existing "isa-pit" type name --- Cc: "Michael S. Tsirkin" <m...@redhat.com> Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: qemu-devel@nongnu.org --- include/hw/timer/i8254.h | 4 ++-- hw/timer/i8254.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 1a522a2457..b21e67c124 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -45,7 +45,7 @@ typedef struct PITCommonClass PITCommonClass; DECLARE_OBJ_CHECKERS(PITCommonState, PITCommonClass, PIT_COMMON, TYPE_PIT_COMMON) -#define TYPE_I8254 "isa-pit" +#define TYPE_ISA_PIT "isa-pit" #define TYPE_KVM_I8254 "kvm-pit" static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq, @@ -54,7 +54,7 @@ static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq, DeviceState *dev; ISADevice *d; - d = isa_new(TYPE_I8254); + d = isa_new(TYPE_ISA_PIT); dev = DEVICE(d); qdev_prop_set_uint32(dev, "iobase", base); isa_realize_and_unref(d, bus, &error_fatal); diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index c01ee2c72a..5666bcb4ef 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -39,7 +39,7 @@ typedef struct PITClass PITClass; DECLARE_CLASS_CHECKERS(PITClass, PIT, - TYPE_I8254) + TYPE_ISA_PIT) struct PITClass { PITCommonClass parent_class; @@ -370,7 +370,7 @@ static void pit_class_initfn(ObjectClass *klass, void *data) } static const TypeInfo pit_info = { - .name = TYPE_I8254, + .name = TYPE_ISA_PIT, .parent = TYPE_PIT_COMMON, .instance_size = sizeof(PITCommonState), .class_init = pit_class_initfn, -- 2.26.2