aboutsummaryrefslogtreecommitdiff
path: root/target-alpha/translate.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-09-25 16:06:16 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-09-25 16:06:16 -0500
commit97fe81d3e8613be13754ff096c16b73010fd60ad (patch)
treeba81dd99c4b379c58b3aa362bef351a319075281 /target-alpha/translate.c
parentd352210aede32743c6e7a8987c99196d84ab5471 (diff)
parent2b85cf0efd81a6190320e7b488a0a4bad9743cc3 (diff)
downloadqemu-arm-97fe81d3e8613be13754ff096c16b73010fd60ad.tar.gz
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu: target-alpha: Initialize env->cpu_model_str target-i386: Drop unused setscalar() macro target-i386: Kill cpudef config section support target-i386: x86_cpudef_setup() coding style change Eliminate cpus-x86_64.conf file target-i386: Move CPU models from cpus-x86_64.conf to C target-i386: Add missing CPUID_* constants Drop cpu_list_id macro target-i386: Fold -cpu ?cpuid, ?model output into -cpu help, drop ?dump MAINTAINERS: Add entry for QOM CPU
Diffstat (limited to 'target-alpha/translate.c')
-rw-r--r--target-alpha/translate.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 4a9011a2b6..3f9aee12d4 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -3543,6 +3543,7 @@ CPUAlphaState * cpu_alpha_init (const char *cpu_model)
}
env->implver = implver;
env->amask = amask;
+ env->cpu_model_str = cpu_model;
qemu_init_vcpu(env);
return env;