diff options
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -435,7 +435,7 @@ void cpu_outb(CPUState *env, int addr, int val) { LOG_IOPORT("outb: %04x %02x\n", addr, val); ioport_write(0, addr, val); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); #endif @@ -445,7 +445,7 @@ void cpu_outw(CPUState *env, int addr, int val) { LOG_IOPORT("outw: %04x %04x\n", addr, val); ioport_write(1, addr, val); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); #endif @@ -455,7 +455,7 @@ void cpu_outl(CPUState *env, int addr, int val) { LOG_IOPORT("outl: %04x %08x\n", addr, val); ioport_write(2, addr, val); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); #endif @@ -466,7 +466,7 @@ int cpu_inb(CPUState *env, int addr) int val; val = ioport_read(0, addr); LOG_IOPORT("inb : %04x %02x\n", addr, val); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); #endif @@ -478,7 +478,7 @@ int cpu_inw(CPUState *env, int addr) int val; val = ioport_read(1, addr); LOG_IOPORT("inw : %04x %04x\n", addr, val); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); #endif @@ -490,7 +490,7 @@ int cpu_inl(CPUState *env, int addr) int val; val = ioport_read(2, addr); LOG_IOPORT("inl : %04x %08x\n", addr, val); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env) env->last_io_time = cpu_get_time_fast(); #endif @@ -1357,7 +1357,7 @@ static void host_alarm_handler(int host_signum) if (env) { /* stop the currently executing cpu because a timer occured */ cpu_exit(env); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env->kqemu_enabled) { kqemu_cpu_interrupt(env); } @@ -3343,7 +3343,7 @@ void qemu_service_io(void) CPUState *env = cpu_single_env; if (env) { cpu_exit(env); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (env->kqemu_enabled) { kqemu_cpu_interrupt(env); } @@ -4634,7 +4634,7 @@ int main(int argc, char **argv, char **envp) /* On 32-bit hosts, QEMU is limited by virtual address space */ if (value > (2047 << 20) -#ifndef USE_KQEMU +#ifndef CONFIG_KQEMU && HOST_LONG_BITS == 32 #endif ) { @@ -4809,7 +4809,7 @@ int main(int argc, char **argv, char **envp) } break; #endif -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU case QEMU_OPTION_no_kqemu: kqemu_allowed = 0; break; @@ -4820,7 +4820,7 @@ int main(int argc, char **argv, char **envp) #ifdef CONFIG_KVM case QEMU_OPTION_enable_kvm: kvm_allowed = 1; -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU kqemu_allowed = 0; #endif break; @@ -4976,7 +4976,7 @@ int main(int argc, char **argv, char **envp) } } -#if defined(CONFIG_KVM) && defined(USE_KQEMU) +#if defined(CONFIG_KVM) && defined(CONFIG_KQEMU) if (kvm_allowed && kqemu_allowed) { fprintf(stderr, "You can not enable both KVM and kqemu at the same time\n"); @@ -5055,7 +5055,7 @@ int main(int argc, char **argv, char **envp) } #endif -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (smp_cpus > 1) kqemu_allowed = 0; #endif @@ -5148,7 +5148,7 @@ int main(int argc, char **argv, char **envp) if (ram_size == 0) ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU /* FIXME: This is a nasty hack because kqemu can't cope with dynamic guest ram allocation. It needs to go away. */ if (kqemu_allowed) { |