From nobody Mon Feb 9 08:33:47 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 154686451657897.2277672502504; Mon, 7 Jan 2019 04:35:16 -0800 (PST) Received: from localhost ([127.0.0.1]:33768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggU7X-0000xX-3q for importer@patchew.org; Mon, 07 Jan 2019 07:35:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggU2i-0006AA-R6 for qemu-devel@nongnu.org; Mon, 07 Jan 2019 07:30:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggU2h-0007wg-Kc for qemu-devel@nongnu.org; Mon, 07 Jan 2019 07:30:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51880) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ggU2g-0007w2-SY for qemu-devel@nongnu.org; Mon, 07 Jan 2019 07:30:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1DAF2C049D5B; Mon, 7 Jan 2019 12:24:12 +0000 (UTC) Received: from localhost (ovpn-112-27.ams2.redhat.com [10.36.112.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69A6D60C45; Mon, 7 Jan 2019 12:24:10 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:22:47 +0400 Message-Id: <20190107122304.22997-12-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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 07 Jan 2019 12:24:12 +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 11/28] compat: replace PC_COMPAT_2_9 & HW_COMPAT_2_9 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 | 19 ------------------- include/hw/i386/pc.h | 9 ++------- hw/arm/virt.c | 6 +----- hw/core/machine.c | 21 +++++++++++++++++++++ hw/i386/pc.c | 9 +++++++++ hw/i386/pc_piix.c | 7 ++----- hw/i386/pc_q35.c | 7 ++----- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- 10 files changed, 42 insertions(+), 43 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 732eb7bb73..0e69350939 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -303,4 +303,7 @@ extern const size_t hw_compat_2_11_len; extern GlobalProperty hw_compat_2_10[]; extern const size_t hw_compat_2_10_len; =20 +extern GlobalProperty hw_compat_2_9[]; +extern const size_t hw_compat_2_9_len; + #endif diff --git a/include/hw/compat.h b/include/hw/compat.h index f414786604..ef154ca470 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,25 +1,6 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H =20 -#define HW_COMPAT_2_9 \ - {\ - .driver =3D "pci-bridge",\ - .property =3D "shpc",\ - .value =3D "off",\ - },{\ - .driver =3D "intel-iommu",\ - .property =3D "pt",\ - .value =3D "off",\ - },{\ - .driver =3D "virtio-net-device",\ - .property =3D "x-mtu-bypass-backend",\ - .value =3D "off",\ - },{\ - .driver =3D "pcie-root-port",\ - .property =3D "x-migrate-msix",\ - .value =3D "false",\ - }, - #define HW_COMPAT_2_8 \ {\ .driver =3D "fw_cfg_mem",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d77843a711..fb79f0b988 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -309,13 +309,8 @@ extern const size_t pc_compat_2_11_len; extern GlobalProperty pc_compat_2_10[]; extern const size_t pc_compat_2_10_len; =20 -#define PC_COMPAT_2_9 \ - HW_COMPAT_2_9 \ - {\ - .driver =3D "mch",\ - .property =3D "extended-tseg-mbytes",\ - .value =3D stringify(0),\ - },\ +extern GlobalProperty pc_compat_2_9[]; +extern const size_t pc_compat_2_9_len; =20 #define PC_COMPAT_2_8 \ HW_COMPAT_2_8 \ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 75ab14305a..a0898f27d3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1918,12 +1918,8 @@ DEFINE_VIRT_MACHINE(2, 10) =20 static void virt_machine_2_9_options(MachineClass *mc) { - static GlobalProperty compat[] =3D { - HW_COMPAT_2_9 - }; - virt_machine_2_10_options(mc); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); } DEFINE_VIRT_MACHINE(2, 9) =20 diff --git a/hw/core/machine.c b/hw/core/machine.c index 7673454a66..aa5f03fba2 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -101,6 +101,27 @@ GlobalProperty hw_compat_2_10[] =3D { }; const size_t hw_compat_2_10_len =3D G_N_ELEMENTS(hw_compat_2_10); =20 +GlobalProperty hw_compat_2_9[] =3D { + { + .driver =3D "pci-bridge", + .property =3D "shpc", + .value =3D "off", + },{ + .driver =3D "intel-iommu", + .property =3D "pt", + .value =3D "off", + },{ + .driver =3D "virtio-net-device", + .property =3D "x-mtu-bypass-backend", + .value =3D "off", + },{ + .driver =3D "pcie-root-port", + .property =3D "x-migrate-msix", + .value =3D "false", + }, +}; +const size_t hw_compat_2_9_len =3D G_N_ELEMENTS(hw_compat_2_9); + 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 c0bb82c454..3f6f5df363 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -186,6 +186,15 @@ GlobalProperty pc_compat_2_10[] =3D { }; const size_t pc_compat_2_10_len =3D G_N_ELEMENTS(pc_compat_2_10); =20 +GlobalProperty pc_compat_2_9[] =3D { + { + .driver =3D "mch", + .property =3D "extended-tseg-mbytes", + .value =3D stringify(0), + }, +}; +const size_t pc_compat_2_9_len =3D G_N_ELEMENTS(pc_compat_2_9); + 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 aea678dc91..02520bceb9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -493,12 +493,9 @@ DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL, =20 static void pc_i440fx_2_9_machine_options(MachineClass *m) { - static GlobalProperty compat[] =3D { - PC_COMPAT_2_9 - }; - pc_i440fx_2_10_machine_options(m); - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); + compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); m->numa_auto_assign_ram =3D numa_legacy_auto_assign_ram; } =20 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a9c4fc27e4..e94d2d05c7 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -380,12 +380,9 @@ DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL, =20 static void pc_q35_2_9_machine_options(MachineClass *m) { - static GlobalProperty compat[] =3D { - PC_COMPAT_2_9 - }; - pc_q35_2_10_machine_options(m); - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); + compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); } =20 DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 483a1373df..477ff5eb94 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4127,7 +4127,6 @@ static void spapr_machine_2_9_class_options(MachineCl= ass *mc) { sPAPRMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); static GlobalProperty compat[] =3D { - HW_COMPAT_2_9 { .driver =3D TYPE_POWERPC_CPU, .property =3D "pre-2.10-migration", @@ -4136,6 +4135,7 @@ static void spapr_machine_2_9_class_options(MachineCl= ass *mc) }; =20 spapr_machine_2_10_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); mc->numa_auto_assign_ram =3D numa_legacy_auto_assign_ram; smc->pre_2_10_has_unused_icps =3D true; diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 95ad7ba842..549f6e0231 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -752,7 +752,6 @@ static void ccw_machine_2_9_class_options(MachineClass = *mc) { S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); static GlobalProperty compat[] =3D { - HW_COMPAT_2_9 { .driver =3D TYPE_S390_STATTRIB, .property =3D "migration-enabled", @@ -761,6 +760,7 @@ static void ccw_machine_2_9_class_options(MachineClass = *mc) }; =20 ccw_machine_2_10_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); s390mc->css_migration_enabled =3D false; } --=20 2.20.1.2.gb21ebb671b