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