From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ugvhk-0002Iy-LC for qemu-devel@nongnu.org; Mon, 27 May 2013 07:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ugvhi-0004wV-V9 for qemu-devel@nongnu.org; Mon, 27 May 2013 07:35:08 -0400 Received: from mail-ee0-f43.google.com ([74.125.83.43]:34090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ugvhi-0004vu-Pc for qemu-devel@nongnu.org; Mon, 27 May 2013 07:35:06 -0400 Received: by mail-ee0-f43.google.com with SMTP id d41so3927828eek.2 for ; Mon, 27 May 2013 04:35:06 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 27 May 2013 13:34:51 +0200 Message-Id: <1369654491-1467-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1369654491-1467-1-git-send-email-pbonzini@redhat.com> References: <1369654491-1467-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] build: drop TARGET_TYPE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, afaerber@suse.de Just use the TARGET_NAME free string. Signed-off-by: Paolo Bonzini --- 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 22fbe96..ebea903 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 bbafbac..d6912bd 100755 --- a/configure +++ b/configure @@ -4314,7 +4314,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 199744a..95ba6a5 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3008,22 +3008,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. @@ -3033,7 +3017,7 @@ # Since: 1.2.0 ## { 'type': 'TargetInfo', - 'data': { 'arch': 'TargetType' } } + 'data': { 'arch': 'str' } } ## # @query-target: -- 1.8.1.4