From 2e59915d4375b632964c0594799fd5876958eda6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 4 Jun 2013 14:45:27 +0200 Subject: main: use TARGET_ARCH only for the target-specific #define Everything else needs to match the executable name, which is TARGET_NAME. Before: $ sh4eb-linux-user/qemu-sh4eb --help usage: qemu-sh4 [options] program [arguments...] Linux CPU emulator (compiled for sh4 emulation) After: $ sh4eb-linux-user/qemu-sh4eb --help usage: qemu-sh4eb [options] program [arguments...] Linux CPU emulator (compiled for sh4eb emulation) Signed-off-by: Paolo Bonzini Message-id: 1370349928-20419-5-git-send-email-pbonzini@redhat.com Signed-off-by: Peter Maydell --- arch_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch_init.c') diff --git a/arch_init.c b/arch_init.c index 5d32ecf23a..23ca953cb5 100644 --- a/arch_init.c +++ b/arch_init.c @@ -123,7 +123,7 @@ static struct defconfig_file { bool userconfig; } default_config_files[] = { { CONFIG_QEMU_CONFDIR "/qemu.conf", true }, - { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true }, + { CONFIG_QEMU_CONFDIR "/target-" TARGET_NAME ".conf", true }, { NULL }, /* end of list */ }; -- cgit v1.2.1 From c02a9552a4c89f2fdf23defe1d2c13b834ae3a4a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 4 Jun 2013 14:45:28 +0200 Subject: build: drop TARGET_TYPE Just use the TARGET_NAME free string. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Message-id: 1370349928-20419-6-git-send-email-pbonzini@redhat.com Signed-off-by: Peter Maydell --- arch_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch_init.c') diff --git a/arch_init.c b/arch_init.c index 23ca953cb5..699c92735f 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1094,7 +1094,7 @@ TargetInfo *qmp_query_target(Error **errp) { TargetInfo *info = g_malloc0(sizeof(*info)); - info->arch = TARGET_TYPE; + info->arch = g_strdup(TARGET_NAME); return info; } -- cgit v1.2.1