aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-19 10:18:01 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-19 10:18:01 +0000
commit640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e (patch)
tree64bfaf3d5589c87ab9b35055a2ffa00f51d5b104 /target-i386
parentac611340c9e21f3f9f1247a23de08d8764174b83 (diff)
downloadqemu-640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e.zip
qemu-640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e.tar.gz
qemu-640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e.tar.bz2
kqemu: merge CONFIG_KQEMU and USE_KQEMU
Basically a recursive ":%s/USE_KQEMU/CONFIG_KQEMU/g". Signed-off-by: Paul Bolle <pebolle@tiscali.nl> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7189 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpu.h4
-rw-r--r--target-i386/helper.c8
-rw-r--r--target-i386/op_helper.c12
3 files changed, 12 insertions, 12 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index f38f194..c6bca94 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -662,7 +662,7 @@ typedef struct CPUX86State {
uint64_t mask;
} mtrr_var[8];
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
int kqemu_enabled;
int last_io_time;
#endif
@@ -820,7 +820,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
#define X86_DUMP_FPU 0x0001 /* dump FPU state too */
#define X86_DUMP_CCOP 0x0002 /* dump qemu flag cache */
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
static inline int cpu_get_time_fast(void)
{
int low, high;
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 5ce8798..f107d50 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -930,7 +930,7 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
/* XXX: This value should match the one returned by CPUID
* and in exec.c */
-#if defined(USE_KQEMU)
+#if defined(CONFIG_KQEMU)
#define PHYS_ADDR_MASK 0xfffff000LL
#else
# if defined(TARGET_X86_64)
@@ -1630,14 +1630,14 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
/* XXX: This value must match the one used in the MMU code. */
if (env->cpuid_ext2_features & CPUID_EXT2_LM) {
/* 64 bit processor */
-#if defined(USE_KQEMU)
+#if defined(CONFIG_KQEMU)
*eax = 0x00003020; /* 48 bits virtual, 32 bits physical */
#else
/* XXX: The physical address space is limited to 42 bits in exec.c. */
*eax = 0x00003028; /* 48 bits virtual, 40 bits physical */
#endif
} else {
-#if defined(USE_KQEMU)
+#if defined(CONFIG_KQEMU)
*eax = 0x00000020; /* 32 bits physical */
#else
if (env->cpuid_features & CPUID_PSE36)
@@ -1689,7 +1689,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
return NULL;
}
cpu_reset(env);
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
kqemu_init(env);
#endif
if (kvm_enabled())
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index be09263..1a74902 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -1119,7 +1119,7 @@ void helper_sysret(int dflag)
env->eflags |= IF_MASK;
cpu_x86_set_cpl(env, 3);
}
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
if (kqemu_is_ok(env)) {
if (env->hflags & HF_LMA_MASK)
CC_OP = CC_OP_EFLAGS;
@@ -2478,7 +2478,7 @@ void helper_lcall_protected(int new_cs, target_ulong new_eip,
SET_ESP(sp, sp_mask);
EIP = offset;
}
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
if (kqemu_is_ok(env)) {
env->exception_index = -1;
cpu_loop_exit();
@@ -2764,7 +2764,7 @@ void helper_iret_protected(int shift, int next_eip)
helper_ret_protected(shift, 1, 0);
}
env->hflags2 &= ~HF2_NMI_MASK;
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
if (kqemu_is_ok(env)) {
CC_OP = CC_OP_EFLAGS;
env->exception_index = -1;
@@ -2776,7 +2776,7 @@ void helper_iret_protected(int shift, int next_eip)
void helper_lret_protected(int shift, int addend)
{
helper_ret_protected(shift, 0, addend);
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
if (kqemu_is_ok(env)) {
env->exception_index = -1;
cpu_loop_exit();
@@ -2854,7 +2854,7 @@ void helper_sysexit(int dflag)
}
ESP = ECX;
EIP = EDX;
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
if (kqemu_is_ok(env)) {
env->exception_index = -1;
cpu_loop_exit();
@@ -3167,7 +3167,7 @@ void helper_rdmsr(void)
val = env->kernelgsbase;
break;
#endif
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
case MSR_QPI_COMMBASE:
if (env->kqemu_enabled) {
val = kqemu_comm_base;