summaryrefslogtreecommitdiffstats
path: root/linux-user
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-02 18:26:11 +0200
committerAndreas Färber <afaerber@suse.de>2013-10-07 11:48:47 +0200
commit51fb256ab5ebc3e1879eb1df9c828866a2ef8141 (patch)
tree85d136dd7e316ab158c3db2b45887f543bdedb4f /linux-user
parent30ba0ee52d1519b717089782ef1caf0480a01dc3 (diff)
downloadhqemu-51fb256ab5ebc3e1879eb1df9c828866a2ef8141.zip
hqemu-51fb256ab5ebc3e1879eb1df9c828866a2ef8141.tar.gz
cpu: Drop cpu_model_str from CPU_COMMON
Since this is only read in cpu_copy() and linux-user has a global cpu_model, drop the field from generic code. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 5fe587b..6b4ab09 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -42,7 +42,7 @@ const char *filename;
const char *argv0;
int gdbstub_port;
envlist_t *envlist;
-const char *cpu_model;
+static const char *cpu_model;
unsigned long mmap_min_addr;
#if defined(CONFIG_USE_GUEST_BASE)
unsigned long guest_base;
@@ -3287,7 +3287,7 @@ void init_task_state(TaskState *ts)
CPUArchState *cpu_copy(CPUArchState *env)
{
- CPUArchState *new_env = cpu_init(env->cpu_model_str);
+ CPUArchState *new_env = cpu_init(cpu_model);
#if defined(TARGET_HAS_ICE)
CPUBreakpoint *bp;
CPUWatchpoint *wp;
OpenPOWER on IntegriCloud