Patchwork [qom-next,45/59] target-i386: Pass X86CPU to cpu_x86_inject_mce()

login
register
mail settings
Submitter Andreas Färber
Date May 23, 2012, 3:08 a.m.
Message ID <1337742502-28565-46-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/160811/
State New
Headers show

Comments

Andreas Färber - May 23, 2012, 3:08 a.m.
Needed for run_on_cpu().

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 monitor.c            |    6 ++++--
 target-i386/cpu.h    |    2 +-
 target-i386/helper.c |    3 ++-
 target-i386/kvm.c    |    2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

Patch

diff --git a/monitor.c b/monitor.c
index 12a6fe2..07d24f8 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2177,7 +2177,8 @@  static void do_acl_remove(Monitor *mon, const QDict *qdict)
 #if defined(TARGET_I386)
 static void do_inject_mce(Monitor *mon, const QDict *qdict)
 {
-    CPUArchState *cenv;
+    X86CPU *cpu;
+    CPUX86State *cenv;
     int cpu_index = qdict_get_int(qdict, "cpu_index");
     int bank = qdict_get_int(qdict, "bank");
     uint64_t status = qdict_get_int(qdict, "status");
@@ -2190,8 +2191,9 @@  static void do_inject_mce(Monitor *mon, const QDict *qdict)
         flags |= MCE_INJECT_BROADCAST;
     }
     for (cenv = first_cpu; cenv != NULL; cenv = cenv->next_cpu) {
+        cpu = x86_env_get_cpu(cenv);
         if (cenv->cpu_index == cpu_index) {
-            cpu_x86_inject_mce(mon, cenv, bank, status, mcg_status, addr, misc,
+            cpu_x86_inject_mce(mon, cpu, bank, status, mcg_status, addr, misc,
                                flags);
             break;
         }
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index bbe8de4..5169bb0 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1067,7 +1067,7 @@  void do_cpu_sipi(X86CPU *cpu);
 #define MCE_INJECT_BROADCAST    1
 #define MCE_INJECT_UNCOND_AO    2
 
-void cpu_x86_inject_mce(Monitor *mon, CPUX86State *cenv, int bank,
+void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank,
                         uint64_t status, uint64_t mcg_status, uint64_t addr,
                         uint64_t misc, int flags);
 
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 018a98f..bfd314b 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1053,10 +1053,11 @@  static void do_inject_x86_mce(void *data)
     }
 }
 
-void cpu_x86_inject_mce(Monitor *mon, CPUX86State *cenv, int bank,
+void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank,
                         uint64_t status, uint64_t mcg_status, uint64_t addr,
                         uint64_t misc, int flags)
 {
+    CPUX86State *cenv = &cpu->env;
     MCEInjectionParams params = {
         .mon = mon,
         .env = cenv,
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 758bf8f..f611a96 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -235,7 +235,7 @@  static void kvm_mce_inject(X86CPU *cpu, target_phys_addr_t paddr, int code)
         status |= 0xc0;
         mcg_status |= MCG_STATUS_RIPV;
     }
-    cpu_x86_inject_mce(NULL, env, 9, status, mcg_status, paddr,
+    cpu_x86_inject_mce(NULL, cpu, 9, status, mcg_status, paddr,
                        (MCM_ADDR_PHYS << 6) | 0xc,
                        cpu_x86_support_mca_broadcast(env) ?
                        MCE_INJECT_BROADCAST : 0);