[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 11/28] compat: replace PC_COMPAT_2_9 & HW_COMPAT_
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v6 11/28] compat: replace PC_COMPAT_2_9 & HW_COMPAT_2_9 macros |
Date: |
Thu, 13 Dec 2018 01:48:33 +0400 |
Use static arrays instead.
Suggested-by: Eduardo Habkost <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
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 f701b66183..226d6cfaa7 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -302,4 +302,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;
+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
-#define HW_COMPAT_2_9 \
- {\
- .driver = "pci-bridge",\
- .property = "shpc",\
- .value = "off",\
- },{\
- .driver = "intel-iommu",\
- .property = "pt",\
- .value = "off",\
- },{\
- .driver = "virtio-net-device",\
- .property = "x-mtu-bypass-backend",\
- .value = "off",\
- },{\
- .driver = "pcie-root-port",\
- .property = "x-migrate-msix",\
- .value = "false",\
- },
-
#define HW_COMPAT_2_8 \
{\
.driver = "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;
-#define PC_COMPAT_2_9 \
- HW_COMPAT_2_9 \
- {\
- .driver = "mch",\
- .property = "extended-tseg-mbytes",\
- .value = stringify(0),\
- },\
+extern GlobalProperty pc_compat_2_9[];
+extern const size_t pc_compat_2_9_len;
#define PC_COMPAT_2_8 \
HW_COMPAT_2_8 \
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index f0c9929c18..a6ad781099 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1918,12 +1918,8 @@ DEFINE_VIRT_MACHINE(2, 10)
static void virt_machine_2_9_options(MachineClass *mc)
{
- static GlobalProperty compat[] = {
- 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)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 7ab83bf4e2..2d7e774a5d 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -91,6 +91,27 @@ GlobalProperty hw_compat_2_10[] = {
};
const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10);
+GlobalProperty hw_compat_2_9[] = {
+ {
+ .driver = "pci-bridge",
+ .property = "shpc",
+ .value = "off",
+ },{
+ .driver = "intel-iommu",
+ .property = "pt",
+ .value = "off",
+ },{
+ .driver = "virtio-net-device",
+ .property = "x-mtu-bypass-backend",
+ .value = "off",
+ },{
+ .driver = "pcie-root-port",
+ .property = "x-migrate-msix",
+ .value = "false",
+ },
+};
+const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9);
+
static char *machine_get_accel(Object *obj, Error **errp)
{
MachineState *ms = MACHINE(obj);
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 34d3cf9b30..1fcd084deb 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -180,6 +180,15 @@ GlobalProperty pc_compat_2_10[] = {
};
const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10);
+GlobalProperty pc_compat_2_9[] = {
+ {
+ .driver = "mch",
+ .property = "extended-tseg-mbytes",
+ .value = stringify(0),
+ },
+};
+const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9);
+
void gsi_handler(void *opaque, int n, int level)
{
GSIState *s = opaque;
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index d3e795de20..5bc3ad0331 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,
static void pc_i440fx_2_9_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- 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 = numa_legacy_auto_assign_ram;
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 8d708cd163..4e57830a6d 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -378,12 +378,9 @@ DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
static void pc_q35_2_9_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- 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);
}
DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 10e91d857c..7aa3a09ed4 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4068,7 +4068,6 @@ static void spapr_machine_2_9_class_options(MachineClass
*mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
- HW_COMPAT_2_9
{
.driver = TYPE_POWERPC_CPU,
.property = "pre-2.10-migration",
@@ -4077,6 +4076,7 @@ static void spapr_machine_2_9_class_options(MachineClass
*mc)
};
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 = numa_legacy_auto_assign_ram;
smc->pre_2_10_has_unused_icps = true;
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5c6e3ee165..dbd1ddb24b 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -740,7 +740,6 @@ static void ccw_machine_2_9_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
- HW_COMPAT_2_9
{
.driver = TYPE_S390_STATTRIB,
.property = "migration-enabled",
@@ -749,6 +748,7 @@ static void ccw_machine_2_9_class_options(MachineClass *mc)
};
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 = false;
}
--
2.20.0
- [Qemu-devel] [PATCH v6 01/28] hw: apply accel compat properties without touching globals, (continued)
- [Qemu-devel] [PATCH v6 01/28] hw: apply accel compat properties without touching globals, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 02/28] machines: replace COMPAT define with a static array, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 05/28] hw: remove SET_MACHINE_COMPAT, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 03/28] hw: apply machine compat properties without touching globals, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 06/28] compat: replace PC_COMPAT_3_1 & HW_COMPAT_3_1 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 04/28] machine: move compat properties out of globals, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 07/28] compat: replace PC_COMPAT_3_0 & HW_COMPAT_3_0 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 08/28] compat: replace PC_COMPAT_2_12 & HW_COMPAT_2_12 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 09/28] compat: replace PC_COMPAT_2_11 & HW_COMPAT_2_11 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 10/28] compat: replace PC_COMPAT_2_10 & HW_COMPAT_2_10 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 11/28] compat: replace PC_COMPAT_2_9 & HW_COMPAT_2_9 macros,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v6 12/28] compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 13/28] compat: replace PC_COMPAT_2_7 & HW_COMPAT_2_7 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 14/28] compat: replace PC_COMPAT_2_6 & HW_COMPAT_2_6 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 15/28] compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 16/28] compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 18/28] compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 19/28] compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 17/28] compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 macros, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 20/28] include: remove compat.h, Marc-André Lureau, 2018/12/12
- [Qemu-devel] [PATCH v6 22/28] qdev: make a separate helper function to apply compat properties, Marc-André Lureau, 2018/12/12