From nobody Mon Feb 9 09:55:08 2026 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; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546865369115330.33633005253284; Mon, 7 Jan 2019 04:49:29 -0800 (PST) Received: from localhost ([127.0.0.1]:37180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggULP-0003z1-SY for importer@patchew.org; Mon, 07 Jan 2019 07:49:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggU6r-0000zL-G0 for qemu-devel@nongnu.org; Mon, 07 Jan 2019 07:34:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggU6l-0002Zu-R2 for qemu-devel@nongnu.org; Mon, 07 Jan 2019 07:34:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ggU6c-0002RO-FZ for qemu-devel@nongnu.org; Mon, 07 Jan 2019 07:34:13 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E6589A048A; Mon, 7 Jan 2019 12:24:27 +0000 (UTC) Received: from localhost (ovpn-112-27.ams2.redhat.com [10.36.112.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 524BC100164A; Mon, 7 Jan 2019 12:24:25 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:22:50 +0400 Message-Id: <20190107122304.22997-15-marcandre.lureau@redhat.com> In-Reply-To: <20190107122304.22997-1-marcandre.lureau@redhat.com> References: <20190107122304.22997-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 07 Jan 2019 12:24:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 14/28] compat: replace PC_COMPAT_2_6 & HW_COMPAT_2_6 macros 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Use static arrays instead. Suggested-by: Eduardo Habkost Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Igor Mammedov Reviewed-by: Cornelia Huck Acked-by: Eduardo Habkost --- include/hw/boards.h | 3 +++ include/hw/compat.h | 15 --------------- include/hw/i386/pc.h | 23 ++--------------------- hw/arm/virt.c | 5 +---- hw/core/machine.c | 17 +++++++++++++++++ hw/i386/pc.c | 23 +++++++++++++++++++++++ hw/i386/pc_piix.c | 6 ++---- hw/i386/pc_q35.c | 6 ++---- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- 10 files changed, 52 insertions(+), 50 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index ac4854db0f..1135ee23ac 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -312,4 +312,7 @@ extern const size_t hw_compat_2_8_len; extern GlobalProperty hw_compat_2_7[]; extern const size_t hw_compat_2_7_len; =20 +extern GlobalProperty hw_compat_2_6[]; +extern const size_t hw_compat_2_6_len; + #endif diff --git a/include/hw/compat.h b/include/hw/compat.h index 7ceab17401..c744233fb6 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,21 +1,6 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H =20 -#define HW_COMPAT_2_6 \ - {\ - .driver =3D "virtio-mmio",\ - .property =3D "format_transport_address",\ - .value =3D "off",\ - },{\ - .driver =3D "virtio-pci",\ - .property =3D "disable-modern",\ - .value =3D "on",\ - },{\ - .driver =3D "virtio-pci",\ - .property =3D "disable-legacy",\ - .value =3D "off",\ - }, - #define HW_COMPAT_2_5 \ {\ .driver =3D "isa-fdc",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 504fbc79a9..ca62def2c9 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -318,27 +318,8 @@ extern const size_t pc_compat_2_8_len; extern GlobalProperty pc_compat_2_7[]; extern const size_t pc_compat_2_7_len; =20 -#define PC_COMPAT_2_6 \ - HW_COMPAT_2_6 \ - {\ - .driver =3D TYPE_X86_CPU,\ - .property =3D "cpuid-0xb",\ - .value =3D "off",\ - },{\ - .driver =3D "vmxnet3",\ - .property =3D "romfile",\ - .value =3D "",\ - },\ - {\ - .driver =3D TYPE_X86_CPU,\ - .property =3D "fill-mtrr-mask",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "apic-common",\ - .property =3D "legacy-instance-id",\ - .value =3D "on",\ - }, +extern GlobalProperty pc_compat_2_6[]; +extern const size_t pc_compat_2_6_len; =20 #define PC_COMPAT_2_5 \ HW_COMPAT_2_5 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0134d0d439..d3174f1402 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1952,12 +1952,9 @@ DEFINE_VIRT_MACHINE(2, 7) static void virt_machine_2_6_options(MachineClass *mc) { VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - static GlobalProperty compat[] =3D { - HW_COMPAT_2_6 - }; =20 virt_machine_2_7_options(mc); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len); vmc->disallow_affinity_adjustment =3D true; /* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */ vmc->no_pmu =3D true; diff --git a/hw/core/machine.c b/hw/core/machine.c index cc92b0cc84..e27b1b5c34 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -193,6 +193,23 @@ GlobalProperty hw_compat_2_7[] =3D { }; const size_t hw_compat_2_7_len =3D G_N_ELEMENTS(hw_compat_2_7); =20 +GlobalProperty hw_compat_2_6[] =3D { + { + .driver =3D "virtio-mmio", + .property =3D "format_transport_address", + .value =3D "off", + },{ + .driver =3D "virtio-pci", + .property =3D "disable-modern", + .value =3D "on", + },{ + .driver =3D "virtio-pci", + .property =3D "disable-legacy", + .value =3D "off", + }, +}; +const size_t hw_compat_2_6_len =3D G_N_ELEMENTS(hw_compat_2_6); + static char *machine_get_accel(Object *obj, Error **errp) { MachineState *ms =3D MACHINE(obj); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ed46f9c27f..6c8ff0e928 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -258,6 +258,29 @@ GlobalProperty pc_compat_2_7[] =3D { }; const size_t pc_compat_2_7_len =3D G_N_ELEMENTS(pc_compat_2_7); =20 +GlobalProperty pc_compat_2_6[] =3D { + { + .driver =3D TYPE_X86_CPU, + .property =3D "cpuid-0xb", + .value =3D "off", + },{ + .driver =3D "vmxnet3", + .property =3D "romfile", + .value =3D "", + }, + { + .driver =3D TYPE_X86_CPU, + .property =3D "fill-mtrr-mask", + .value =3D "off", + }, + { + .driver =3D "apic-common", + .property =3D "legacy-instance-id", + .value =3D "on", + } +}; +const size_t pc_compat_2_6_len =3D G_N_ELEMENTS(pc_compat_2_6); + void gsi_handler(void *opaque, int n, int level) { GSIState *s =3D opaque; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 182d868de8..89e81a028a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -525,14 +525,12 @@ DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL, static void pc_i440fx_2_6_machine_options(MachineClass *m) { PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - static GlobalProperty compat[] =3D { - PC_COMPAT_2_6 - }; =20 pc_i440fx_2_7_machine_options(m); pcmc->legacy_cpu_hotplug =3D true; pcmc->linuxboot_dma_enabled =3D false; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); + compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); } =20 DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 35377524d0..efb70fb8af 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -412,14 +412,12 @@ DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL, static void pc_q35_2_6_machine_options(MachineClass *m) { PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - static GlobalProperty compat[] =3D { - PC_COMPAT_2_6 - }; =20 pc_q35_2_7_machine_options(m); pcmc->legacy_cpu_hotplug =3D true; pcmc->linuxboot_dma_enabled =3D false; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); + compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); } =20 DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c83b0c0d66..eff015987d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4262,7 +4262,6 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", false); static void spapr_machine_2_6_class_options(MachineClass *mc) { static GlobalProperty compat[] =3D { - HW_COMPAT_2_6 { .driver =3D TYPE_SPAPR_PCI_HOST_BRIDGE, .property =3D "ddw", @@ -4272,6 +4271,7 @@ static void spapr_machine_2_6_class_options(MachineCl= ass *mc) =20 spapr_machine_2_7_class_options(mc); mc->has_hotpluggable_cpus =3D false; + compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); } =20 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index f28feedd4b..6137c97875 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -811,7 +811,6 @@ static void ccw_machine_2_6_class_options(MachineClass = *mc) { S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); static GlobalProperty compat[] =3D { - HW_COMPAT_2_6 { .driver =3D TYPE_S390_IPL, .property =3D "iplbext_migration", @@ -825,6 +824,7 @@ static void ccw_machine_2_6_class_options(MachineClass = *mc) =20 s390mc->ri_allowed =3D false; ccw_machine_2_7_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_CCW_MACHINE(2_6, "2.6", false); --=20 2.20.1.2.gb21ebb671b