[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 v4 26/28] hw/i386: add pc-i440fx-3.2 & pc-q3
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 v4 26/28] hw/i386: add pc-i440fx-3.2 & pc-q35-3.2 |
Date: |
Tue, 27 Nov 2018 13:27:59 +0400 |
The following patch is going to add compatiblity parameters for
qemu <= 3.1.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/hw/compat.h | 3 +++
include/hw/i386/pc.h | 3 +++
hw/i386/pc_piix.c | 15 ++++++++++++---
hw/i386/pc_q35.c | 13 +++++++++++--
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 6f4d5fc647..70958328fe 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -1,6 +1,9 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
+#define HW_COMPAT_3_1 \
+ /* empty */
+
#define HW_COMPAT_3_0 \
/* empty */
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 136fe497b6..c37d4333a0 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -294,6 +294,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
int e820_get_num_entries(void);
bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
+#define PC_COMPAT_3_1 \
+ HW_COMPAT_3_1
+
#define PC_COMPAT_3_0 \
HW_COMPAT_3_0 \
{\
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 3cc92b8eec..a4dcadac37 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -428,21 +428,30 @@ static void pc_i440fx_machine_options(MachineClass *m)
machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
}
-static void pc_i440fx_3_1_machine_options(MachineClass *m)
+static void pc_i440fx_3_2_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = 1;
}
+DEFINE_I440FX_MACHINE(v3_2, "pc-i440fx-3.2", NULL,
+ pc_i440fx_3_2_machine_options);
+
+static void pc_i440fx_3_1_machine_options(MachineClass *m)
+{
+ pc_i440fx_3_2_machine_options(m);
+ m->is_default = 0;
+ m->alias = NULL;
+ SET_COMPAT(m, PC_COMPAT_3_1);
+}
+
DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
pc_i440fx_3_1_machine_options);
static void pc_i440fx_3_0_machine_options(MachineClass *m)
{
pc_i440fx_3_1_machine_options(m);
- m->is_default = 0;
- m->alias = NULL;
SET_COMPAT(m, PC_COMPAT_3_0);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 19e6ec6675..a990a22f87 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -311,19 +311,28 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288;
}
-static void pc_q35_3_1_machine_options(MachineClass *m)
+static void pc_q35_3_2_machine_options(MachineClass *m)
{
pc_q35_machine_options(m);
m->alias = "q35";
}
+DEFINE_Q35_MACHINE(v3_2, "pc-q35-3.2", NULL,
+ pc_q35_3_2_machine_options);
+
+static void pc_q35_3_1_machine_options(MachineClass *m)
+{
+ pc_q35_3_2_machine_options(m);
+ m->alias = NULL;
+ SET_COMPAT(m, PC_COMPAT_3_1);
+}
+
DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
pc_q35_3_1_machine_options);
static void pc_q35_3_0_machine_options(MachineClass *m)
{
pc_q35_3_1_machine_options(m);
- m->alias = NULL;
SET_COMPAT(m, PC_COMPAT_3_0);
}
--
2.20.0.rc1
- [Qemu-devel] [PATCH for-3.2 v4 18/28] qdev: all globals are now user-provided, (continued)
- [Qemu-devel] [PATCH for-3.2 v4 18/28] qdev: all globals are now user-provided, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 19/28] qdev-props: convert global_props to GPtrArray, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 20/28] qdev-props: remove errp from GlobalProperty, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 21/28] qdev-props: call object_apply_global_props(), Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 22/28] qom: teach interfaces to implement post-init, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 23/28] qom: add object_class_get_class_data(), Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 25/28] machine: add compat-props interface, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 24/28] arm: replace instance_post_init(), Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 26/28] hw/i386: add pc-i440fx-3.2 & pc-q35-3.2,
Marc-André Lureau <=
- [Qemu-devel] [PATCH for-3.2 v4 27/28] hw/arm/virt: add virt-3.2 machine type, Marc-André Lureau, 2018/11/27
- [Qemu-devel] [PATCH for-3.2 v4 28/28] hostmem: use object id for memory region name with >= 3.1, Marc-André Lureau, 2018/11/27
- Re: [Qemu-devel] [PATCH for-3.2 v4 00/28] Generalize machine compatibility properties, Greg Kurz, 2018/11/27
- Re: [Qemu-devel] [PATCH for-3.2 v4 00/28] Generalize machine compatibility properties, no-reply, 2018/11/28
- Re: [Qemu-devel] [PATCH for-3.2 v4 00/28] Generalize machine compatibility properties, no-reply, 2018/11/28