From patchwork Tue Jun 4 12:45:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 696832C0095 for ; Tue, 4 Jun 2013 23:24:49 +1000 (EST) Received: from localhost ([::1]:37350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjqfR-0003aU-3w for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 08:48:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujqca-0000Km-If for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:45:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjqcV-0005x7-3W for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:45:52 -0400 Received: from mail-bk0-x230.google.com ([2a00:1450:4008:c01::230]:65387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjqcU-0005wb-B3 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:45:46 -0400 Received: by mail-bk0-f48.google.com with SMTP id jf17so112386bkc.21 for ; Tue, 04 Jun 2013 05:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tM3yP0KiDHLhY2QSbDeSrylXzv7NmkJ+1qJOCTSo9gA=; b=HeWdloMkSO1s2X718QexT/hyBLneQgeDpONeEofBhJJ39aj6OXFWXiaQwf0uTPglrb AY/mcWKJGQnLAMZfimW0Yw5GAI8Qvw9PWFcifnRQAz0tzQDPElYthCcugDz4Nk6+qbA4 eq1dKPF6taFXCOXTqDYFa1o4M4TsxE42wgGzAgAts/nOeNUMiNc/o1kvC2/fI1pGxETW EiUtHXnFSSZG//0HZc6rs/i9zyUMMTebQqnbokPF6QWgCwlXoYs33vDbh15DWIDFKJAL V26hjRRm4T1hnGh9ELsr3qkDORzYdKE7J87e0Ppa/1dJalg+QhSaP2aJmRYkMIKw6f/S AiKw== X-Received: by 10.204.80.195 with SMTP id u3mr8112894bkk.184.1370349945278; Tue, 04 Jun 2013 05:45:45 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id jy7sm14487288bkb.6.2013.06.04.05.45.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Jun 2013 05:45:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 14:45:28 +0200 Message-Id: <1370349928-20419-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370349928-20419-1-git-send-email-pbonzini@redhat.com> References: <1370349928-20419-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::230 Cc: peter.maydell@linaro.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 5/5] build: drop TARGET_TYPE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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: