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