From nobody Fri Nov 7 00:58:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544652165910971.1729690374881; Wed, 12 Dec 2018 14:02:45 -0800 (PST) Received: from localhost ([::1]:48385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXCaa-00059R-Ho for importer@patchew.org; Wed, 12 Dec 2018 17:02:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXCP3-0003K6-GG for qemu-devel@nongnu.org; Wed, 12 Dec 2018 16:50:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXCP1-0006rq-KC for qemu-devel@nongnu.org; Wed, 12 Dec 2018 16:50:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37106) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXCP1-0006jL-8p for qemu-devel@nongnu.org; Wed, 12 Dec 2018 16:50:47 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13B0931524E2 for ; Wed, 12 Dec 2018 21:50:31 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70FD96012C; Wed, 12 Dec 2018 21:50:29 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 01:48:39 +0400 Message-Id: <20181212214850.29953-18-marcandre.lureau@redhat.com> In-Reply-To: <20181212214850.29953-1-marcandre.lureau@redhat.com> References: <20181212214850.29953-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 12 Dec 2018 21:50:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 17/28] compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 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: imammedo@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Use static arrays instead. I decided to rename the conflicting pc_compat_2_3() function with pc_compat_2_3_fn(). Suggested-by: Eduardo Habkost Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/hw/boards.h | 3 ++ include/hw/compat.h | 39 -------------------- include/hw/i386/pc.h | 88 ++------------------------------------------ hw/core/machine.c | 41 +++++++++++++++++++++ hw/i386/pc.c | 86 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 13 +++---- hw/ppc/spapr.c | 2 +- 7 files changed, 139 insertions(+), 133 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 053e362f28..a51d896a70 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -320,4 +320,7 @@ extern const size_t hw_compat_2_5_len; extern GlobalProperty hw_compat_2_4[]; extern const size_t hw_compat_2_4_len; =20 +extern GlobalProperty hw_compat_2_3[]; +extern const size_t hw_compat_2_3_len; + #endif diff --git a/include/hw/compat.h b/include/hw/compat.h index 05ff05e159..fbe64d5983 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,45 +1,6 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H =20 -#define HW_COMPAT_2_3 \ - {\ - .driver =3D "virtio-blk-pci",\ - .property =3D "any_layout",\ - .value =3D "off",\ - },{\ - .driver =3D "virtio-balloon-pci",\ - .property =3D "any_layout",\ - .value =3D "off",\ - },{\ - .driver =3D "virtio-serial-pci",\ - .property =3D "any_layout",\ - .value =3D "off",\ - },{\ - .driver =3D "virtio-9p-pci",\ - .property =3D "any_layout",\ - .value =3D "off",\ - },{\ - .driver =3D "virtio-rng-pci",\ - .property =3D "any_layout",\ - .value =3D "off",\ - },{\ - .driver =3D TYPE_PCI_DEVICE,\ - .property =3D "x-pcie-lnksta-dllla",\ - .value =3D "off",\ - },{\ - .driver =3D "migration",\ - .property =3D "send-configuration",\ - .value =3D "off",\ - },{\ - .driver =3D "migration",\ - .property =3D "send-section-footer",\ - .value =3D "off",\ - },{\ - .driver =3D "migration",\ - .property =3D "store-global-state",\ - .value =3D "off",\ - }, - #define HW_COMPAT_2_2 \ /* empty */ =20 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a9045f6bea..def40cd545 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -327,6 +327,9 @@ extern const size_t pc_compat_2_5_len; extern GlobalProperty pc_compat_2_4[]; extern const size_t pc_compat_2_4_len; =20 +extern GlobalProperty pc_compat_2_3[]; +extern const size_t pc_compat_2_3_len; + /* Helper for setting model-id for CPU models that changed model-id * depending on QEMU versions up to QEMU 2.4. */ @@ -347,91 +350,6 @@ extern const size_t pc_compat_2_4_len; .value =3D "QEMU Virtual CPU version " v,\ }, =20 -#define PC_COMPAT_2_3 \ - HW_COMPAT_2_3 \ - PC_CPU_MODEL_IDS("2.3.0") \ - {\ - .driver =3D TYPE_X86_CPU,\ - .property =3D "arat",\ - .value =3D "off",\ - },{\ - .driver =3D "qemu64" "-" TYPE_X86_CPU,\ - .property =3D "min-level",\ - .value =3D stringify(4),\ - },{\ - .driver =3D "kvm64" "-" TYPE_X86_CPU,\ - .property =3D "min-level",\ - .value =3D stringify(5),\ - },{\ - .driver =3D "pentium3" "-" TYPE_X86_CPU,\ - .property =3D "min-level",\ - .value =3D stringify(2),\ - },{\ - .driver =3D "n270" "-" TYPE_X86_CPU,\ - .property =3D "min-level",\ - .value =3D stringify(5),\ - },{\ - .driver =3D "Conroe" "-" TYPE_X86_CPU,\ - .property =3D "min-level",\ - .value =3D stringify(4),\ - },{\ - .driver =3D "Penryn" "-" TYPE_X86_CPU,\ - .property =3D "min-level",\ - .value =3D stringify(4),\ - },{\ - .driver =3D "Nehalem" "-" TYPE_X86_CPU,\ - .property =3D "min-level",\ - .value =3D stringify(4),\ - },{\ - .driver =3D "n270" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Penryn" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Conroe" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Nehalem" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Westmere" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "SandyBridge" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "IvyBridge" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Haswell" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Haswell-noTSX" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Broadwell" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D "Broadwell-noTSX" "-" TYPE_X86_CPU,\ - .property =3D "min-xlevel",\ - .value =3D stringify(0x8000000a),\ - },{\ - .driver =3D TYPE_X86_CPU,\ - .property =3D "kvm-no-smi-migration",\ - .value =3D "on",\ - }, - #define PC_COMPAT_2_2 \ HW_COMPAT_2_2 \ PC_CPU_MODEL_IDS("2.2.0") \ diff --git a/hw/core/machine.c b/hw/core/machine.c index a14e343cba..449f7ec8f6 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -255,6 +255,47 @@ GlobalProperty hw_compat_2_4[] =3D { }; const size_t hw_compat_2_4_len =3D G_N_ELEMENTS(hw_compat_2_4); =20 +GlobalProperty hw_compat_2_3[] =3D { + { + .driver =3D "virtio-blk-pci", + .property =3D "any_layout", + .value =3D "off", + },{ + .driver =3D "virtio-balloon-pci", + .property =3D "any_layout", + .value =3D "off", + },{ + .driver =3D "virtio-serial-pci", + .property =3D "any_layout", + .value =3D "off", + },{ + .driver =3D "virtio-9p-pci", + .property =3D "any_layout", + .value =3D "off", + },{ + .driver =3D "virtio-rng-pci", + .property =3D "any_layout", + .value =3D "off", + },{ + .driver =3D TYPE_PCI_DEVICE, + .property =3D "x-pcie-lnksta-dllla", + .value =3D "off", + },{ + .driver =3D "migration", + .property =3D "send-configuration", + .value =3D "off", + },{ + .driver =3D "migration", + .property =3D "send-section-footer", + .value =3D "off", + },{ + .driver =3D "migration", + .property =3D "store-global-state", + .value =3D "off", + }, +}; +const size_t hw_compat_2_3_len =3D G_N_ELEMENTS(hw_compat_2_3); + 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 e4410767c9..02363962e0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -349,6 +349,92 @@ GlobalProperty pc_compat_2_4[] =3D { }; const size_t pc_compat_2_4_len =3D G_N_ELEMENTS(pc_compat_2_4); =20 +GlobalProperty pc_compat_2_3[] =3D { + PC_CPU_MODEL_IDS("2.3.0") + { + .driver =3D TYPE_X86_CPU, + .property =3D "arat", + .value =3D "off", + },{ + .driver =3D "qemu64" "-" TYPE_X86_CPU, + .property =3D "min-level", + .value =3D stringify(4), + },{ + .driver =3D "kvm64" "-" TYPE_X86_CPU, + .property =3D "min-level", + .value =3D stringify(5), + },{ + .driver =3D "pentium3" "-" TYPE_X86_CPU, + .property =3D "min-level", + .value =3D stringify(2), + },{ + .driver =3D "n270" "-" TYPE_X86_CPU, + .property =3D "min-level", + .value =3D stringify(5), + },{ + .driver =3D "Conroe" "-" TYPE_X86_CPU, + .property =3D "min-level", + .value =3D stringify(4), + },{ + .driver =3D "Penryn" "-" TYPE_X86_CPU, + .property =3D "min-level", + .value =3D stringify(4), + },{ + .driver =3D "Nehalem" "-" TYPE_X86_CPU, + .property =3D "min-level", + .value =3D stringify(4), + },{ + .driver =3D "n270" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Penryn" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Conroe" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Nehalem" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Westmere" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "SandyBridge" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "IvyBridge" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Haswell" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Haswell-noTSX" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Broadwell" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D "Broadwell-noTSX" "-" TYPE_X86_CPU, + .property =3D "min-xlevel", + .value =3D stringify(0x8000000a), + },{ + .driver =3D TYPE_X86_CPU, + .property =3D "kvm-no-smi-migration", + .value =3D "on", + }, +}; +const size_t pc_compat_2_3_len =3D G_N_ELEMENTS(pc_compat_2_3); + 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 1465d367d1..d06fdf2bb9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -310,7 +310,7 @@ static void pc_init1(MachineState *machine, * HW_COMPAT_*, PC_COMPAT_*, or * pc_*_machine_options(). */ =20 -static void pc_compat_2_3(MachineState *machine) +static void pc_compat_2_3_fn(MachineState *machine) { PCMachineState *pcms =3D PC_MACHINE(machine); if (kvm_enabled()) { @@ -320,7 +320,7 @@ static void pc_compat_2_3(MachineState *machine) =20 static void pc_compat_2_2(MachineState *machine) { - pc_compat_2_3(machine); + pc_compat_2_3_fn(machine); } =20 static void pc_compat_2_1(MachineState *machine) @@ -566,16 +566,13 @@ DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, =20 static void pc_i440fx_2_3_machine_options(MachineClass *m) { - static GlobalProperty compat[] =3D { - PC_COMPAT_2_3 - }; - pc_i440fx_2_4_machine_options(m); m->hw_version =3D "2.3.0"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len); + compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len); } =20 -DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3, +DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, pc_i440fx_2_3_machine_options); =20 static void pc_i440fx_2_2_machine_options(MachineClass *m) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9ab8484579..29f88f2372 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4263,7 +4263,6 @@ DEFINE_SPAPR_MACHINE(2_4, "2.4", false); static void spapr_machine_2_3_class_options(MachineClass *mc) { static GlobalProperty compat[] =3D { - HW_COMPAT_2_3 { .driver =3D "spapr-pci-host-bridge", .property =3D "dynamic-reconfiguration", @@ -4271,6 +4270,7 @@ static void spapr_machine_2_3_class_options(MachineCl= ass *mc) }, }; spapr_machine_2_4_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_3, hw_compat_2_3_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_SPAPR_MACHINE(2_3, "2.3", false); --=20 2.20.0