projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Sparc/Linux host breakage by df70204db53e3611af986f434e74a882bce190ca
[qemu]
/
cpu-all.h
diff --git
a/cpu-all.h
b/cpu-all.h
index
26bf492
..
ebe8bfb
100644
(file)
--- a/
cpu-all.h
+++ b/
cpu-all.h
@@
-873,7
+873,6
@@
int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
#define VGA_DIRTY_FLAG 0x01
#define CODE_DIRTY_FLAG 0x02
#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) */
#define MIGRATION_DIRTY_FLAG 0x08
/* read dirty bit (return 0 or 1) */
@@
-1022,7
+1021,7
@@
static inline int64_t cpu_get_real_ticks (void)
static inline int64_t cpu_get_real_ticks(void)
{
static inline int64_t cpu_get_real_ticks(void)
{
-#if __mips_isa_rev >= 2
+#if defined(__mips_isa_rev) && __mips_isa_rev >= 2
uint32_t count;
static uint32_t cyc_per_count = 0;
uint32_t count;
static uint32_t cyc_per_count = 0;
@@
-1056,14
+1055,9
@@
static inline int64_t profile_getclock(void)
return cpu_get_real_ticks();
}
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 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 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,
#endif
void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status,