Make them more QOMConventional.
Cc:qemu-trivial@nongnu.org
Signed-off-by: Li Qiang <liq3ea@163.com>
---
hw/i386/kvm/ioapic.c | 2 +-
hw/i386/pc.c | 4 ++--
hw/intc/ioapic.c | 2 +-
include/hw/i386/ioapic.h | 3 +++
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index 5b40d75439..e453692199 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -163,7 +163,7 @@ static void kvm_ioapic_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo kvm_ioapic_info = {
- .name = "kvm-ioapic",
+ .name = TYPE_KVM_IOAPIC,
.parent = TYPE_IOAPIC_COMMON,
.instance_size = sizeof(KVMIOAPICState),
.class_init = kvm_ioapic_class_init,
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f248662e97..af68a61615 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1665,9 +1665,9 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name)
unsigned int i;
if (kvm_ioapic_in_kernel()) {
- dev = qdev_create(NULL, "kvm-ioapic");
+ dev = qdev_create(NULL, TYPE_KVM_IOAPIC);
} else {
- dev = qdev_create(NULL, "ioapic");
+ dev = qdev_create(NULL, TYPE_IOAPIC);
}
if (parent_name) {
object_property_add_child(object_resolve_path(parent_name, NULL),
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 4e529729b4..9d75f84d3b 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -429,7 +429,7 @@ static void ioapic_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo ioapic_info = {
- .name = "ioapic",
+ .name = TYPE_IOAPIC,
.parent = TYPE_IOAPIC_COMMON,
.instance_size = sizeof(IOAPICCommonState),
.class_init = ioapic_class_init,
diff --git a/include/hw/i386/ioapic.h b/include/hw/i386/ioapic.h
index 9c8816f11f..59fcb158a7 100644
--- a/include/hw/i386/ioapic.h
+++ b/include/hw/i386/ioapic.h
@@ -23,6 +23,9 @@
#define IOAPIC_NUM_PINS 24
#define IO_APIC_DEFAULT_ADDRESS 0xfec00000
+#define TYPE_KVM_IOAPIC "kvm-ioapic"
+#define TYPE_IOAPIC "ioapic"
+
void ioapic_eoi_broadcast(int vector);
#endif /* HW_IOAPIC_H */
--
2.17.1
On 05/01/2019 03:38, Li Qiang wrote: > Make them more QOMConventional. > Cc:qemu-trivial@nongnu.org > > Signed-off-by: Li Qiang <liq3ea@163.com> > --- > hw/i386/kvm/ioapic.c | 2 +- > hw/i386/pc.c | 4 ++-- > hw/intc/ioapic.c | 2 +- > include/hw/i386/ioapic.h | 3 +++ > 4 files changed, 7 insertions(+), 4 deletions(-) Reviewed-by: Laurent Vivier <laurent@vivier.eu>
On 05/01/2019 03:38, Li Qiang wrote: > Make them more QOMConventional. > Cc:qemu-trivial@nongnu.org > > Signed-off-by: Li Qiang <liq3ea@163.com> > --- > hw/i386/kvm/ioapic.c | 2 +- > hw/i386/pc.c | 4 ++-- > hw/intc/ioapic.c | 2 +- > include/hw/i386/ioapic.h | 3 +++ > 4 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c > index 5b40d75439..e453692199 100644 > --- a/hw/i386/kvm/ioapic.c > +++ b/hw/i386/kvm/ioapic.c > @@ -163,7 +163,7 @@ static void kvm_ioapic_class_init(ObjectClass *klass, void *data) > } > > static const TypeInfo kvm_ioapic_info = { > - .name = "kvm-ioapic", > + .name = TYPE_KVM_IOAPIC, > .parent = TYPE_IOAPIC_COMMON, > .instance_size = sizeof(KVMIOAPICState), > .class_init = kvm_ioapic_class_init, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index f248662e97..af68a61615 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1665,9 +1665,9 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) > unsigned int i; > > if (kvm_ioapic_in_kernel()) { > - dev = qdev_create(NULL, "kvm-ioapic"); > + dev = qdev_create(NULL, TYPE_KVM_IOAPIC); > } else { > - dev = qdev_create(NULL, "ioapic"); > + dev = qdev_create(NULL, TYPE_IOAPIC); > } > if (parent_name) { > object_property_add_child(object_resolve_path(parent_name, NULL), > diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c > index 4e529729b4..9d75f84d3b 100644 > --- a/hw/intc/ioapic.c > +++ b/hw/intc/ioapic.c > @@ -429,7 +429,7 @@ static void ioapic_class_init(ObjectClass *klass, void *data) > } > > static const TypeInfo ioapic_info = { > - .name = "ioapic", > + .name = TYPE_IOAPIC, > .parent = TYPE_IOAPIC_COMMON, > .instance_size = sizeof(IOAPICCommonState), > .class_init = ioapic_class_init, > diff --git a/include/hw/i386/ioapic.h b/include/hw/i386/ioapic.h > index 9c8816f11f..59fcb158a7 100644 > --- a/include/hw/i386/ioapic.h > +++ b/include/hw/i386/ioapic.h > @@ -23,6 +23,9 @@ > #define IOAPIC_NUM_PINS 24 > #define IO_APIC_DEFAULT_ADDRESS 0xfec00000 > > +#define TYPE_KVM_IOAPIC "kvm-ioapic" > +#define TYPE_IOAPIC "ioapic" > + > void ioapic_eoi_broadcast(int vector); > > #endif /* HW_IOAPIC_H */ > Applied to my trivial-patches branch. Thanks, Laurent
© 2016 - 2024 Red Hat, Inc.