yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From 990b368672cccb1c1c9fe189517abedf5455cb5c Mon Sep 17 00:00:00 2001
0a122b
From: Eduardo Habkost <ehabkost@redhat.com>
0a122b
Date: Tue, 25 Mar 2014 16:03:46 +0100
0a122b
Subject: [PATCH 1/2] pc: Use cpu64-rhel6 CPU model by default on rhel6 machine-types
0a122b
0a122b
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
0a122b
Message-id: <1395763427-31684-2-git-send-email-ehabkost@redhat.com>
0a122b
Patchwork-id: 58246
0a122b
O-Subject: [RHEL7 qemu-kvm PATCH 1/2] pc: Use cpu64-rhel6 CPU model by default on rhel6 machine-types
0a122b
Bugzilla: 1080170
0a122b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
0a122b
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
0a122b
RH-Acked-by: Bandan Das <bsd@redhat.com>
0a122b
0a122b
Bugzilla: 1080170
0a122b
Brew scratch build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7250917
0a122b
Upstream status: not applicable
0a122b
0a122b
On RHEL-6, cpu64-rhel6 was the default CPU model, so use it as default
0a122b
on rhel6.* machine-types so we keep the ABI and not break RHEL6->RHEL7
0a122b
live-migration.
0a122b
0a122b
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
0a122b
---
0a122b
 hw/i386/pc_piix.c | 3 +++
0a122b
 1 file changed, 3 insertions(+)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 hw/i386/pc_piix.c |    3 +++
0a122b
 1 files changed, 3 insertions(+), 0 deletions(-)
0a122b
0a122b
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
0a122b
index be68098..940816f 100644
0a122b
--- a/hw/i386/pc_piix.c
0a122b
+++ b/hw/i386/pc_piix.c
0a122b
@@ -917,6 +917,9 @@ static QEMUMachine pc_machine_rhel700 = {
0a122b
 static void pc_compat_rhel650(QEMUMachineInitArgs *args)
0a122b
 {
0a122b
     pc_compat_rhel700(args);
0a122b
+    if (!args->cpu_model) {
0a122b
+        args->cpu_model = "cpu64-rhel6";
0a122b
+    }
0a122b
     x86_cpu_compat_set_features("pentium", FEAT_1_EDX, 0, CPUID_APIC);
0a122b
     x86_cpu_compat_set_features("pentium2", FEAT_1_EDX, 0, CPUID_APIC);
0a122b
     x86_cpu_compat_set_features("pentium3", FEAT_1_EDX, 0, CPUID_APIC);
0a122b
-- 
0a122b
1.7.1
0a122b