|
 |
f832f8 |
From aec30edd21fc46b3e6ad5a1b1e49da77afef5d42 Mon Sep 17 00:00:00 2001
|
|
|
f832f8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
f832f8 |
Date: Thu, 19 Feb 2015 17:14:00 +0100
|
|
|
f832f8 |
Subject: [PATCH] pc: add rhel6.6.0 machine type
|
|
|
f832f8 |
|
|
|
f832f8 |
Message-id: <1424366040-6013-1-git-send-email-ehabkost@redhat.com>
|
|
|
f832f8 |
Patchwork-id: 63901
|
|
|
f832f8 |
O-Subject: [RHEL-7.1.z qemu-kvm PATCH] pc: add rhel6.6.0 machine type
|
|
|
f832f8 |
Bugzilla: 1198958
|
|
|
f832f8 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
f832f8 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
f832f8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
f832f8 |
|
|
|
f832f8 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
f832f8 |
|
|
|
f832f8 |
This enables migration from RHOSP5 to RHOSP6.
|
|
|
f832f8 |
|
|
|
f832f8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
f832f8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
f832f8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
f832f8 |
---
|
|
|
f832f8 |
hw/i386/pc_piix.c | 41 +++++++++++++++++++++++++++++++++++------
|
|
|
f832f8 |
1 file changed, 35 insertions(+), 6 deletions(-)
|
|
|
f832f8 |
|
|
|
f832f8 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
f832f8 |
index 4ea3f67..f4cf2b5 100644
|
|
|
f832f8 |
--- a/hw/i386/pc_piix.c
|
|
|
f832f8 |
+++ b/hw/i386/pc_piix.c
|
|
|
f832f8 |
@@ -794,7 +794,7 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
f832f8 |
DEFAULT_MACHINE_OPTIONS,
|
|
|
f832f8 |
};
|
|
|
f832f8 |
|
|
|
f832f8 |
-#define PC_RHEL6_5_COMPAT \
|
|
|
f832f8 |
+#define PC_RHEL6_6_COMPAT \
|
|
|
f832f8 |
{\
|
|
|
f832f8 |
.driver = "scsi-hd",\
|
|
|
f832f8 |
.property = "discard_granularity",\
|
|
|
f832f8 |
@@ -905,16 +905,12 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
f832f8 |
.property = "romfile",\
|
|
|
f832f8 |
.value = "rhel6-virtio.rom",\
|
|
|
f832f8 |
},{\
|
|
|
f832f8 |
- .driver = TYPE_USB_DEVICE,\
|
|
|
f832f8 |
- .property = "msos-desc",\
|
|
|
f832f8 |
- .value = "no",\
|
|
|
f832f8 |
- },{\
|
|
|
f832f8 |
.driver = "virtio-net-pci",\
|
|
|
f832f8 |
.property = "any_layout",\
|
|
|
f832f8 |
.value = "off",\
|
|
|
f832f8 |
}
|
|
|
f832f8 |
|
|
|
f832f8 |
-static void pc_compat_rhel650(QEMUMachineInitArgs *args)
|
|
|
f832f8 |
+static void pc_compat_rhel660(QEMUMachineInitArgs *args)
|
|
|
f832f8 |
{
|
|
|
f832f8 |
pc_compat_rhel700(args);
|
|
|
f832f8 |
if (!args->cpu_model) {
|
|
|
f832f8 |
@@ -962,6 +958,38 @@ static void pc_compat_rhel650(QEMUMachineInitArgs *args)
|
|
|
f832f8 |
ich9_uhci123_irqpin_override = true;
|
|
|
f832f8 |
}
|
|
|
f832f8 |
|
|
|
f832f8 |
+static void pc_init_rhel660(QEMUMachineInitArgs *args)
|
|
|
f832f8 |
+{
|
|
|
f832f8 |
+ pc_compat_rhel660(args);
|
|
|
f832f8 |
+ pc_init_pci(args);
|
|
|
f832f8 |
+}
|
|
|
f832f8 |
+
|
|
|
f832f8 |
+static QEMUMachine pc_machine_rhel660 = {
|
|
|
f832f8 |
+ .name = "rhel6.6.0",
|
|
|
f832f8 |
+ .desc = "RHEL 6.6.0 PC",
|
|
|
f832f8 |
+ .init = pc_init_rhel660,
|
|
|
f832f8 |
+ .hot_add_cpu = pc_hot_add_cpu,
|
|
|
f832f8 |
+ .max_cpus = RHEL_MAX_CPUS,
|
|
|
f832f8 |
+ .compat_props = (GlobalProperty[]) {
|
|
|
f832f8 |
+ PC_RHEL6_6_COMPAT,
|
|
|
f832f8 |
+ { /* end of list */ }
|
|
|
f832f8 |
+ },
|
|
|
f832f8 |
+ DEFAULT_MACHINE_OPTIONS,
|
|
|
f832f8 |
+};
|
|
|
f832f8 |
+
|
|
|
f832f8 |
+#define PC_RHEL6_5_COMPAT \
|
|
|
f832f8 |
+ PC_RHEL6_6_COMPAT,\
|
|
|
f832f8 |
+ {\
|
|
|
f832f8 |
+ .driver = TYPE_USB_DEVICE,\
|
|
|
f832f8 |
+ .property = "msos-desc",\
|
|
|
f832f8 |
+ .value = "no",\
|
|
|
f832f8 |
+ }
|
|
|
f832f8 |
+
|
|
|
f832f8 |
+static void pc_compat_rhel650(QEMUMachineInitArgs *args)
|
|
|
f832f8 |
+{
|
|
|
f832f8 |
+ pc_compat_rhel660(args);
|
|
|
f832f8 |
+}
|
|
|
f832f8 |
+
|
|
|
f832f8 |
static void pc_init_rhel650(QEMUMachineInitArgs *args)
|
|
|
f832f8 |
{
|
|
|
f832f8 |
pc_compat_rhel650(args);
|
|
|
f832f8 |
@@ -1254,6 +1282,7 @@ static QEMUMachine pc_machine_rhel600 = {
|
|
|
f832f8 |
static void rhel_machine_init(void)
|
|
|
f832f8 |
{
|
|
|
f832f8 |
qemu_register_machine(&pc_machine_rhel700);
|
|
|
f832f8 |
+ qemu_register_machine(&pc_machine_rhel660);
|
|
|
f832f8 |
qemu_register_machine(&pc_machine_rhel650);
|
|
|
f832f8 |
qemu_register_machine(&pc_machine_rhel640);
|
|
|
f832f8 |
qemu_register_machine(&pc_machine_rhel630);
|
|
|
f832f8 |
--
|
|
|
f832f8 |
1.8.3.1
|
|
|
f832f8 |
|