From patchwork Wed Jan 9 13:08:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1022428 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ZV9l5wf6z9s7h for ; Thu, 10 Jan 2019 00:20:27 +1100 (AEDT) Received: from localhost ([127.0.0.1]:36477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDmT-0000HP-OK for incoming@patchwork.ozlabs.org; Wed, 09 Jan 2019 08:20:25 -0500 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 Received: from mout.kundenserver.de ([212.227.126.133]:37439) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghDbr-00009x-H3; Wed, 09 Jan 2019 08:09:30 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M4KFF-1ggwcb13jN-000O8E; Wed, 09 Jan 2019 14:09:04 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 14:08:44 +0100 Message-Id: <20190109130844.5172-7-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:/yB9ECdKhtQRTY1MgeTwiZKF1WVLcG/+fyJqYczaZSrPMS5l65j jUdWtHgfWj3tc2dj4MyxAwU55J4EcQyf/YK9nkAuvNHDvhZCtNfUKMOyZE+w+7iEQnNAm/L 684/w4gp/zWs6HjJD2vdtKZo/suMe8dkDBAFxbv60ia1sk4yZVCiJZCRWJqp1cM48NKk2hF i36t3gqcxrlp4q3SO2nYw== X-UI-Out-Filterresults: notjunk:1; V03:K0:d47CSabWAiw=:MW/DH0T0uGv27Ej5maTDvp LhI2Wi2NIQy8uzukHD0wXkSWHI8RUcgSVg0FO5nSL6xHAW19LeqbwaxbrRPdZhO8nuMJQQlwX eSBVtRJCvDSs1D/9mBIt27wmwv7s3OfqqbhEasz6u1j+AYDbP/CbDXOGVtd1K9/xgR9SnzFaD VdU7lkwp9eVOuNhc836TYDLXdjrtIALRp0D1xLlYkR35x/saXkgj66eCwvpbwK8Fmys5hecXB ebqb6iIo5xBlbzMeOTZj4TYPZsHgguuUsXiC5F9m7jJHhxWL8odt3sNETC5iw0CoXl2DFec2X hGtaJAsR+tv8QrPGNsi+ZtB7sqLzzS4jQI+7IK53UZy5540ejVBCEUGq8Xp6az6y7JqPlcPt5 COH5G+tkvmJwzAFh3HiCOsibJlPykse3kEDCp/T3lvyvStBrLuPMYnlRwYDsaic392ITSUWeH IMV9wKav2d0o+aS2ZbFqo+uimmkojo/MSVcjsr9IiStDYcGe5qFcc63PRjD5ICgXyMuMc+mD5 Fg+MTn0CDRQ3Fv+SWNOixyBgI0MPUTc0a6bHoQmAM3kJrpDAt0PZ84ETmCZCv93pWNYFl6Z5X S1l+34pBt40oM4wiCiaTrRst94d7uA5xjvtLTUti73UEfHFehGCgkwbcfXSbe3lWToLBo3cHd 3bNbXP1xMaTVFcW2bjIzbUM05rLq+ztb6UfT7EmO73QbaDShlll4ulb/zDDk6m02JEog7FL3+ LpT/lZUEM7CnQFYtaF1IKuLHk7omW2SQEFk1Tg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 6/6] 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: Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laszlo Ersek , Anthony Green , Mark Cave-Ayland , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=83=C2=A9?= , Michael Tokarev , qemu-ppc@nongnu.org, Gerd Hoffmann , Li Qiang , Paolo Bonzini , Richard Henderson , John Snow , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 */