[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/32] remove kqemu_is_ok tests.
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 31/32] remove kqemu_is_ok tests. |
Date: |
Thu, 23 Oct 2008 12:19:15 -0200 |
Replace kqemu_is_ok with local tests, since they it is not
used anywhere else in the code.
Signed-off-by: Glauber Costa <address@hidden>
---
exec-all.h | 12 ------------
kqemu.c | 11 ++---------
target-i386/cpu.h | 3 ---
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/exec-all.h b/exec-all.h
index 1e9aa5a..55972ac 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -369,17 +369,5 @@ void kqemu_set_phys_mem(uint64_t start_addr, ram_addr_t
size,
ram_addr_t phys_offset);
void kqemu_record_dump(void);
-static inline int kqemu_is_ok(CPUState *env)
-{
- return(env->kqemu_enabled &&
- (env->cr[0] & CR0_PE_MASK) &&
- !(env->hflags & HF_INHIBIT_IRQ_MASK) &&
- (env->eflags & IF_MASK) &&
- !(env->eflags & VM_MASK) &&
- (env->kqemu_enabled == 2 ||
- ((env->hflags & HF_CPL_MASK) == 3 &&
- (env->eflags & IOPL_MASK) != IOPL_MASK)));
-}
-
#endif
#endif
diff --git a/kqemu.c b/kqemu.c
index 7b87a58..58a149b 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -279,13 +279,6 @@ static int kqemu_start_kernel(int cpus)
static void kqemu_init_env(CPUState *env)
{
kqemu_update_cpuid(env);
- env->kqemu_enabled = 1;
-}
-
-static void kqemu_init_env_kernel(CPUState *env)
-{
- kqemu_update_cpuid(env);
- env->kqemu_enabled = 2;
}
static void kqemu_flush_page(CPUState *env, target_ulong addr)
@@ -994,7 +987,7 @@ static int kqemu_cpu_exec(CPUState *env)
{
int ret = EXEC_EXIT_SOFTMMU;
- if (kqemu_is_ok(env) && env->interrupt_request == 0) {
+ if (kqemu_kernel_flags_ok(env) && env->interrupt_request == 0) {
ret = kqemu_do_cpu_exec(env);
/* put eflags in CPU temporary format */
CC_SRC = env->eflags & (CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
@@ -1250,7 +1243,7 @@ QEMUAccel kqemu_accel = {
QEMUAccel kqemu_kernel_accel = {
.name = "kernel-KQEMU",
.cpu_interrupt = kqemu_cpu_interrupt,
- .init_env = kqemu_init_env_kernel,
+ .init_env = kqemu_init_env,
.get_env = kqemu_get_env,
.start = kqemu_start_kernel,
.flush_cache = kqemu_flush,
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 6310529..e5e91cc 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -606,9 +606,6 @@ typedef struct CPUX86State {
uint32_t cpuid_ext3_features;
uint32_t cpuid_apic_id;
-#ifdef USE_KQEMU
- int kqemu_enabled;
-#endif
/* in order to simplify APIC support, we leave this pointer to the
user */
struct APICState *apic_state;
--
1.5.5.1
- [Qemu-devel] Re: [PATCH 24/32] check wether kqemu is enabled in open code, (continued)
- [Qemu-devel] [PATCH 31/32] remove kqemu_is_ok tests.,
Glauber Costa <=
- [Qemu-devel] [PATCH 30/32] lcall/lret arch specific accel hooks, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 25/32] provide accel hook for cpu_exec, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 32/32] clean up kqemu code, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 29/32] sysret/sysexit arch specific accelerator, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 28/32] iret arch specific accelerator, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 19/32] add hook to cpu_register_physical_memory, Glauber Costa, 2008/10/23
- [Qemu-devel] Re: [PATCH 0/32] New shot at accelerators, Jan Kiszka, 2008/10/23
- [Qemu-devel] Re: [PATCH 0/32] New shot at accelerators, Anthony Liguori, 2008/10/23