summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-08-24 18:28:49 +0300
committerAvi Kivity <avi@redhat.com>2009-08-24 18:28:49 +0300
commit193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded (patch)
tree8b3ce0860a3485c07aa25dd20dc97835138728bb /cpu-all.h
parentMerge commit '1632dc6a8f6e8662f4a203b6fb8c0371ca216946' into upstream-merge (diff)
parentUnbreak large mem support by removing kqemu (diff)
downloadqemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.tar.gz
qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.tar.bz2
qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.zip
Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-merge
* commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1': Unbreak large mem support by removing kqemu Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them. Migration via unix sockets. Conflicts: Makefile.target exec.c osdep.c vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/cpu-all.h b/cpu-all.h
index 5c6c0512e..135af3f5a 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -874,7 +874,6 @@ int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
#define VGA_DIRTY_FLAG 0x01
#define CODE_DIRTY_FLAG 0x02
-#define KQEMU_DIRTY_FLAG 0x04
#define MIGRATION_DIRTY_FLAG 0x08
/* read dirty bit (return 0 or 1) */
@@ -1057,14 +1056,9 @@ static inline int64_t profile_getclock(void)
return cpu_get_real_ticks();
}
-extern int64_t kqemu_time, kqemu_time_start;
extern int64_t qemu_time, qemu_time_start;
extern int64_t tlb_flush_time;
-extern int64_t kqemu_exec_count;
extern int64_t dev_time;
-extern int64_t kqemu_ret_int_count;
-extern int64_t kqemu_ret_excp_count;
-extern int64_t kqemu_ret_intr_count;
#endif
void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status,