From patchwork Mon May 27 11:34:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 246581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 321362C02C6 for ; Mon, 27 May 2013 21:35:41 +1000 (EST) Received: from localhost ([::1]:33273 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UgviF-0002PM-DL for incoming@patchwork.ozlabs.org; Mon, 27 May 2013 07:35:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ugvhi-0002FO-L2 for qemu-devel@nongnu.org; Mon, 27 May 2013 07:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ugvhe-0004lD-Re for qemu-devel@nongnu.org; Mon, 27 May 2013 07:35:06 -0400 Received: from mail-ea0-x230.google.com ([2a00:1450:4013:c01::230]:46415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ugvhe-0004im-It for qemu-devel@nongnu.org; Mon, 27 May 2013 07:35:02 -0400 Received: by mail-ea0-f176.google.com with SMTP id k11so3844559eaj.21 for ; Mon, 27 May 2013 04:35:01 -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=/X7maLYgTXAuqIsi7YrZ74qOGXuwWPqJij5lmD3Q5Zk=; b=0AkXHBLgkv1qDDL7ksvjDa/5bQYIYOGZUmvBMJV2+jYTdSmiTZ8e9NJxCBsqc5ZZwo LsAjVph2ZSzisn0pG0yskkVMpeB3rHD/FVl6YxfcPFyvCJ90ScyLzmBMJdSNlzNacddG I/AXoHGuavVj2s6F4AisOkAuC4MmltL7yTGG7A3nCLf6v4ZR/FJKjXxJR+ibZS6Ujvoy 6s1ryITIqNYuLOlPrQ2dh7XsjJi1vBkFXs+b073bpqZWmKdjX+dW5ICGBRAmqEk0iWJ7 nyI91I3B2gL2teUI2mlBcapp4ysr0HH1XEom6PGhLgklRjACutu6FjVYp/DzbQ5Q0z8o v2Wg== X-Received: by 10.15.48.129 with SMTP id h1mr9607431eew.65.1369654501827; Mon, 27 May 2013 04:35:01 -0700 (PDT) Received: from playground.lan (net-37-117-138-128.cust.dsl.vodafone.it. [37.117.138.128]) by mx.google.com with ESMTPSA id s8sm41020634eeo.4.2013.05.27.04.34.59 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 27 May 2013 04:35:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 27 May 2013 13:34:49 +0200 Message-Id: <1369654491-1467-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1369654491-1467-1-git-send-email-pbonzini@redhat.com> References: <1369654491-1467-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:4013:c01::230 Cc: peter.maydell@linaro.org, afaerber@suse.de Subject: [Qemu-devel] [PATCH 2/4] build: do not use TARGET_ARCH 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 TARGET_ARCH is generally wrong to use, there are better variables provided in config-target.mak. The right one is usually TARGET_NAME (previously TARGET_ARCH2), but for bsd-user we can also use TARGET_ABI_DIR for consistency with linux-user. Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- Makefile.target | 6 +++--- docs/tracing.txt | 2 +- scripts/tracetool.py | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.target b/Makefile.target index a55b163..c66f03d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -48,7 +48,7 @@ $(QEMU_PROG).stp: $(SRC_PATH)/trace-events --format=stap \ --backend=$(TRACE_BACKEND) \ --binary=$(bindir)/$(QEMU_PROG) \ - --target-arch=$(TARGET_ARCH) \ + --target-name=$(TARGET_NAME) \ --target-type=$(TARGET_TYPE) \ < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp") else @@ -95,7 +95,7 @@ endif #CONFIG_LINUX_USER ifdef CONFIG_BSD_USER -QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) +QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) obj-y += bsd-user/ obj-y += gdbstub.o user-exec.o @@ -122,7 +122,7 @@ obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o obj-$(CONFIG_NO_XEN) += xen-stub.o # Hardware support -ifeq ($(TARGET_ARCH), sparc64) +ifeq ($(TARGET_NAME), sparc64) obj-y += hw/sparc64/ else obj-y += hw/$(TARGET_BASE_ARCH)/ diff --git a/docs/tracing.txt b/docs/tracing.txt index 60ff9c5..bfc261b 100644 --- a/docs/tracing.txt +++ b/docs/tracing.txt @@ -225,7 +225,7 @@ probes: scripts/tracetool --dtrace --stap \ --binary path/to/qemu-binary \ --target-type system \ - --target-arch x86_64 \ + --target-name x86_64 \ qemu.stp == Trace event properties == diff --git a/scripts/tracetool.py b/scripts/tracetool.py index a79ec0f..5f4890f 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -46,9 +46,9 @@ Options: --check-backend Check if the given backend is valid. --binary Full path to QEMU binary. --target-type QEMU emulator target type ('system' or 'user'). - --target-arch QEMU emulator target arch. + --target-name QEMU emulator target name. --probe-prefix Prefix for dtrace probe names - (default: qemu--).\ + (default: qemu--).\ """ % { "script" : _SCRIPT, "backends" : backend_descr, @@ -66,7 +66,7 @@ def main(args): _SCRIPT = args[0] long_opts = [ "backend=", "format=", "help", "list-backends", "check-backend" ] - long_opts += [ "binary=", "target-type=", "target-arch=", "probe-prefix=" ] + long_opts += [ "binary=", "target-type=", "target-name=", "probe-prefix=" ] try: opts, args = getopt.getopt(args[1:], "", long_opts) @@ -78,7 +78,7 @@ def main(args): arg_format = "" binary = None target_type = None - target_arch = None + target_name = None probe_prefix = None for opt, arg in opts: if opt == "--help": @@ -100,8 +100,8 @@ def main(args): binary = arg elif opt == '--target-type': target_type = arg - elif opt == '--target-arch': - target_arch = arg + elif opt == '--target-name': + target_name = arg elif opt == '--probe-prefix': probe_prefix = arg @@ -122,11 +122,11 @@ def main(args): error_opt("--binary is required for SystemTAP tapset generator") if probe_prefix is None and target_type is None: error_opt("--target-type is required for SystemTAP tapset generator") - if probe_prefix is None and target_arch is None: - error_opt("--target-arch is required for SystemTAP tapset generator") + if probe_prefix is None and target_name is None: + error_opt("--target-name is required for SystemTAP tapset generator") if probe_prefix is None: - probe_prefix = ".".join([ "qemu", target_type, target_arch ]) + probe_prefix = ".".join([ "qemu", target_type, target_name ]) try: tracetool.generate(sys.stdin, arg_format, arg_backend,