diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-04 14:45:28 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-06-14 15:33:12 +0100 |
| commit | c02a9552a4c89f2fdf23defe1d2c13b834ae3a4a (patch) | |
| tree | 380af8df3a11f58085bcf2266e44fb876b005613 | |
| parent | 2e59915d4375b632964c0594799fd5876958eda6 (diff) | |
build: drop TARGET_TYPE
Just use the TARGET_NAME free string.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1370349928-20419-6-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | arch_init.c | 2 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | qapi-schema.json | 18 |
3 files changed, 2 insertions, 19 deletions
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; } @@ -4246,7 +4246,6 @@ upper() { target_arch_name="`upper $TARGET_ARCH`" echo "TARGET_$target_arch_name=y" >> $config_target_mak echo "TARGET_NAME=$target_name" >> $config_target_mak -echo "TARGET_TYPE=TARGET_TYPE_`upper $target_name`" >> $config_target_mak echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak if [ "$TARGET_ABI_DIR" = "" ]; then TARGET_ABI_DIR=$TARGET_ARCH diff --git a/qapi-schema.json b/qapi-schema.json index 5ad6894738..a80ee405d1 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3013,22 +3013,6 @@ { 'command': 'query-fdsets', 'returns': ['FdsetInfo'] } ## -# @TargetType -# -# Target CPU emulation type -# -# These parameters correspond to the softmmu binary CPU name that is currently -# running. -# -# Since: 1.2.0 -## -{ 'enum': 'TargetType', - 'data': [ 'alpha', 'arm', 'cris', 'i386', 'lm32', 'm68k', 'microblazeel', - 'microblaze', 'mips64el', 'mips64', 'mipsel', 'mips', 'moxie', - 'or32', 'ppc64', 'ppcemb', 'ppc', 's390x', 'sh4eb', 'sh4', - 'sparc64', 'sparc', 'unicore32', 'x86_64', 'xtensaeb', 'xtensa' ] } - -## # @TargetInfo: # # Information describing the QEMU target. @@ -3038,7 +3022,7 @@ # Since: 1.2.0 ## { 'type': 'TargetInfo', - 'data': { 'arch': 'TargetType' } } + 'data': { 'arch': 'str' } } ## # @query-target: |