[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] pc, q35: add 2.12 machine types
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 1/2] pc, q35: add 2.12 machine types |
Date: |
Fri, 15 Dec 2017 18:02:49 +0300 |
Signed-off-by: Denis V. Lunev <address@hidden>
CC: "Michael S. Tsirkin" <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
CC: Max Reitz <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Richard Henderson <address@hidden>
CC: Eduardo Habkost <address@hidden>
---
include/hw/compat.h | 2 ++
include/hw/i386/pc.h | 3 +++
hw/i386/pc_piix.c | 13 ++++++++++++-
hw/i386/pc_q35.c | 12 +++++++++++-
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/include/hw/compat.h b/include/hw/compat.h
index cf389b4..026fee9 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -1,6 +1,8 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
+#define HW_COMPAT_2_11 \
+
#define HW_COMPAT_2_10 \
{\
.driver = "virtio-mouse-device",\
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ef438bd..e08c492 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -369,6 +369,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_2_11 \
+ HW_COMPAT_2_11 \
+
#define PC_COMPAT_2_10 \
HW_COMPAT_2_10 \
{\
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 5e47528..25380b0 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -430,13 +430,24 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->default_display = "std";
}
-static void pc_i440fx_2_11_machine_options(MachineClass *m)
+static void pc_i440fx_2_12_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = 1;
}
+DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL,
+ pc_i440fx_2_12_machine_options);
+
+static void pc_i440fx_2_11_machine_options(MachineClass *m)
+{
+ pc_i440fx_2_12_machine_options(m);
+ m->is_default = 0;
+ m->alias = NULL;
+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_11);
+}
+
DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
pc_i440fx_2_11_machine_options);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index d606004..a9b9208 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -303,12 +303,22 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288;
}
-static void pc_q35_2_11_machine_options(MachineClass *m)
+static void pc_q35_2_12_machine_options(MachineClass *m)
{
pc_q35_machine_options(m);
m->alias = "q35";
}
+DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,
+ pc_q35_2_12_machine_options);
+
+static void pc_q35_2_11_machine_options(MachineClass *m)
+{
+ pc_q35_2_12_machine_options(m);
+ m->alias = NULL;
+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_11);
+}
+
DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
pc_q35_2_11_machine_options);
--
2.7.4
- [Qemu-devel] [PATCH v3 0/2] virtio: fix IO request length in virtio SCSI/block, Denis V. Lunev, 2017/12/15
- [Qemu-devel] [PATCH 1/2] pc, q35: add 2.12 machine types,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Denis V. Lunev, 2017/12/15
- Re: [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Stefan Hajnoczi, 2017/12/18
- Re: [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Harris, James R, 2017/12/18
- Re: [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Felipe Franciosi, 2017/12/18
- Re: [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Denis V. Lunev, 2017/12/18
- Re: [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Roman Kagan, 2017/12/19
- Re: [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Liu, Changpeng, 2017/12/19
- Re: [Qemu-devel] [PATCH 2/2] virtio: fix IO request length in virtio SCSI/block, Michael S. Tsirkin, 2017/12/19
Re: [Qemu-devel] [PATCH v3 0/2] virtio: fix IO request length in virtio SCSI/block, Stefan Hajnoczi, 2017/12/18