From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDeh-00032A-PT for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:12:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghDbx-0000Fe-LX for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:09:35 -0500 From: Laurent Vivier Date: Wed, 9 Jan 2019 14:08:44 +0100 Message-Id: <20190109130844.5172-7-laurent@vivier.eu> In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 6/6] ioapic: use TYPE_FOO MACRO than constant string List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Laurent Vivier , Richard Henderson , David Gibson , Anthony Green , John Snow , Artyom Tarasenko , Mark Cave-Ayland , Laszlo Ersek , Eduardo Habkost , qemu-block@nongnu.org, Marcel Apfelbaum , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, Michael Tokarev , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Li Qiang From: Li Qiang Make them more QOMConventional. Cc:qemu-trivial@nongnu.org Signed-off-by: Li Qiang Reviewed-by: Laurent Vivier Message-Id: <20190105023831.66910-1-liq3ea@163.com> Signed-off-by: Laurent Vivier --- 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 4952feb476..3c9e20ad9c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2339,9 +2339,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.20.1