From patchwork Thu Apr 23 17:05:45 2020 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: 185728 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp2293675ilf; Thu, 23 Apr 2020 10:06:23 -0700 (PDT) X-Google-Smtp-Source: APiQypKDbhaLH+kx+OGYOlpRqK+Sd9XIw11qnIG8PevPy8tJSICKmR/InbxHni9zVBw0cdnvIShA X-Received: by 2002:a05:620a:1232:: with SMTP id v18mr4750986qkj.429.1587661582894; Thu, 23 Apr 2020 10:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587661582; cv=none; d=google.com; s=arc-20160816; b=FJdBvSNkFIJTBQ4l/qqT9XVS6DKXO6H25VI/YWvlhK3XFNMSze7uC+qLYIUUWLd28j 5UuzArjLIOcK5t3f2o6dCWE7wl4VG0X0MBi0JHMohU1gaE41aYH9MH+WSu5hBtk4YW2x zKSJgtS7OfW+WykfDk7Dbdu4CYO0PEgFzKrJt7rci8gy77dcssCRyxDvbvpzhh4YNa7n XT+8LTog505fsjGaWDGZDnaSpK9TRdrXmUFKcsPTlx+/93Bc0we9NUPidThINmCWoLwc cY59KndZfs/PlsNYGGedh9qMOEJX6NmMupXipfTpNKuYGUb8OWbcznE9YIeOe/uhRkcx 4Ydg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Rec4lCI7C2I9ftVXhw3jnhwwniJ/OyIiNlpjw4I33hQ=; b=ZQEJvb7S1gOFH7a0riTDJW0iB2KzqM2k3TjNoWTJtCcT/iITdKlcW6/IZIJRdFumPx H7dn4nTtwGQOJUdeaFaySUD1Y/jMYcxGSEAlcSveZ3/McI6mTLtwpm+LkdAa63Z3eKTW apzYdANxJs/iuqRQ5U9zDm0r+Ty+hlqG1AIpKMLaOCgS+o+JZHY/aAaUyaMZCtjfOXBQ gT//Kpb+nRx/B35lP+z8WKwTVTXM0Qx3r3s/7k3kJ4menPXYQif3AxOW76w/18zCm1hz W6NlfNWzROngScbF92XTeQ4PX/4HX2VwctMwHTEtXNXHeGmT+oaS1bLsfcs0+upvUGPe 7zxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tExudrxB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id l30si2000314qtf.192.2020.04.23.10.06.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Apr 2020 10:06:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tExudrxB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:60306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRfIs-0000xc-8R for patch@linaro.org; Thu, 23 Apr 2020 13:06:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44570) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRfIb-0000wO-RK for qemu-devel@nongnu.org; Thu, 23 Apr 2020 13:06:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRfIa-0005S5-PQ for qemu-devel@nongnu.org; Thu, 23 Apr 2020 13:06:05 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jRfIa-0005Re-CK for qemu-devel@nongnu.org; Thu, 23 Apr 2020 13:06:04 -0400 Received: by mail-wm1-x341.google.com with SMTP id z6so7355876wml.2 for ; Thu, 23 Apr 2020 10:06:03 -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=Rec4lCI7C2I9ftVXhw3jnhwwniJ/OyIiNlpjw4I33hQ=; b=tExudrxB9vPk++NxCuVAo8EeZ109asjdxvLWGyve24NzSHb6Dg1N4A7vwp2xnIt+rI +TdPFVmhFYaMtMaPlCHSYd7hh12ZtaOPp4DPr1xvchNsZT39jZ8AdNfOBsB/K9AyQQak 9EfK2aRwD9wOPURWocN59R4dS5IggtEsZrPNn93cjcLnHIvp/GkHVwKt9VtDFgJYrhrA iE5QaOYDiw++HdAqaLzUv10WT3gUHudZqsk9/KNUQY5jkP4wmzsVmba/olTS7r7TkYYI rTztF+WTblsJieNuUDZ47gWuHpRQjyHnRmwj5zbiifqf86qMILEGt3J4dJgLEovZd+cs udtQ== 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=Rec4lCI7C2I9ftVXhw3jnhwwniJ/OyIiNlpjw4I33hQ=; b=nlJXX1wMGOxJKDiVaK+JpLDZk92aW28FKWcY2+enUVa8U7UeewZ5sWWiIVxkbZOB5/ g7OdrIdcLQjha6lWQ8qzo91F7oJzrgNDmdtFUPe2XMDN4GL6wFI5ENiWhnaznH2ajO7I 26smaXWbXwLbKBeeMFp1T/DxfUuyd8dzJK86MA0ZWb1UMUbLzpj9kMT78L50otfOvZ3i Hr6xuNFi970SElo48umzZx7EOAN93ystVhOKNfCjVlzGBflT33O01l6OKoZwPX0q0iU5 6I5/Xj75yLAbBTrgf8gUVaEdk5dlin/E4QhH2uIRvaZldWNUP3mjLA/foZllrm2LHLyx /AkA== X-Gm-Message-State: AGi0Pubb+N4mEFvKOLSgpDGJlmPnpZfUlOfGsbJey9A2OrdkqeSLoeC7 nqLarha/rggdFknF1CG//Ts+ZQ== X-Received: by 2002:a1c:9cc6:: with SMTP id f189mr5051083wme.75.1587661562041; Thu, 23 Apr 2020 10:06:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y40sm4854696wrd.20.2020.04.23.10.05.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 10:05:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 737861FF8C; Thu, 23 Apr 2020 18:05:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/14] exec/cpu-all: Use bool for have_guest_base Date: Thu, 23 Apr 2020 18:05:45 +0100 Message-Id: <20200423170557.31106-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200423170557.31106-1-alex.bennee@linaro.org> References: <20200423170557.31106-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Riku Voipio , Richard Henderson , Laurent Vivier , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- include/exec/cpu-all.h | 2 +- bsd-user/main.c | 4 ++-- linux-user/main.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 49384bb66a..b4fb5832c4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -159,7 +159,7 @@ static inline void tswap64s(uint64_t *s) * This allows the guest address space to be offset to a convenient location. */ extern unsigned long guest_base; -extern int have_guest_base; +extern bool have_guest_base; extern unsigned long reserved_va; #if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS diff --git a/bsd-user/main.c b/bsd-user/main.c index 770c2b267a..aef5531628 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -42,7 +42,7 @@ int singlestep; unsigned long mmap_min_addr; unsigned long guest_base; -int have_guest_base; +bool have_guest_base; unsigned long reserved_va; static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; @@ -828,7 +828,7 @@ int main(int argc, char **argv) } } else if (!strcmp(r, "B")) { guest_base = strtol(argv[optind++], NULL, 0); - have_guest_base = 1; + have_guest_base = true; } else if (!strcmp(r, "drop-ld-preload")) { (void) envlist_unsetenv(envlist, "LD_PRELOAD"); } else if (!strcmp(r, "bsd")) { diff --git a/linux-user/main.c b/linux-user/main.c index 1d20a83d4e..90ad365b43 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -59,7 +59,7 @@ static const char *cpu_type; static const char *seed_optarg; unsigned long mmap_min_addr; unsigned long guest_base; -int have_guest_base; +bool have_guest_base; /* * Used to implement backwards-compatibility for the `-strace`, and @@ -334,7 +334,7 @@ static void handle_arg_cpu(const char *arg) static void handle_arg_guest_base(const char *arg) { guest_base = strtol(arg, NULL, 0); - have_guest_base = 1; + have_guest_base = true; } static void handle_arg_reserved_va(const char *arg)