diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-18 15:19:06 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-02-01 01:35:43 +0100 |
| commit | cc36a7a2c7e281d7d715ac73d31bbccc0d2d2670 (patch) | |
| tree | 85f8d8c8a7789f7e5ab82ebee6db7fb9bdc976b3 /target-i386 | |
| parent | eeb266ded886185d1d3b0d8bc089ec72df1a2bfd (diff) | |
| download | qemu-cc36a7a2c7e281d7d715ac73d31bbccc0d2d2670.zip | |
target-i386: Pass X86CPU to cpu_x86_set_a20()
Prepares for cpu_interrupt() changing argument to CPUState.
While touching it, rename to x86_cpu_...() now that it takes an X86CPU.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.h | 2 | ||||
| -rw-r--r-- | target-i386/helper.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 62508dc688..9e6e1a652f 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1011,7 +1011,7 @@ void host_cpuid(uint32_t function, uint32_t count, int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, int is_write, int mmu_idx); #define cpu_handle_mmu_fault cpu_x86_handle_mmu_fault -void cpu_x86_set_a20(CPUX86State *env, int a20_state); +void x86_cpu_set_a20(X86CPU *cpu, int a20_state); static inline bool hw_local_breakpoint_enabled(unsigned long dr7, int index) { diff --git a/target-i386/helper.c b/target-i386/helper.c index 547c25ee9d..bdf83084ff 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -366,8 +366,10 @@ void cpu_dump_state(CPUX86State *env, FILE *f, fprintf_function cpu_fprintf, /* x86 mmu */ /* XXX: add PGE support */ -void cpu_x86_set_a20(CPUX86State *env, int a20_state) +void x86_cpu_set_a20(X86CPU *cpu, int a20_state) { + CPUX86State *env = &cpu->env; + a20_state = (a20_state != 0); if (a20_state != ((env->a20_mask >> 20) & 1)) { #if defined(DEBUG_MMU) |