@@ -1568,6 +1568,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
#define X86_CPU_TYPE_SUFFIX "-" TYPE_X86_CPU
#define X86_CPU_TYPE_NAME(name) (name X86_CPU_TYPE_SUFFIX)
+#define CPU_RESOLVING_TYPE TYPE_X86_CPU
#ifdef TARGET_X86_64
#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu64")
@@ -26,6 +26,8 @@ static struct arch2cpu cpus_map[] = {
/* tested targets list */
{ "arm", "cortex-a15" },
{ "aarch64", "cortex-a57" },
+ { "x86_64", "qemu64,apic-id=0" },
+ { "i386", "qemu32,apic-id=0" },
};
static const char *get_cpu_model_by_arch(const char *arch)
it will be used for providing to cpu name resolving class for parsing cpu model for system and user emulation code. Along with change add target to null-machine test, so that when switch to CPU_RESOLVING_TYPE happens, test would ensure that null-mchine usecase still works. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v2: - fix conflict due to cortex-a57 change in aarch64 entry in previous patch CC: Eduardo Habkost <ehabkost@redhat.com> --- target/i386/cpu.h | 1 + tests/machine-none-test.c | 2 ++ 2 files changed, 3 insertions(+)