cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
05bba0
From 39ffb75b89ae1a1be6e6ed5c03d4c22cc640e832 Mon Sep 17 00:00:00 2001
05bba0
From: Eduardo Habkost <ehabkost@redhat.com>
05bba0
Date: Thu, 25 Jun 2015 19:31:22 +0200
05bba0
Subject: [PATCH 02/10] target-i386: fix cpuid leaf 0x0d
05bba0
05bba0
Message-id: <1435260689-9556-2-git-send-email-ehabkost@redhat.com>
05bba0
Patchwork-id: 66499
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/8] target-i386: fix cpuid leaf 0x0d
05bba0
Bugzilla: 1233350
05bba0
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
05bba0
RH-Acked-by: Bandan Das <bsd@redhat.com>
05bba0
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
05bba0
05bba0
From: Liu Jinsong <jinsong.liu@intel.com>
05bba0
05bba0
Fix cpuid leaf 0x0d which incorrectly parsed eax and ebx.
05bba0
05bba0
However, before this patch the CPUID worked fine -- the .offset
05bba0
field contained the size _and_ was stored in the register that
05bba0
is supposed to hold the size (eax), and likewise the .size field
05bba0
contained the offset _and_ was stored in the register trhat is
05bba0
supposed to hold the offset (ebx).
05bba0
05bba0
Signed-off-by: Liu Jinsong <jinsong.liu@intel.com>
05bba0
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
05bba0
(cherry picked from commit 33f373d7c56350fd2ec3e31f4f2c46cb49464911)
05bba0
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
---
05bba0
 target-i386/cpu.c | 6 +++---
05bba0
 1 file changed, 3 insertions(+), 3 deletions(-)
05bba0
05bba0
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
05bba0
index b76719d..0fd100f 100644
05bba0
--- a/target-i386/cpu.c
05bba0
+++ b/target-i386/cpu.c
05bba0
@@ -223,7 +223,7 @@ typedef struct ExtSaveArea {
05bba0
 
05bba0
 static const ExtSaveArea ext_save_areas[] = {
05bba0
     [2] = { .feature = FEAT_1_ECX, .bits = CPUID_EXT_AVX,
05bba0
-            .offset = 0x100, .size = 0x240 },
05bba0
+            .offset = 0x240, .size = 0x100 },
05bba0
 };
05bba0
 
05bba0
 const char *get_register_name_32(unsigned int reg)
05bba0
@@ -2191,8 +2191,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
05bba0
             const ExtSaveArea *esa = &ext_save_areas[count];
05bba0
             if ((env->features[esa->feature] & esa->bits) == esa->bits &&
05bba0
                 (kvm_mask & (1 << count)) != 0) {
05bba0
-                *eax = esa->offset;
05bba0
-                *ebx = esa->size;
05bba0
+                *eax = esa->size;
05bba0
+                *ebx = esa->offset;
05bba0
             }
05bba0
         }
05bba0
         break;
05bba0
-- 
05bba0
1.8.3.1
05bba0