[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/20] remove kqemu reference from hw/pc.c
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 11/20] remove kqemu reference from hw/pc.c |
Date: |
Fri, 27 Jun 2008 17:38:14 -0300 |
Instead, route cpu_get_ticks through accel driver.
---
accel.h | 9 +++++++++
hw/pc.c | 13 ++-----------
kqemu.c | 4 ++++
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/accel.h b/accel.h
index 5395e05..9d5b3a2 100644
--- a/accel.h
+++ b/accel.h
@@ -7,6 +7,7 @@ typedef struct QEMUAccel {
int (*profile)(CPUState *env, char *buf);
void (*set_notdirty)(ram_addr_t addr);
void (*modify_page)(ram_addr_t addr, int dirty_flags);
+ uint64_t (*get_real_ticks)(void);
} QEMUAccel;
extern QEMUAccel *current_accel;
@@ -66,3 +67,11 @@ static inline void accel_modify_page(target_ulong addr, int
dirty_flags)
current_accel->modify_page(addr, dirty_flags);
}
+int64_t cpu_get_ticks(void);
+
+static inline uint64_t accel_get_real_ticks(void)
+{
+ if (current_accel && current_accel->get_real_ticks)
+ return current_accel->get_real_ticks();
+ return cpu_get_ticks();
+}
diff --git a/hw/pc.c b/hw/pc.c
index 4c5e1c3..3d0e038 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -32,6 +32,7 @@
#include "smbus.h"
#include "boards.h"
#include "console.h"
+#include "accel.h"
/* output Bochs bios info messages */
//#define DEBUG_BIOS
@@ -73,17 +74,7 @@ static void ioportF0_write(void *opaque, uint32_t addr,
uint32_t data)
/* TSC handling */
uint64_t cpu_get_tsc(CPUX86State *env)
{
- /* Note: when using kqemu, it is more logical to return the host TSC
- because kqemu does not trap the RDTSC instruction for
- performance reasons */
-#if USE_KQEMU
- if (env->kqemu_enabled) {
- return cpu_get_real_ticks();
- } else
-#endif
- {
- return cpu_get_ticks();
- }
+ return accel_get_real_ticks();
}
/* SMM support */
diff --git a/kqemu.c b/kqemu.c
index 9c3d0c5..9184b26 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -444,6 +444,10 @@ QEMUAccel kqemu_accel = {
.profile = kqemu_profile,
.set_notdirty = kqemu_set_notdirty,
.modify_page = kqemu_modify_page,
+ /* Note: when using kqemu, it is more logical to return the host TSC
+ because kqemu does not trap the RDTSC instruction for
+ performance reasons */
+ .get_real_ticks = cpu_get_real_ticks,
};
--
1.5.5.1
- [Qemu-devel] [PATCH 01/20] split kqemu_init into two, (continued)
- [Qemu-devel] [PATCH 01/20] split kqemu_init into two, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 02/20] introduce QEMUAccel and fill it with interrupt specific driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 03/20] init env made accel driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 04/20] wrap cache flushing functions into accel drivers, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 05/20] turn info kqemu into generic info accelerator, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 06/20] separate accelerator part of info profiler, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 07/20] move kqemu externs to kqemu.h, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 08/20] move disabling code to kqemu.c instead of vl.c, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 09/20] set_notdirty goes through accel wrapper, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 10/20] wrap modify_page through accel calls, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 11/20] remove kqemu reference from hw/pc.c,
Glauber Costa <=
- [Qemu-devel] [PATCH 12/20] build list of available accelerators, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 13/20] decorate application name, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 14/20] tsc: kvm will use it, but it is pretty general, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 15/20] shift for masks., Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 16/20] small changes in headers needed to acomodate kvm files as is., Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 17/20] add hook to cpu_register_physical_memory, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 18/20] accel_trace_io, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 19/20] get_env accel wrapper, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 20/20] add next_cpu_index, Glauber Costa, 2008/06/27