From nobody Wed May 1 09:43:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546656050845280.49709009163496; Fri, 4 Jan 2019 18:40:50 -0800 (PST) Received: from localhost ([127.0.0.1]:41655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfbtG-0003Pg-EB for importer@patchew.org; Fri, 04 Jan 2019 21:40:46 -0500 Received: from eggsout.gnu.org ([209.51.188.92]:53058 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfbsJ-0002mp-EP for qemu-devel@nongnu.org; Fri, 04 Jan 2019 21:39:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfbsG-0007qz-3o for qemu-devel@nongnu.org; Fri, 04 Jan 2019 21:39:47 -0500 Received: from m12-11.163.com ([220.181.12.11]:51677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfbsF-0007qK-J9; Fri, 04 Jan 2019 21:39:44 -0500 Received: from localhost.localdomain (unknown [183.134.169.2]) by smtp7 (Coremail) with SMTP id C8CowAC3HVzqGDBcIwPtDA--.8700S2; Sat, 05 Jan 2019 10:39:39 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=gv+VD1uLx0OKGE0AyR oqWQpjIOUvKDftyiSbzTToFe8=; b=Y+bSTq3DwaOTiYK5pfQkpL7lsfqjxAX4cv ooiaI2GBp1lkbpUWJPLpmQDbQSGD41527yp1lFXsG4u2Qj8dwBQX8ZmJ0QOEXxBn aNEO6zl5rCiJEv0MQcQZ0Bd7Q11OiyNVD6IaRhoe8okGUDH1R/IVTZSg32RsVKe9 lNkip2IFM= From: Li Qiang To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Fri, 4 Jan 2019 18:38:31 -0800 Message-Id: <20190105023831.66910-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: C8CowAC3HVzqGDBcIwPtDA--.8700S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kr1rAFW7Xr47ur1fJrWDurg_yoW8uw13pF Z7ZF4Fk3yDJF4kJFnrJFsFkFyrGr4kuF1DJF95u3yfAr15AryrJFsrKF18Z345WrWxAFW5 XF9Ig345ArWDX3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UbBMiUUUUU= X-Originating-IP: [183.134.169.2] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbitBUzbVSIaMyIBAAAsL X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.11 Subject: [Qemu-devel] [PATCH] ioapic: use TYPE_FOO MACRO than constant string X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, lvivier@redhat.com, Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Make them more QOMConventional. Cc:qemu-trivial@nongnu.org Signed-off-by: Li Qiang Reviewed-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, v= oid *data) } =20 static const TypeInfo kvm_ioapic_info =3D { - .name =3D "kvm-ioapic", + .name =3D TYPE_KVM_IOAPIC, .parent =3D TYPE_IOAPIC_COMMON, .instance_size =3D sizeof(KVMIOAPICState), .class_init =3D 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; =20 if (kvm_ioapic_in_kernel()) { - dev =3D qdev_create(NULL, "kvm-ioapic"); + dev =3D qdev_create(NULL, TYPE_KVM_IOAPIC); } else { - dev =3D qdev_create(NULL, "ioapic"); + dev =3D 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) } =20 static const TypeInfo ioapic_info =3D { - .name =3D "ioapic", + .name =3D TYPE_IOAPIC, .parent =3D TYPE_IOAPIC_COMMON, .instance_size =3D sizeof(IOAPICCommonState), .class_init =3D 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 =20 +#define TYPE_KVM_IOAPIC "kvm-ioapic" +#define TYPE_IOAPIC "ioapic" + void ioapic_eoi_broadcast(int vector); =20 #endif /* HW_IOAPIC_H */ --=20 2.17.1