diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-04 14:45:26 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-06-14 15:33:10 +0100 |
| commit | b9a7b74f77619d3e7fb3834fbdcd3bde036ac399 (patch) | |
| tree | f262f1af785ae19a0a8b518199c3f8fbe1a995ee | |
| parent | c1799a846285764de588533e21e61167a33f5a8f (diff) | |
build: do not use TARGET_ARCH
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 <pbonzini@redhat.com>
Message-id: 1370349928-20419-4-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | Makefile.target | 8 | ||||
| -rw-r--r-- | docs/tracing.txt | 2 | ||||
| -rwxr-xr-x | scripts/tracetool.py | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.target b/Makefile.target index fcc880bd2a..9a4985213b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -48,7 +48,7 @@ $(QEMU_PROG).stp-installed: $(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-installed") @@ -57,7 +57,7 @@ $(QEMU_PROG).stp: $(SRC_PATH)/trace-events --format=stap \ --backend=$(TRACE_BACKEND) \ --binary=$(realpath .)/$(QEMU_PROG) \ - --target-arch=$(TARGET_ARCH) \ + --target-name=$(TARGET_NAME) \ --target-type=$(TARGET_TYPE) \ < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp") @@ -103,7 +103,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 @@ -128,7 +128,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 60ff9c5e6e..bfc261bcaf 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 \ <trace-events >qemu.stp == Trace event properties == diff --git a/scripts/tracetool.py b/scripts/tracetool.py index a79ec0f096..5f4890f3ab 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -46,9 +46,9 @@ Options: --check-backend Check if the given backend is valid. --binary <path> Full path to QEMU binary. --target-type <type> QEMU emulator target type ('system' or 'user'). - --target-arch <arch> QEMU emulator target arch. + --target-name <name> QEMU emulator target name. --probe-prefix <prefix> Prefix for dtrace probe names - (default: qemu-<target-type>-<target-arch>).\ + (default: qemu-<target-type>-<target-name>).\ """ % { "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, |