[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/5] build: drop TARGET_TYPE
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 5/5] build: drop TARGET_TYPE |
Date: |
Tue, 4 Jun 2013 14:45:28 +0200 |
Just use the TARGET_NAME free string.
Signed-off-by: Paolo Bonzini <address@hidden>
---
arch_init.c | 2 +-
configure | 1 -
qapi-schema.json | 18 +-----------------
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 23ca953..699c927 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;
}
diff --git a/configure b/configure
index 1d47ee8..7a48748 100755
--- a/configure
+++ b/configure
@@ -4304,7 +4304,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 ef1f657..f6428b0 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3007,22 +3007,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.
@@ -3032,7 +3016,7 @@
# Since: 1.2.0
##
{ 'type': 'TargetInfo',
- 'data': { 'arch': 'TargetType' } }
+ 'data': { 'arch': 'str' } }
##
# @query-target:
--
1.8.1.4
- [Qemu-devel] [PATCH v2 0/5] configure: TARGET_ARCH cleanups, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH v2 1/5] Add a stp file for usage from build directory, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH v2 2/5] build: rename TARGET_ARCH2 to TARGET_NAME, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH v2 3/5] build: do not use TARGET_ARCH, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH v2 4/5] main: use TARGET_ARCH only for the target-specific #define, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH v2 5/5] build: drop TARGET_TYPE,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH v2 0/5] configure: TARGET_ARCH cleanups, Peter Maydell, 2013/06/13