[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/17] pc: Add 2.9 machine-types
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 07/17] pc: Add 2.9 machine-types |
Date: |
Thu, 19 Jan 2017 23:09:26 +0200 |
From: Eduardo Habkost <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Laszlo Ersek <address@hidden>
Cc: Igor Mammedov <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Acked-by: Gabriel Somlo <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>
Cc: Gabriel Somlo <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
include/hw/i386/pc.h | 2 ++
hw/i386/pc_piix.c | 15 ++++++++++++---
hw/i386/pc_q35.c | 13 +++++++++++--
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b22e699..230e9e7 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -375,6 +375,8 @@ int e820_get_num_entries(void);
bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
#define PC_COMPAT_2_8 \
+ HW_COMPAT_2_8 \
+
#define PC_COMPAT_2_7 \
HW_COMPAT_2_7 \
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 5e1adbe..9f102aa 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -437,13 +437,24 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->default_display = "std";
}
-static void pc_i440fx_2_8_machine_options(MachineClass *m)
+static void pc_i440fx_2_9_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = 1;
}
+DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
+ pc_i440fx_2_9_machine_options);
+
+static void pc_i440fx_2_8_machine_options(MachineClass *m)
+{
+ pc_i440fx_2_9_machine_options(m);
+ m->is_default = 0;
+ m->alias = NULL;
+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_8);
+}
+
DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
pc_i440fx_2_8_machine_options);
@@ -451,8 +462,6 @@ DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
static void pc_i440fx_2_7_machine_options(MachineClass *m)
{
pc_i440fx_2_8_machine_options(m);
- m->is_default = 0;
- m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index d042fe0..dd792a8 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -301,19 +301,28 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288;
}
-static void pc_q35_2_8_machine_options(MachineClass *m)
+static void pc_q35_2_9_machine_options(MachineClass *m)
{
pc_q35_machine_options(m);
m->alias = "q35";
}
+DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
+ pc_q35_2_9_machine_options);
+
+static void pc_q35_2_8_machine_options(MachineClass *m)
+{
+ pc_q35_2_9_machine_options(m);
+ m->alias = NULL;
+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_8);
+}
+
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
pc_q35_2_8_machine_options);
static void pc_q35_2_7_machine_options(MachineClass *m)
{
pc_q35_2_8_machine_options(m);
- m->alias = NULL;
m->max_cpus = 255;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);
}
--
MST
- [Qemu-devel] [PULL 00/17] virtio, vhost, pc: fixes, features, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 01/17] virtio-net: enable ioeventfd even if vhost=off, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 02/17] Revert "virtio: turn vq->notification into a nested counter", Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 03/17] virtio: disable notifications again after poll succeeded, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 04/17] vhost_net: device IOTLB support, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 06/17] fw-cfg: turn FW_CFG_FILE_SLOTS into a device property, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 07/17] pc: Add 2.9 machine-types,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 05/17] fw-cfg: support writeable blobs, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 08/17] fw-cfg: bump "x-file-slots" to 0x20 for 2.9+ machine types, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 09/17] virtio: drop an obsolete comment, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 10/17] virtio_mmio: add standard header file, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 11/17] virtio-mmio: switch to linux headers, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 12/17] pci_regs: update to latest linux, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 14/17] update-linux-headers.sh: support __bitwise, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 13/17] virtio_crypto: header update, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 15/17] vhost: drop VHOST_F_DEVICE_IOTLB, Michael S. Tsirkin, 2017/01/19
- [Qemu-devel] [PULL 16/17] virtio: fix up max size checks, Michael S. Tsirkin, 2017/01/19