[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/35] target-i386: Pass X86CPU to cpu_x86_inject_mc
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 31/35] target-i386: Pass X86CPU to cpu_x86_inject_mce() |
Date: |
Wed, 31 Oct 2012 02:00:02 +0100 |
Needed for changing run_on_cpu() argument to CPUState.
Signed-off-by: Andreas Färber <address@hidden>
---
monitor.c | 6 ++++--
target-i386/cpu.h | 2 +-
target-i386/helper.c | 3 ++-
target-i386/kvm.c | 2 +-
4 Dateien geändert, 8 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
diff --git a/monitor.c b/monitor.c
index eeef32e..c0e32d6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1988,7 +1988,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");
@@ -2001,8 +2002,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 2d7b4c3..cdc59dc 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1135,7 +1135,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 0424ccf..45f4bed 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1141,10 +1141,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 5bf2f89c..64b837b 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -243,7 +243,7 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr 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);
--
1.7.10.4
- [Qemu-devel] [PATCH 20/35] cpus: Pass CPUState to qemu_cpu_kick(), (continued)
- [Qemu-devel] [PATCH 20/35] cpus: Pass CPUState to qemu_cpu_kick(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 25/35] target-ppc: Pass PowerPCCPU to powerpc_excp(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 27/35] spapr: Pass PowerPCCPU to spapr_hypercall(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 28/35] spapr: Pass PowerPCCPU to hypercalls, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 30/35] target-i386: Pass X86CPU to kvm_mce_inject(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 29/35] cpus: Pass CPUState to [qemu_]cpu_has_work(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 31/35] target-i386: Pass X86CPU to cpu_x86_inject_mce(),
Andreas Färber <=
- [Qemu-devel] [PATCH 32/35] cpus: Pass CPUState to run_on_cpu(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 35/35] target-i386: Pass X86CPU to kvm_handle_halt(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 34/35] target-i386: Pass X86CPU to kvm_get_mp_state(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 33/35] cpu: Move thread_id to CPUState, Andreas Färber, 2012/10/30
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-10-31, Andreas Färber, 2012/10/30