[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] provide an opaque for accelerator in cpu state
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 6/7] provide an opaque for accelerator in cpu state |
Date: |
Mon, 13 Oct 2008 22:51:47 -0200 |
Convert kqemu to use it. We also provide a small macro
to easy the access to the accelerator fields.
Signed-off-by: Glauber Costa <address@hidden>
---
accel.h | 2 ++
cpu-defs.h | 1 +
exec-all.h | 3 +++
kqemu.c | 19 ++++++++++++-------
kqemu.h | 6 ++++++
target-i386/cpu.h | 5 -----
target-i386/op_helper.c | 2 +-
7 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/accel.h b/accel.h
index f41ec72..9a309ba 100644
--- a/accel.h
+++ b/accel.h
@@ -38,6 +38,8 @@ extern int _accel_nop(void);
extern int noaccel_info(CPUState *env, char *buf);
extern CPUState *noaccel_get_env(void);
+#define accel_opaque_field(env, type, field) ((type *)env->accel_opaque)->field
+
#ifdef USE_KQEMU
extern QEMUAccel kqemu_accel;
#endif
diff --git a/cpu-defs.h b/cpu-defs.h
index 5f6fcbb..6b58316 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -197,6 +197,7 @@ typedef struct icount_decr_u16 {
int thread_id; \
/* user data */ \
void *opaque; \
+ void *accel_opaque; \
\
const char *cpu_model_str;
diff --git a/exec-all.h b/exec-all.h
index 835079f..c2191ec 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -375,6 +375,9 @@ int kqemu_kernel_enabled(CPUState *env);
extern uint32_t kqemu_comm_base;
+#include "accel.h"
+#include <kqemu.h>
+
static inline int kqemu_is_ok(CPUState *env)
{
return(kqemu_is_enabled(env) &&
diff --git a/kqemu.c b/kqemu.c
index 800e5c4..f38872f 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -62,6 +62,8 @@
#define KQEMU_DEVICE "/dev/kqemu"
#endif
+struct kqemu_cpu_opaque kqemu_opaque;
+
static void qpi_init(void);
#ifdef _WIN32
@@ -247,7 +249,9 @@ int kqemu_start(void)
void kqemu_init_env(CPUState *env)
{
kqemu_update_cpuid(env);
- env->kqemu_enabled = kqemu_allowed;
+ /* SMP currently not supported, so this is okay */
+ kqemu_opaque.kqemu_enabled = kqemu_allowed;
+ env->accel_opaque = &kqemu_opaque;
}
/* FIXME: Should not be needed, since ideally, QEMUAccel would avoid all kqemu
tests
@@ -259,7 +263,7 @@ int kqemu_is_enabled(CPUState *env)
return 0;
}
- return env->kqemu_enabled;
+ return kqemu_opaque_field(env, kqemu_enabled);
}
@@ -268,7 +272,8 @@ int kqemu_kernel_enabled(CPUState *env)
if (strcasecmp(current_accel->name, "kqemu")) {
return 0;
}
- return env->kqemu_enabled == 2;
+
+ return kqemu_opaque_field(env, kqemu_enabled) == 2;
}
void kqemu_flush_page(CPUState *env, target_ulong addr)
@@ -298,7 +303,7 @@ int kqemu_info(CPUState *env, char *buf)
{
int val, len;
val = 0;
- val = env->kqemu_enabled;
+ val = kqemu_opaque_field(env, kqemu_enabled);
len = sprintf(buf, "kqemu support: ");
buf += len;
@@ -457,14 +462,14 @@ void kqemu_set_phys_mem(uint64_t start_addr, ram_addr_t
size,
void kqemu_trace_io(CPUState *env)
{
if (env)
- env->last_io_time = cpu_get_time_fast();
+ kqemu_opaque_field(env, last_io_time) = cpu_get_time_fast();
}
int kqemu_break_loop(CPUState *env)
{
#define MIN_CYCLE_BEFORE_SWITCH (100 * 1000)
if (kqemu_is_ok(env) &&
- (cpu_get_time_fast() - env->last_io_time) >= MIN_CYCLE_BEFORE_SWITCH) {
+ (cpu_get_time_fast() - kqemu_opaque_field(env, last_io_time)) >=
MIN_CYCLE_BEFORE_SWITCH) {
return 1;
}
return 0;
@@ -875,7 +880,7 @@ int kqemu_cpu_exec(CPUState *env)
cpl = (env->hflags & HF_CPL_MASK);
kenv->cpl = cpl;
kenv->nb_pages_to_flush = nb_pages_to_flush;
- kenv->user_only = (env->kqemu_enabled == 1);
+ kenv->user_only = (kqemu_opaque_field(env, kqemu_enabled) == 1);
kenv->nb_ram_pages_to_update = nb_ram_pages_to_update;
nb_ram_pages_to_update = 0;
kenv->nb_modified_ram_pages = nb_modified_ram_pages;
diff --git a/kqemu.h b/kqemu.h
index 1c7e024..e121494 100644
--- a/kqemu.h
+++ b/kqemu.h
@@ -38,6 +38,12 @@ extern int64_t kqemu_ret_int_count;
extern int64_t kqemu_ret_excp_count;
extern int64_t kqemu_ret_intr_count;
+struct kqemu_cpu_opaque {
+ int kqemu_enabled;
+ int last_io_time;
+};
+#define kqemu_opaque_field(env, field) accel_opaque_field(env, struct
kqemu_cpu_opaque, field)
+
struct kqemu_segment_cache {
uint16_t selector;
uint16_t padding1;
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 9d8bda9..73d2378 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -590,11 +590,6 @@ typedef struct CPUX86State {
uint32_t cpuid_ext3_features;
uint32_t cpuid_apic_id;
-#ifdef USE_KQEMU
- int kqemu_enabled;
- int last_io_time;
-#endif
-
/* in order to simplify APIC support, we leave this pointer to the
user */
struct APICState *apic_state;
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index 23f3080..6d338a3 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -3168,7 +3168,7 @@ void helper_rdmsr(void)
#endif
#ifdef USE_KQEMU
case MSR_QPI_COMMBASE:
- if (env->kqemu_enabled) {
+ if (kqemu_opaque_field(env, kqemu_enabled)) {
val = kqemu_comm_base;
} else {
val = 0;
--
1.5.5.1
- [Qemu-devel] [PATCH 0/7] Update qemu accel, Glauber Costa, 2008/10/13
- [Qemu-devel] [PATCH 1/7] protect accel.h from multiple inclusion, Glauber Costa, 2008/10/13
- [Qemu-devel] [PATCH 2/7] use accel_trace_io in calling sites., Glauber Costa, 2008/10/13
- [Qemu-devel] [PATCH 4/7] give noaccel a name, Glauber Costa, 2008/10/13
- [Qemu-devel] [PATCH 3/7] use break_loop accel, Glauber Costa, 2008/10/13
- [Qemu-devel] [PATCH 5/7] check wether kqemu is enabled in open code, Glauber Costa, 2008/10/13
- [Qemu-devel] [PATCH 6/7] provide an opaque for accelerator in cpu state,
Glauber Costa <=
- [Qemu-devel] [PATCH 7/7] Revert "don't allocate ram before accel starts", Glauber Costa, 2008/10/13
- [Qemu-devel] Re: [PATCH 0/7] Update qemu accel, Anthony Liguori, 2008/10/14