cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 3d16f05359e6277da1f970f71aa9f76337d655dc Mon Sep 17 00:00:00 2001
902636
From: Paolo Bonzini <pbonzini@redhat.com>
902636
Date: Mon, 17 Feb 2020 16:23:14 +0000
902636
Subject: [PATCH 4/9] target/i386: fix TCG UCODE_REV access
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
902636
Message-id: <20200217162316.2464-5-pbonzini@redhat.com>
902636
Patchwork-id: 93904
902636
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 4/6] target/i386: fix TCG UCODE_REV access
902636
Bugzilla: 1791648
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
902636
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
902636
This was a very interesting semantic conflict that caused git to move
902636
the MSR_IA32_UCODE_REV read to helper_wrmsr.  Not a big deal, but
902636
still should be fixed...
902636
902636
Fixes: 4e45aff398 ("target/i386: add a ucode-rev property", 2020-01-24)
902636
Message-id: <20200206171022.9289-1-pbonzini@redhat.com>
902636
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
902636
(cherry picked from commit 9028c75c9d08be303ccc425bfe3d3b23d8f4cac7)
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 target/i386/misc_helper.c | 8 ++++----
902636
 1 file changed, 4 insertions(+), 4 deletions(-)
902636
902636
diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c
902636
index aed16fe..7d61221 100644
902636
--- a/target/i386/misc_helper.c
902636
+++ b/target/i386/misc_helper.c
902636
@@ -229,7 +229,6 @@ void helper_rdmsr(CPUX86State *env)
902636
 #else
902636
 void helper_wrmsr(CPUX86State *env)
902636
 {
902636
-    X86CPU *x86_cpu = env_archcpu(env);
902636
     uint64_t val;
902636
 
902636
     cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 1, GETPC());
902636
@@ -372,9 +371,6 @@ void helper_wrmsr(CPUX86State *env)
902636
         env->msr_bndcfgs = val;
902636
         cpu_sync_bndcs_hflags(env);
902636
         break;
902636
-     case MSR_IA32_UCODE_REV:
902636
-        val = x86_cpu->ucode_rev;
902636
-        break;
902636
     default:
902636
         if ((uint32_t)env->regs[R_ECX] >= MSR_MC0_CTL
902636
             && (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
902636
@@ -393,6 +389,7 @@ void helper_wrmsr(CPUX86State *env)
902636
 
902636
 void helper_rdmsr(CPUX86State *env)
902636
 {
902636
+    X86CPU *x86_cpu = env_archcpu(env);
902636
     uint64_t val;
902636
 
902636
     cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 0, GETPC());
902636
@@ -526,6 +523,9 @@ void helper_rdmsr(CPUX86State *env)
902636
     case MSR_IA32_BNDCFGS:
902636
         val = env->msr_bndcfgs;
902636
         break;
902636
+     case MSR_IA32_UCODE_REV:
902636
+        val = x86_cpu->ucode_rev;
902636
+        break;
902636
     default:
902636
         if ((uint32_t)env->regs[R_ECX] >= MSR_MC0_CTL
902636
             && (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
902636
-- 
902636
1.8.3.1
902636