From nobody Fri Nov 7 05:59:43 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 1546624508389773.7061214009341; Fri, 4 Jan 2019 09:55:08 -0800 (PST) Received: from localhost ([127.0.0.1]:37592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfTgZ-00062n-8p for importer@patchew.org; Fri, 04 Jan 2019 12:55:07 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfTKk-0004bV-Lc for qemu-devel@nongnu.org; Fri, 04 Jan 2019 12:32:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfTKh-0001jO-MX for qemu-devel@nongnu.org; Fri, 04 Jan 2019 12:32:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42552) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gfTKe-0001gj-SN for qemu-devel@nongnu.org; Fri, 04 Jan 2019 12:32:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E7C2A9707; Fri, 4 Jan 2019 17:32:26 +0000 (UTC) Received: from localhost (ovpn-112-35.ams2.redhat.com [10.36.112.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3388E60A97; Fri, 4 Jan 2019 17:32:24 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 4 Jan 2019 21:30:32 +0400 Message-Id: <20190104173042.32714-19-marcandre.lureau@redhat.com> In-Reply-To: <20190104173042.32714-1-marcandre.lureau@redhat.com> References: <20190104173042.32714-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 04 Jan 2019 17:32:26 +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] [PULL 18/28] compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 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. I decided to rename the conflicting pc_compat_2_2() function with pc_compat_2_2_fn(). 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 | 3 -- include/hw/i386/pc.h | 97 ++------------------------------------------ hw/core/machine.c | 3 ++ hw/i386/pc.c | 95 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 12 +++--- hw/ppc/spapr.c | 2 +- 7 files changed, 110 insertions(+), 105 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index e7e3d2bc3c..2d82d80107 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -324,4 +324,7 @@ extern const size_t hw_compat_2_4_len; extern GlobalProperty hw_compat_2_3[]; extern const size_t hw_compat_2_3_len; =20 +extern GlobalProperty hw_compat_2_2[]; +extern const size_t hw_compat_2_2_len; + #endif diff --git a/include/hw/compat.h b/include/hw/compat.h index fbe64d5983..3bd91908e4 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,9 +1,6 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H =20 -#define HW_COMPAT_2_2 \ - /* empty */ - #define HW_COMPAT_2_1 \ {\ .driver =3D "intel-hda",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index def40cd545..49b45bb79d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -330,6 +330,9 @@ extern const size_t pc_compat_2_4_len; extern GlobalProperty pc_compat_2_3[]; extern const size_t pc_compat_2_3_len; =20 +extern GlobalProperty pc_compat_2_2[]; +extern const size_t pc_compat_2_2_len; + /* Helper for setting model-id for CPU models that changed model-id * depending on QEMU versions up to QEMU 2.4. */ @@ -350,100 +353,6 @@ extern const size_t pc_compat_2_3_len; .value =3D "QEMU Virtual CPU version " v,\ }, =20 -#define PC_COMPAT_2_2 \ - HW_COMPAT_2_2 \ - PC_CPU_MODEL_IDS("2.2.0") \ - {\ - .driver =3D "kvm64" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "kvm32" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Conroe" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Penryn" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Nehalem" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Westmere" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "SandyBridge" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Haswell" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Broadwell" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Opteron_G1" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Opteron_G2" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Opteron_G3" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Opteron_G4" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Opteron_G5" "-" TYPE_X86_CPU,\ - .property =3D "vme",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Haswell" "-" TYPE_X86_CPU,\ - .property =3D "f16c",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Haswell" "-" TYPE_X86_CPU,\ - .property =3D "rdrand",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Broadwell" "-" TYPE_X86_CPU,\ - .property =3D "f16c",\ - .value =3D "off",\ - },\ - {\ - .driver =3D "Broadwell" "-" TYPE_X86_CPU,\ - .property =3D "rdrand",\ - .value =3D "off",\ - }, - #define PC_COMPAT_2_1 \ HW_COMPAT_2_1 \ PC_CPU_MODEL_IDS("2.1.0") \ diff --git a/hw/core/machine.c b/hw/core/machine.c index d37cdc3153..cfa9a5d95f 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -306,6 +306,9 @@ GlobalProperty hw_compat_2_3[] =3D { }; const size_t hw_compat_2_3_len =3D G_N_ELEMENTS(hw_compat_2_3); =20 +GlobalProperty hw_compat_2_2[] =3D {}; +const size_t hw_compat_2_2_len =3D G_N_ELEMENTS(hw_compat_2_2); + 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 1f6d7809ce..b92d1900da 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -441,6 +441,101 @@ GlobalProperty pc_compat_2_3[] =3D { }; const size_t pc_compat_2_3_len =3D G_N_ELEMENTS(pc_compat_2_3); =20 +GlobalProperty pc_compat_2_2[] =3D { + PC_CPU_MODEL_IDS("2.2.0") + { + .driver =3D "kvm64" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "kvm32" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Conroe" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Penryn" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Nehalem" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Westmere" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "SandyBridge" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Haswell" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Broadwell" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Opteron_G1" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Opteron_G2" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Opteron_G3" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Opteron_G4" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Opteron_G5" "-" TYPE_X86_CPU, + .property =3D "vme", + .value =3D "off", + }, + { + .driver =3D "Haswell" "-" TYPE_X86_CPU, + .property =3D "f16c", + .value =3D "off", + }, + { + .driver =3D "Haswell" "-" TYPE_X86_CPU, + .property =3D "rdrand", + .value =3D "off", + }, + { + .driver =3D "Broadwell" "-" TYPE_X86_CPU, + .property =3D "f16c", + .value =3D "off", + }, + { + .driver =3D "Broadwell" "-" TYPE_X86_CPU, + .property =3D "rdrand", + .value =3D "off", + }, +}; +const size_t pc_compat_2_2_len =3D G_N_ELEMENTS(pc_compat_2_2); + 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 5b03f9ef80..d2a2bacba4 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -318,14 +318,14 @@ static void pc_compat_2_3_fn(MachineState *machine) } } =20 -static void pc_compat_2_2(MachineState *machine) +static void pc_compat_2_2_fn(MachineState *machine) { pc_compat_2_3_fn(machine); } =20 static void pc_compat_2_1(MachineState *machine) { - pc_compat_2_2(machine); + pc_compat_2_2_fn(machine); x86_cpu_change_kvm_default("svm", NULL); } =20 @@ -578,18 +578,16 @@ DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compa= t_2_3_fn, static void pc_i440fx_2_2_machine_options(MachineClass *m) { PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - static GlobalProperty compat[] =3D { - PC_COMPAT_2_2 - }; =20 pc_i440fx_2_3_machine_options(m); m->hw_version =3D "2.2.0"; m->default_machine_opts =3D "firmware=3Dbios-256k.bin,suppress-vmdesc= =3Don"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len); + compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len); pcmc->rsdp_in_ram =3D false; } =20 -DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2, +DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn, pc_i440fx_2_2_machine_options); =20 static void pc_i440fx_2_1_machine_options(MachineClass *m) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b99ed19baf..449c5dd58d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4341,7 +4341,6 @@ DEFINE_SPAPR_MACHINE(2_3, "2.3", false); static void spapr_machine_2_2_class_options(MachineClass *mc) { static GlobalProperty compat[] =3D { - HW_COMPAT_2_2 { .driver =3D TYPE_SPAPR_PCI_HOST_BRIDGE, .property =3D "mem_win_size", @@ -4350,6 +4349,7 @@ static void spapr_machine_2_2_class_options(MachineCl= ass *mc) }; =20 spapr_machine_2_3_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_2, hw_compat_2_2_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); mc->default_machine_opts =3D "modern-hotplug-events=3Doff,suppress-vmd= esc=3Don"; } --=20 2.20.1.2.gb21ebb671b