|
 |
218e99 |
From 8f9887acd04e8db0bebd0ad3fe1cf5d7294abdfd Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
Date: Wed, 31 Jul 2013 08:06:25 +0200
|
|
|
218e99 |
Subject: pc: Add machine type "rhel6.5.0"
|
|
|
218e99 |
|
|
|
218e99 |
Message-id: <1375201922-6794-15-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 52824
|
|
|
218e99 |
O-Subject: [RHEL-7 PATCH v3 14/15] pc: Add machine type "rhel6.5.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 virtio-scsi-pci.vectors. Note: upstream commit 4c205d0
|
|
|
218e99 |
"virtio-scsi: enable MSI-X support" changed vectors from 2 to
|
|
|
218e99 |
DEV_NVECTORS_UNSPECIFIED. The necessary compat_props to keep it at 2
|
|
|
218e99 |
for old machine types were forgotten. The RHEL-6 backport (commit
|
|
|
218e99 |
0ef7672) added them.
|
|
|
218e99 |
|
|
|
218e99 |
Match RHEL-6's has_pvpanic.
|
|
|
218e99 |
|
|
|
218e99 |
RHEL-6's disable_kvm_sep() will be covered separately (bug 918907).
|
|
|
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 a922645..5ca2cc3 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_4_COMPAT \
|
|
|
218e99 |
+#define PC_RHEL6_5_COMPAT \
|
|
|
218e99 |
{\
|
|
|
218e99 |
.driver = "scsi-hd",\
|
|
|
218e99 |
.property = "discard_granularity",\
|
|
|
218e99 |
@@ -865,10 +865,35 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
.value = stringify(1),\
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
+static void pc_init_rhel650(QEMUMachineInitArgs *args)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ pc_init_rhel700(args);
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
+static QEMUMachine pc_machine_rhel650 = {
|
|
|
218e99 |
+ .name = "rhel6.5.0",
|
|
|
218e99 |
+ .desc = "RHEL 6.5.0 PC",
|
|
|
218e99 |
+ .init = pc_init_rhel650,
|
|
|
218e99 |
+ .max_cpus = 255,
|
|
|
218e99 |
+ .compat_props = (GlobalProperty[]) {
|
|
|
218e99 |
+ PC_RHEL6_5_COMPAT,
|
|
|
218e99 |
+ { /* end of list */ }
|
|
|
218e99 |
+ },
|
|
|
218e99 |
+ DEFAULT_MACHINE_OPTIONS,
|
|
|
218e99 |
+};
|
|
|
218e99 |
+
|
|
|
218e99 |
+#define PC_RHEL6_4_COMPAT \
|
|
|
218e99 |
+ PC_RHEL6_5_COMPAT,\
|
|
|
218e99 |
+ {\
|
|
|
218e99 |
+ .driver = "virtio-scsi-pci",\
|
|
|
218e99 |
+ .property = "vectors",\
|
|
|
218e99 |
+ .value = stringify(2),\
|
|
|
218e99 |
+ }
|
|
|
218e99 |
+
|
|
|
218e99 |
static void pc_init_rhel640(QEMUMachineInitArgs *args)
|
|
|
218e99 |
{
|
|
|
218e99 |
has_pvpanic = false;
|
|
|
218e99 |
- pc_init_rhel700(args);
|
|
|
218e99 |
+ pc_init_rhel650(args);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
static QEMUMachine pc_machine_rhel640 = {
|
|
|
218e99 |
@@ -1051,6 +1076,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_rhel650);
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel640);
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel630);
|
|
|
218e99 |
qemu_register_machine(&pc_machine_rhel620);
|