From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 24 Jul 2018 11:59:40 +0000 (+0200)
Subject: i386: implement MSR_SMI_COUNT for TCG
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1d3db6bdbb0b541744cc9e008371ec7a37986d8a;p=qmiga%2Fqemu.git

i386: implement MSR_SMI_COUNT for TCG

This is trivial, so just do it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c
index 628f64aad5..78f2020ef2 100644
--- a/target/i386/misc_helper.c
+++ b/target/i386/misc_helper.c
@@ -447,6 +447,9 @@ void helper_rdmsr(CPUX86State *env)
         val = env->tsc_aux;
         break;
 #endif
+    case MSR_SMI_COUNT:
+        val = env->msr_smi_count;
+        break;
     case MSR_MTRRphysBase(0):
     case MSR_MTRRphysBase(1):
     case MSR_MTRRphysBase(2):
diff --git a/target/i386/smm_helper.c b/target/i386/smm_helper.c
index 90621e5977..c1c34a75db 100644
--- a/target/i386/smm_helper.c
+++ b/target/i386/smm_helper.c
@@ -54,6 +54,7 @@ void do_smm_enter(X86CPU *cpu)
     qemu_log_mask(CPU_LOG_INT, "SMM: enter\n");
     log_cpu_state_mask(CPU_LOG_INT, CPU(cpu), CPU_DUMP_CCOP);
 
+    env->msr_smi_count++;
     env->hflags |= HF_SMM_MASK;
     if (env->hflags2 & HF2_NMI_MASK) {
         env->hflags2 |= HF2_SMM_INSIDE_NMI_MASK;