[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/55] pc: Add pc-*-2.6 machine classes
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 26/55] pc: Add pc-*-2.6 machine classes |
Date: |
Tue, 22 Dec 2015 18:53:54 +0200 |
From: Eduardo Habkost <address@hidden>
Add pc-i440fx-2.6 and pc-q35-2.6 machine classes.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
include/hw/compat.h | 3 +++
include/hw/i386/pc.h | 4 ++++
hw/i386/pc_piix.c | 16 +++++++++++++---
hw/i386/pc_q35.c | 13 +++++++++++--
4 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/include/hw/compat.h b/include/hw/compat.h
index bcb36ef..eaf5ab4 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_2_5 \
+ /* empty */
+
#define HW_COMPAT_2_4 \
{\
.driver = "virtio-blk-device",\
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index e5eb15c..e2a42db 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -350,7 +350,11 @@ 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_2_5 \
+ HW_COMPAT_2_5
+
#define PC_COMPAT_2_4 \
+ PC_COMPAT_2_5 \
HW_COMPAT_2_4 \
{\
.driver = "Haswell-" TYPE_X86_CPU,\
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index d9b9ce8..438cdae 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -418,13 +418,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->default_display = "std";
}
-static void pc_i440fx_2_5_machine_options(MachineClass *m)
+static void pc_i440fx_2_6_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = 1;
}
+DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
+ pc_i440fx_2_6_machine_options);
+
+
+static void pc_i440fx_2_5_machine_options(MachineClass *m)
+{
+ pc_i440fx_2_6_machine_options(m);
+ m->alias = NULL;
+ m->is_default = 0;
+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
+}
+
DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
pc_i440fx_2_5_machine_options);
@@ -434,8 +446,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_2_5_machine_options(m);
m->hw_version = "2.4.0";
- m->alias = NULL;
- m->is_default = 0;
pcmc->broken_reserved_end = true;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index f3a3595..412b3cd 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -349,12 +349,22 @@ static void pc_q35_machine_options(MachineClass *m)
m->no_tco = 0;
}
-static void pc_q35_2_5_machine_options(MachineClass *m)
+static void pc_q35_2_6_machine_options(MachineClass *m)
{
pc_q35_machine_options(m);
m->alias = "q35";
}
+DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
+ pc_q35_2_6_machine_options);
+
+static void pc_q35_2_5_machine_options(MachineClass *m)
+{
+ pc_q35_2_6_machine_options(m);
+ m->alias = NULL;
+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
+}
+
DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
pc_q35_2_5_machine_options);
@@ -363,7 +373,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_2_5_machine_options(m);
m->hw_version = "2.4.0";
- m->alias = NULL;
pcmc->broken_reserved_end = true;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
}
--
MST
- [Qemu-devel] [PULL 17/55] ipmi: Add a BT low-level interface, (continued)
- [Qemu-devel] [PULL 17/55] ipmi: Add a BT low-level interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 16/55] ipmi: Add an ISA KCS low-level interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 18/55] ipmi: Add tests, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 20/55] ipmi: Add migration capability to the IPMI devices., Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 19/55] ipmi: Add documentation, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 23/55] ipmi: Add a force off function, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 22/55] ipmi: Add firmware registration to the ISA interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 21/55] ipmi: Add a firmware configuration repository, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 24/55] q35: skip q35-acpi-dsdt.aml load if not needed, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 25/55] pc: Remove redundant code from pc-*-2.3 machine classes, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 26/55] pc: Add pc-*-2.6 machine classes,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 27/55] pc: Change indentation of PC_COMPAT_* to 4 spaces, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 28/55] hw/compat.h: Change indentation of HW_COMPAT_* to 4 spaces, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 30/55] nvdimm: implement NVDIMM device abstract, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 29/55] docs/pci_expander_bridge: fix typo, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 31/55] acpi: support specified oem table id for build_header, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 32/55] nvdimm acpi: build ACPI NFIT table, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 33/55] nvdimm acpi: build ACPI nvdimm devices, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 34/55] nvdimm: add maintain info, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 35/55] acpi: add aml_derefof, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 36/55] acpi: add aml_sizeof, Michael S. Tsirkin, 2015/12/22