diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-17 08:57:56 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-17 08:57:57 -0500 |
| commit | 38aea177d93556aada7c4c7aa530f0050715e293 (patch) | |
| tree | 3bf862281674e5f828d87e566a4b1c60f952b4bd /arch_init.c | |
| parent | b7a3b1cde2127f70d9fc24b7c99fbbc3899afab5 (diff) | |
| parent | 187f1bcb9ce8e3cd3f634dd5405f9e5ed02b38ce (diff) | |
Merge remote-tracking branch 'pmaydell/configury.next' into staging
# By Paolo Bonzini (4) and others
# Via Peter Maydell
* pmaydell/configury.next:
ppc: Remove CONFIG_FDT conditionals
microblaze: Remove CONFIG_FDT conditionals
arm: Remove CONFIG_FDT conditionals
configure: Require libfdt for arm, ppc, microblaze softmmu targets
configure: dtc: Probe for libfdt_env.h
build: drop TARGET_TYPE
main: use TARGET_ARCH only for the target-specific #define
build: do not use TARGET_ARCH
build: rename TARGET_ARCH2 to TARGET_NAME
Add a stp file for usage from build directory
Message-id: 1371221594-11556-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch_init.c b/arch_init.c index 872020e062..a8b91eed7a 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 */ }; @@ -1093,7 +1093,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; } |