diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-19 10:18:01 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-19 10:18:01 +0000 |
| commit | 640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e (patch) | |
| tree | 64bfaf3d5589c87ab9b35055a2ffa00f51d5b104 /target-i386/helper.c | |
| parent | ac611340c9e21f3f9f1247a23de08d8764174b83 (diff) | |
| download | qemu-640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e.tar.gz | |
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/helper.c')
| -rw-r--r-- | target-i386/helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 5ce8798849..f107d5022f 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()) |