|
 |
218e99 |
From 80dd2cb01a00e19e5227955e31fcfebbfcec1f85 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
Date: Wed, 31 Jul 2013 08:04:57 +0200
|
|
|
218e99 |
Subject: pc: Add machine type "rhel6.1.0"
|
|
|
218e99 |
|
|
|
218e99 |
Message-id: <1375201922-6794-11-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 52822
|
|
|
218e99 |
O-Subject: [RHEL-7 PATCH v3 10/15] pc: Add machine type "rhel6.1.0"
|
|
|
218e99 |
Bugzilla: 983991
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Match RHEL-6's compat_props qxl.revision, qxl-vga.revision,
|
|
|
218e99 |
VGA.rombar.
|
|
|
218e99 |
|
|
|
218e99 |
RHEL-6's vmware-svga.rombar isn't needed, as we won't ship the device.
|
|
|
218e99 |
|
|
|
218e99 |
RHEL-6's non-upstream virtio-serial-pci.flow_control isn't needed.
|
|
|
218e99 |
RHEL-6 has it to enable migration back to RHEL-6.0 (see qemu-kvm-rhel6
|
|
|
218e99 |
commit 975ced4), which isn't relevant in RHEL-7.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
218e99 |
index e48545b..4ab39cd 100644
|
|
|
218e99 |
--- a/hw/i386/pc_piix.c
|
|
|
218e99 |
+++ b/hw/i386/pc_piix.c
|
|
|
218e99 |
@@ -777,7 +777,7 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
DEFAULT_MACHINE_OPTIONS,
|
|
|
218e99 |
};
|
|
|
218e99 |
|
|
|
218e99 |
-#define PC_RHEL6_0_COMPAT \
|
|
|
218e99 |
+#define PC_RHEL6_1_COMPAT \
|
|
|
218e99 |
{\
|
|
|
218e99 |
.driver = "Conroe-" TYPE_X86_CPU,\
|
|
|
218e99 |
.property = "model",\
|
|
|
218e99 |
@@ -870,11 +870,11 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
},{\
|
|
|
218e99 |
.driver = "qxl",\
|
|
|
218e99 |
.property = "revision",\
|
|
|
218e99 |
- .value = stringify(1),\
|
|
|
218e99 |
+ .value = stringify(2),\
|
|
|
218e99 |
},{\
|
|
|
218e99 |
.driver = "qxl-vga",\
|
|
|
218e99 |
.property = "revision",\
|
|
|
218e99 |
- .value = stringify(1),\
|
|
|
218e99 |
+ .value = stringify(2),\
|
|
|
218e99 |
},{\
|
|
|
218e99 |
.driver = "VGA",\
|
|
|
218e99 |
.property = "mmio",\
|
|
|
218e99 |
@@ -923,6 +923,38 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
.driver = "AC97",\
|
|
|
218e99 |
.property = "use_broken_id",\
|
|
|
218e99 |
.value = stringify(1),\
|
|
|
218e99 |
+ }
|
|
|
218e99 |
+
|
|
|
218e99 |
+static void pc_init_rhel610(QEMUMachineInitArgs *args)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ has_pvpanic = false;
|
|
|
218e99 |
+ disable_kvm_pv_eoi();
|
|
|
218e99 |
+ enable_compat_apic_id_mode();
|
|
|
218e99 |
+ pc_init_rhel700(args);
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
+static QEMUMachine pc_machine_rhel610 = {
|
|
|
218e99 |
+ .name = "rhel6.1.0",
|
|
|
218e99 |
+ .desc = "RHEL 6.1.0 PC",
|
|
|
218e99 |
+ .init = pc_init_rhel610,
|
|
|
218e99 |
+ .max_cpus = 255,
|
|
|
218e99 |
+ .compat_props = (GlobalProperty[]) {
|
|
|
218e99 |
+ PC_RHEL6_1_COMPAT,
|
|
|
218e99 |
+ { /* end of list */ }
|
|
|
218e99 |
+ },
|
|
|
218e99 |
+ DEFAULT_MACHINE_OPTIONS,
|
|
|
218e99 |
+};
|
|
|
218e99 |
+
|
|
|
218e99 |
+#define PC_RHEL6_0_COMPAT \
|
|
|
218e99 |
+ PC_RHEL6_1_COMPAT,\
|
|
|
218e99 |
+ {\
|
|
|
218e99 |
+ .driver = "qxl",\
|
|
|
218e99 |
+ .property = "revision",\
|
|
|
218e99 |
+ .value = stringify(1),\
|
|
|
218e99 |
+ },{\
|
|
|
218e99 |
+ .driver = "qxl-vga",\
|
|
|
218e99 |
+ .property = "revision",\
|
|
|
218e99 |
+ .value = stringify(1),\
|
|
|
218e99 |
},{\
|
|
|
218e99 |
.driver = "VGA",\
|
|
|
218e99 |
.property = "rombar",\
|
|
|
218e99 |
@@ -931,10 +963,7 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
|
|
|
218e99 |
static void pc_init_rhel600(QEMUMachineInitArgs *args)
|
|
|
218e99 |
{
|
|
|
218e99 |
- has_pvpanic = false;
|
|
|
218e99 |
- disable_kvm_pv_eoi();
|
|
|
218e99 |
- enable_compat_apic_id_mode();
|
|
|
218e99 |
- pc_init_rhel700(args);
|
|
|
218e99 |
+ pc_init_rhel610(args);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
static QEMUMachine pc_machine_rhel600 = {
|
|
|
218e99 |
@@ -952,6 +981,7 @@ static QEMUMachine pc_machine_rhel600 = {
|
|
|
218e99 |
static void rhel_machine_init(void)
|
|
|
218e99 |
{
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel700);
|
|
|
218e99 |
+ qemu_register_machine(&pc_machine_rhel610);
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel600);
|
|
|
218e99 |
}
|
|
|
218e99 |
|