diff options
| author | Andreas Färber | 2013-06-29 19:40:58 +0200 |
|---|---|---|
| committer | Andreas Färber | 2013-07-23 02:41:33 +0200 |
| commit | f17ec444c3d39f76bcd8b71c2c05d5754bfe333e (patch) | |
| tree | 9a314b7aed083e6b3eaf50b04809b57108d0a5cb /target-i386/helper.c | |
| parent | cpu: Turn cpu_get_phys_page_debug() into a CPUClass hook (diff) | |
| download | qemu-f17ec444c3d39f76bcd8b71c2c05d5754bfe333e.tar.gz qemu-f17ec444c3d39f76bcd8b71c2c05d5754bfe333e.tar.xz qemu-f17ec444c3d39f76bcd8b71c2c05d5754bfe333e.zip | |
exec: Change cpu_memory_rw_debug() argument to CPUState
Propagate X86CPU in kvmvapic for simplicity.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386/helper.c')
| -rw-r--r-- | target-i386/helper.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 2745292d1d..bf3e2ac73d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -363,7 +363,7 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, cpu_fprintf(f, "Code="); for (i = 0; i < DUMP_CODE_BYTES_TOTAL; i++) { - if (cpu_memory_rw_debug(env, base - offs + i, &code, 1, 0) == 0) { + if (cpu_memory_rw_debug(cs, base - offs + i, &code, 1, 0) == 0) { snprintf(codestr, sizeof(codestr), "%02x", code); } else { snprintf(codestr, sizeof(codestr), "??"); @@ -1260,6 +1260,8 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, target_ulong *base, unsigned int *limit, unsigned int *flags) { + X86CPU *cpu = x86_env_get_cpu(env); + CPUState *cs = CPU(cpu); SegmentCache *dt; target_ulong ptr; uint32_t e1, e2; @@ -1272,8 +1274,8 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, index = selector & ~7; ptr = dt->base + index; if ((index + 7) > dt->limit - || cpu_memory_rw_debug(env, ptr, (uint8_t *)&e1, sizeof(e1), 0) != 0 - || cpu_memory_rw_debug(env, ptr+4, (uint8_t *)&e2, sizeof(e2), 0) != 0) + || cpu_memory_rw_debug(cs, ptr, (uint8_t *)&e1, sizeof(e1), 0) != 0 + || cpu_memory_rw_debug(cs, ptr+4, (uint8_t *)&e2, sizeof(e2), 0) != 0) return 0; *base = ((e1 >> 16) | ((e2 & 0xff) << 16) | (e2 & 0xff000000)); |