|
 |
d81766 |
From c2751d71086c64605ecf4b48d87c5780afca9aad Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
Date: Wed, 18 Sep 2013 20:49:59 +0200
|
|
|
d81766 |
Subject: target-i386: add cpu64-rhel6 CPU model
|
|
|
d81766 |
|
|
|
d81766 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
Message-id: <1379537399-7308-1-git-send-email-ehabkost@redhat.com>
|
|
|
d81766 |
Patchwork-id: 54451
|
|
|
d81766 |
O-Subject: [RHEL-7 qemu-kvm PATCH] target-i386: add cpu64-rhel6 CPU model
|
|
|
d81766 |
Bugzilla: 918907
|
|
|
d81766 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Bugzilla: 918907
|
|
|
d81766 |
Upstream status: not applicable
|
|
|
d81766 |
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6300787
|
|
|
d81766 |
|
|
|
d81766 |
RHEL-6 has a cpu64-rhel6 CPU model, and it is even the default CPU
|
|
|
d81766 |
model. We need to allow migration from RHEL-6, so we need to have a
|
|
|
d81766 |
compatible cpu64-rhel6 CPU model to be present.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
d81766 |
index 6d008ab..cc3ca85 100644
|
|
|
d81766 |
--- a/target-i386/cpu.c
|
|
|
d81766 |
+++ b/target-i386/cpu.c
|
|
|
d81766 |
@@ -890,6 +890,29 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
d81766 |
.model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz",
|
|
|
d81766 |
},
|
|
|
d81766 |
{
|
|
|
d81766 |
+ .name = "cpu64-rhel6",
|
|
|
d81766 |
+ .level = 4,
|
|
|
d81766 |
+ .vendor = CPUID_VENDOR_AMD,
|
|
|
d81766 |
+ .family = 6,
|
|
|
d81766 |
+ .model = 13,
|
|
|
d81766 |
+ .stepping = 3,
|
|
|
d81766 |
+ .features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR |
|
|
|
d81766 |
+ CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV |
|
|
|
d81766 |
+ CPUID_MCA | CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC |
|
|
|
d81766 |
+ CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC |
|
|
|
d81766 |
+ CPUID_PSE | CPUID_DE | CPUID_FP87,
|
|
|
d81766 |
+ .features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3,
|
|
|
d81766 |
+ .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_FXSR |
|
|
|
d81766 |
+ CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PAT | CPUID_EXT2_CMOV |
|
|
|
d81766 |
+ CPUID_EXT2_PGE | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
|
|
|
d81766 |
+ CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR | CPUID_EXT2_TSC |
|
|
|
d81766 |
+ CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
d81766 |
+ .features[FEAT_8000_0001_ECX] = CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
|
|
|
d81766 |
+ CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
|
|
|
d81766 |
+ .xlevel = 0x8000000A,
|
|
|
d81766 |
+ .model_id = "QEMU Virtual CPU version (cpu64-rhel6)",
|
|
|
d81766 |
+ },
|
|
|
d81766 |
+ {
|
|
|
d81766 |
.name = "Conroe",
|
|
|
d81766 |
.level = 4,
|
|
|
d81766 |
.vendor = CPUID_VENDOR_INTEL,
|