|
 |
218e99 |
From 04ee5ae0197b004e2fb59970359da39788868182 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
Date: Wed, 31 Jul 2013 08:05:46 +0200
|
|
|
218e99 |
Subject: pc: Add machine type "rhel6.3.0"
|
|
|
218e99 |
|
|
|
218e99 |
Message-id: <1375201922-6794-13-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 52826
|
|
|
218e99 |
O-Subject: [RHEL-7 PATCH v3 12/15] pc: Add machine type "rhel6.3.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 |
RHEL-6's non-upstream virtio-net-pci.x-__com_redhat_rhel620_compat
|
|
|
218e99 |
will be covered separately, if necessary (no BZ yet).
|
|
|
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 eaf3af1..dff2543 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_2_COMPAT \
|
|
|
218e99 |
+#define PC_RHEL6_3_COMPAT \
|
|
|
218e99 |
{\
|
|
|
218e99 |
.driver = "Conroe-" TYPE_X86_CPU,\
|
|
|
218e99 |
.property = "model",\
|
|
|
218e99 |
@@ -909,7 +909,7 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
.value = stringify(1),\
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
-static void pc_init_rhel620(QEMUMachineInitArgs *args)
|
|
|
218e99 |
+static void pc_init_rhel630(QEMUMachineInitArgs *args)
|
|
|
218e99 |
{
|
|
|
218e99 |
has_pvpanic = false;
|
|
|
218e99 |
disable_kvm_pv_eoi();
|
|
|
218e99 |
@@ -917,6 +917,26 @@ static void pc_init_rhel620(QEMUMachineInitArgs *args)
|
|
|
218e99 |
pc_init_rhel700(args);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
+static QEMUMachine pc_machine_rhel630 = {
|
|
|
218e99 |
+ .name = "rhel6.3.0",
|
|
|
218e99 |
+ .desc = "RHEL 6.3.0 PC",
|
|
|
218e99 |
+ .init = pc_init_rhel630,
|
|
|
218e99 |
+ .max_cpus = 255,
|
|
|
218e99 |
+ .compat_props = (GlobalProperty[]) {
|
|
|
218e99 |
+ PC_RHEL6_3_COMPAT,
|
|
|
218e99 |
+ { /* end of list */ }
|
|
|
218e99 |
+ },
|
|
|
218e99 |
+ DEFAULT_MACHINE_OPTIONS,
|
|
|
218e99 |
+};
|
|
|
218e99 |
+
|
|
|
218e99 |
+#define PC_RHEL6_2_COMPAT \
|
|
|
218e99 |
+ PC_RHEL6_3_COMPAT
|
|
|
218e99 |
+
|
|
|
218e99 |
+static void pc_init_rhel620(QEMUMachineInitArgs *args)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ pc_init_rhel630(args);
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
static QEMUMachine pc_machine_rhel620 = {
|
|
|
218e99 |
.name = "rhel6.2.0",
|
|
|
218e99 |
.desc = "RHEL 6.2.0 PC",
|
|
|
218e99 |
@@ -1010,6 +1030,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_rhel630);
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel620);
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel610);
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel600);
|