diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-03 15:22:54 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-10-31 04:12:23 +0100 |
| commit | 8c5cf3b6219d5d5fb61a9d6e59022fc72dab8f85 (patch) | |
| tree | e64d83671b05869cc696b38bbda4a2d9a7b75c66 /monitor.c | |
| parent | bee615d4b945e6d88dc37a39e40be9f105622f8d (diff) | |
| download | focaccia-qemu-8c5cf3b6219d5d5fb61a9d6e59022fc72dab8f85.tar.gz focaccia-qemu-8c5cf3b6219d5d5fb61a9d6e59022fc72dab8f85.zip | |
target-i386: Pass X86CPU to cpu_x86_inject_mce()
Needed for changing run_on_cpu() argument to CPUState. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c index eeef32e38b..c0e32d60c3 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; } |