OSDN Git Service

i386: implement MSR_SMI_COUNT for TCG
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 24 Jul 2018 11:59:40 +0000 (13:59 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 30 Jul 2018 12:00:11 +0000 (14:00 +0200)
This is trivial, so just do it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
target/i386/misc_helper.c
target/i386/smm_helper.c

index 628f64a..78f2020 100644 (file)
@@ -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):
index 90621e5..c1c34a7 100644 (file)
@@ -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;