From 842c61a92039093c86fc8f12cc58d18f884ab0e3 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Wed, 24 Sep 2014 16:25:31 +0900 Subject: [PATCH] hax: fix compiliation errors on Windows - declare hax_handle_fastmmio function prototype. - declare X86CPU variable. Change-Id: I2cd9283d215aa5ee493033226b71e9a11b9fb18c Signed-off-by: Kitae Kim --- include/sysemu/hax.h | 1 + target-i386/hax-all.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index d21ca68..1917a2b 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -59,6 +59,7 @@ int hax_handle_io(CPUArchState *env, uint32_t df, uint16_t port, int direction, void hax_reset_vcpu_state(void *opaque); #include "target-i386/hax-interface.h" #include "target-i386/hax-i386.h" +int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft); #endif #else diff --git a/target-i386/hax-all.c b/target-i386/hax-all.c index af4bb50..b3d47a7 100644 --- a/target-i386/hax-all.c +++ b/target-i386/hax-all.c @@ -556,7 +556,7 @@ int hax_accel_init(void) } } -int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft) +int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft) { uint64_t buf = 0; /* @@ -683,6 +683,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env) { int ret = 0; CPUState *cpu = ENV_GET_CPU(env); + X86CPU *x86_cpu = X86_CPU(cpu); struct hax_vcpu_state *vcpu = cpu->hax_vcpu; struct hax_tunnel *ht = vcpu->tunnel; @@ -694,13 +695,13 @@ static int hax_vcpu_hax_exec(CPUArchState *env) if (cpu->interrupt_request & CPU_INTERRUPT_INIT) { fprintf(stderr, "\nhax_vcpu_hax_exec: handling INIT for %d \n", cpu->cpu_index); - do_cpu_init(cpu); + do_cpu_init(x86_cpu); hax_vcpu_sync_state(env, 1); } if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) { fprintf(stderr, "hax_vcpu_hax_exec: handling SIPI for %d \n", cpu->cpu_index); hax_vcpu_sync_state(env, 0); - do_cpu_sipi(cpu); + do_cpu_sipi(x86_cpu); hax_vcpu_sync_state(env, 1); } -- 2.7.4