From patchwork Wed Jun 13 12:55:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 138462 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp694413lji; Wed, 13 Jun 2018 06:03:22 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ2Xuj+5nGomxKr3rCqldqzmq0W4UiYRO/0smbMcMDnz1Z2nrTJtn1drsXezgTlOtIEc6GM X-Received: by 2002:ac8:2ffc:: with SMTP id m57-v6mr4336035qta.212.1528895002794; Wed, 13 Jun 2018 06:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528895002; cv=none; d=google.com; s=arc-20160816; b=qtyjQPiOaU32CMtJ3Az8Krnl6kxKWzG2lpeSGq7YHp9JlWOEh0U566zNVbwoM+2Tx2 fR2iyKM4EMhSJkxg4dEuu+waTRIWSxGzTXOwnz/eN7oENfertOnuUJpp15jF8VAhRjvA laa+flPRTXriStbMSOtFwhxrz4izmDKyrJ11BZ8D4QcMMSYKQP2E4mB1LFl+8alI/O8Y i6vlS39Pp8taGJCZ5R4i0VU1Ny4ECHYVMSXSGp/cwB7VN0tHCVEi/NlLXj6pUhfwhelc LLZaFHCTWO8tBWZ2JekwJW/eSBfHqUbR1161dGc1+cy/+rDVOswdLuk9RSUD+6LRe+l3 zhOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=wxcfGsS86kcfjLCdS7LsJfrKrVdL+ITWHRqzI4GxmL0=; b=KTnz3FS5tcV7w/3G7XdyNcWPsamfZr9RgaHQHHRVUXVaHFTEOQ1jhekazLLddrC55w +A45PkOa3WgwnjT7PdI+hP4JzalOJC0hcJsIKURsxC7DC8ZHlp5jW8Aai9YAdpCDMqrg iLzS4lJw998O9RMvqlQ21wU+Wwp8gzZ0PWi/odd5RtQdlYuSn83N1EVfaDRVfHukB/RW Sr/N5F6eFrscFvl5df60g+7CZWuRpX44ITDG9X2f4WLD1LwWbBiLYCtXK1vAcQRedcEy iG8qunMze599/MwGXy+dzzq4veuR0FoT3CTQ95smppveBDloRFLL7PVaN2tmxoOf8PrV PUbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e3Xgh41Z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w4-v6si1343506qtn.46.2018.06.13.06.03.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 13 Jun 2018 06:03:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e3Xgh41Z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT5Qo-0008Fe-91 for patch@linaro.org; Wed, 13 Jun 2018 09:03:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT5Jq-0002cM-AW for qemu-devel@nongnu.org; Wed, 13 Jun 2018 08:56:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT5Jo-00055g-Pe for qemu-devel@nongnu.org; Wed, 13 Jun 2018 08:56:10 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:40903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fT5Jo-00053X-Ff for qemu-devel@nongnu.org; Wed, 13 Jun 2018 08:56:08 -0400 Received: by mail-wm0-x22a.google.com with SMTP id n5-v6so5182924wmc.5 for ; Wed, 13 Jun 2018 05:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wxcfGsS86kcfjLCdS7LsJfrKrVdL+ITWHRqzI4GxmL0=; b=e3Xgh41ZZ3OEpjMcU6ji6DoazTLiB/0uAwzslUdXJHkHFJKaALBw1ufYm8O0p1yR0H YjwF3RM1H8JPZtO8FW43jCZe+HRSvHhDa0NQJOXLrpq2VwDHOtIx/MgSgRoHJBlpA83v nHrVGOwN7TsRy9z8PT3QeQvCVcQoRlvEWvHGo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wxcfGsS86kcfjLCdS7LsJfrKrVdL+ITWHRqzI4GxmL0=; b=rLpQgwwbxcEd4spfrsojfg8EHhzOjkRSPuO/RQL2HX5ifMYK1QPD4jtlnUwh5vpYZ9 FWJlw4srgaHbzh7SnEshNn8dbpsPR1Nxa//fO7gA07Rm0SH5YGa0cvCRFJZ2PefgR8pA qju0x5z6xIZtS7JKhTa2c2OCbZY/NtgT4TXhbyHG3p/2NHIR7Awr2VX+hgXQB6TDJ5Fx /OIXLPlyY7827od3AFXxAjKv+wrin6DV7HxX5st7AUtT2tlDXgjAVsM8kfMGuGKBUa72 2nZK68qtIfY5CpshhfRbJK0w/fRwwAqhNpOv3gxYRcBQZohoP6625BUV3jJAA61b7vWK qexQ== X-Gm-Message-State: APt69E0UQ4v05Q2AnwVLWDSQTXpFED9g/Vhk0q43dncBC+oEI3xw0tpS 2gleoBSWLqtnJ0oaDwk1SMedWA== X-Received: by 2002:a1c:ed0d:: with SMTP id l13-v6mr3579834wmh.73.1528894567320; Wed, 13 Jun 2018 05:56:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f24-v6sm1927940wmc.0.2018.06.13.05.56.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Jun 2018 05:56:03 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6EF5D3E1154; Wed, 13 Jun 2018 13:56:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Wed, 13 Jun 2018 13:55:44 +0100 Message-Id: <20180613125601.14371-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613125601.14371-1-alex.bennee@linaro.org> References: <20180613125601.14371-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22a Subject: [Qemu-devel] [RISU PATCH v3 05/22] risu: add zlib indication to help text X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, richard.henderson@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is a simple aide-memoir as it can be tricky to determine this with a simple statically compiled binary. Signed-off-by: Alex Bennée --- risu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Richard Henderson diff --git a/risu.c b/risu.c index 616fc33..c684c90 100644 --- a/risu.c +++ b/risu.c @@ -39,6 +39,9 @@ size_t signal_count; #ifdef HAVE_ZLIB #include gzFile gz_trace_file; +#define TRACE_TYPE "compressed" +#else +#define TRACE_TYPE "uncompressed" #endif sigjmp_buf jmpbuf; @@ -273,7 +276,7 @@ void usage(void) fprintf(stderr, "between master and apprentice risu processes.\n\n"); fprintf(stderr, "Options:\n"); fprintf(stderr, " --master Be the master (server)\n"); - fprintf(stderr, " -t, --trace=FILE Record/playback trace file\n"); + fprintf(stderr, " -t, --trace=FILE Record/playback " TRACE_TYPE " trace file\n"); fprintf(stderr, " -h, --host=HOST Specify master host machine (apprentice only)" "\n");