|
 |
0a122b |
From d56b59537e7039d62f4ae68610eb0763d88f9289 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
0a122b |
Date: Wed, 15 Jan 2014 19:37:36 -0500
|
|
|
0a122b |
Subject: [PATCH 07/14] pc: Fix rhel6.* 3dnow & 3dnowext compat bits
|
|
|
0a122b |
|
|
|
0a122b |
Message-id: <1389814656-20101-1-git-send-email-ehabkost@redhat.com>
|
|
|
0a122b |
Patchwork-id: 56728
|
|
|
0a122b |
O-Subject: [RHEL-7 qemu-kvm PATCH] pc: Fix rhel6.* 3dnow & 3dnowext compat bits
|
|
|
0a122b |
Bugzilla: 918907
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Bugzilla: 918907
|
|
|
0a122b |
Upstream status: not applicable
|
|
|
0a122b |
Brew scratch build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6879262
|
|
|
0a122b |
|
|
|
0a122b |
RHEL-6 qemu-kvm has a hack that unconditionally disables 3dnow and
|
|
|
0a122b |
3dnowext on the CPUID handling code. To keep compatibility we need to do
|
|
|
0a122b |
the same on the rhel6.* machine-types.
|
|
|
0a122b |
|
|
|
0a122b |
The hack on RHEL-6 is at target-i386/cpuid.c:cpu_x86_cpuid():
|
|
|
0a122b |
|
|
|
0a122b |
switch(index) {
|
|
|
0a122b |
[...]
|
|
|
0a122b |
case 0x80000001:
|
|
|
0a122b |
[...]
|
|
|
0a122b |
if (kvm_enabled()) {
|
|
|
0a122b |
[...]
|
|
|
0a122b |
/* 3dnow */
|
|
|
0a122b |
*edx &= ~0xc0000000;
|
|
|
0a122b |
} [...]
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/i386/pc_piix.c | 4 ++++
|
|
|
0a122b |
1 file changed, 4 insertions(+)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/i386/pc_piix.c | 4 ++++
|
|
|
0a122b |
1 file changed, 4 insertions(+)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
0a122b |
index 2961bc8..29c013a 100644
|
|
|
0a122b |
--- a/hw/i386/pc_piix.c
|
|
|
0a122b |
+++ b/hw/i386/pc_piix.c
|
|
|
0a122b |
@@ -902,6 +902,10 @@ static void pc_init_rhel650(QEMUMachineInitArgs *args)
|
|
|
0a122b |
x86_cpu_compat_set_features("Opteron_G3", FEAT_8000_0001_EDX,
|
|
|
0a122b |
0, CPUID_EXT2_RDTSCP);
|
|
|
0a122b |
|
|
|
0a122b |
+ /* RHEL-6 had 3dnow & 3dnowext unconditionally disabled on all models */
|
|
|
0a122b |
+ x86_cpu_compat_set_features(NULL, FEAT_8000_0001_EDX, 0,
|
|
|
0a122b |
+ CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT);
|
|
|
0a122b |
+
|
|
|
0a122b |
disable_kvm_pv_unhalt();
|
|
|
0a122b |
|
|
|
0a122b |
rom_file_in_ram = false;
|
|
|
0a122b |
--
|
|
|
0a122b |
1.8.3.1
|
|
|
0a122b |
|