summaryrefslogtreecommitdiff
path: root/cpu-all.h
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2010-03-12 16:54:58 +0000
committerPaul Brook <paul@codesourcery.com>2010-03-12 18:34:25 +0000
commitb3755a915e40271e8d2b1119e8a1dc1f3e88d2e5 (patch)
tree9ca60af42732d0df7c5b81a7ca6ced26ea8d4494 /cpu-all.h
parent20cb400d41b07f33ed34d5ed917e534c7f12738b (diff)
Disable phsyical memory handling in userspace emulation.
Code to handle physical memory access is not meaningful in usrmode emulation, so disable it. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/cpu-all.h b/cpu-all.h
index a51b301ca4..e32ea47cfa 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -849,6 +849,8 @@ void cpu_set_log(int log_flags);
void cpu_set_log_filename(const char *filename);
int cpu_str_to_log_mask(const char *str);
+#if !defined(CONFIG_USER_ONLY)
+
/* memory API */
extern int phys_ram_fd;
@@ -877,9 +879,6 @@ extern int mem_prealloc;
/* Set if TLB entry is an IO callback. */
#define TLB_MMIO (1 << 5)
-int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
- uint8_t *buf, int len, int is_write);
-
#define VGA_DIRTY_FLAG 0x01
#define CODE_DIRTY_FLAG 0x02
#define MIGRATION_DIRTY_FLAG 0x08
@@ -926,6 +925,11 @@ void qemu_unregister_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size);
void qemu_flush_coalesced_mmio_buffer(void);
+#endif /* !CONFIG_USER_ONLY */
+
+int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
+ uint8_t *buf, int len, int is_write);
+
/*******************************************/
/* host CPU ticks (if available) */