From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840122; cv=none; d=zohomail.com; s=zohoarc; b=OjaumqrfWPK/xDWh7T32kjc4R9FlwsNpmpIycYUEOCvMLmSTcXZDO/FfYWpefxz8a0a4RdVkTdDROp69fnuYGCRV937OSaIVhErSH8e8sVVQc/P9/OMkN6itHO20kZoqvf1uyYi7THWqMgWYea2p3SQA5bCGoZ9E6QmYviljHwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840122; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J8Y1xFsUbnggFmWIJScpTRSuMSFl+Bq/LAbgdOuZaAs=; b=NCiHcVNsXp0dKK6Pf2wIUlV+Vroo27Aw+qs7x1c7k4uq0zky0kUpWmF6RZi21c+vYODaB+xkxuIDwyGUgM3/bKKGAZZJw0pe/T7Sqiw716R/HkGN/qFUHCMUu71MF/dR587KXcHzzjHFk+hi/ibmJP3Wifx8FJs/tsGTTPSimjg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840122854541.5508913408918; Wed, 12 May 2021 10:22:02 -0700 (PDT) Received: from localhost ([::1]:34784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsYb-00055Z-Pu for importer@patchew.org; Wed, 12 May 2021 13:22:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUH-0006zM-4N for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:33 -0400 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]:41495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUE-0008GW-SV for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:32 -0400 Received: by mail-io1-xd29.google.com with SMTP id n10so22389712ion.8 for ; Wed, 12 May 2021 10:17:30 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J8Y1xFsUbnggFmWIJScpTRSuMSFl+Bq/LAbgdOuZaAs=; b=nmVhV9qb6kxVodbtl6/yoxzEeJSUjI9fnBwnYjU3JCpzi2wqJeJf0lWMbZmMJhrLnl 7XJcUCkoPcrpsJtaxfKQ8CeGiSXLGBAv3PY9s9zF1atoFWJb4cMqVLtbCLFnNhfnnfPW ZsRQ4KvcIN8pB6AHEwli51Eke73lRoN7etAN8CM6GogpCqkcQw6n47aSf48k+d0tGzw0 GsobFmrw4Hh6edSW7RsnyIRlKsjw3LY1xwwDnKHQgrLDSv++obVICRWz4W4r9G51iwIz ACVcdlyQAWp0rSrvqRKzcLwNNGGjp13KGz318niqQ3b7MfZRARHvIVD9Bb1xxvQ9rfb5 0lrw== 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=J8Y1xFsUbnggFmWIJScpTRSuMSFl+Bq/LAbgdOuZaAs=; b=dlX/WRhiUBCgt8fB7Je6HoSGXW3zkVJNCvDek8lO9cFz3vwu2jKpvokbNdy3kMfuv8 MAzFi/jHvwkqKYYWx3+A1RTb4CT4xNig4ubP+Cm3uPOS1913n3TgsJ0oyZIu5uzEbYFN GRq0CeUo4J2jy2kb3iudlJJuOdw0AC3cwhCBtCVqF0UC8V+oLhUfjS7XJb1lln12roij oMciFpetq5JjdQFeYcG2dbwrNQNXmxPM+jow9+0FI5p7cZF9USoBVHWHQIEaGE/27AnV ZBe67wYpBBz9fUuYkNJl3TC8TppRlHShwtj98djT6ZPCg1CbYUGytKHYQwbYKxJYS6PW +7XQ== X-Gm-Message-State: AOAM532nDNnnnd5q16H5AVHHVMHgLaRswzZq5s7Ymf9cAmUeYDsMfzkw lJGQRcebE+++NbmVggEHgn27fevZG3stSQ== X-Google-Smtp-Source: ABdhPJwEpXLPSzsmNIgf3nxdVx1PZmCGNDZwQUdlup8bfo0b7mZh4t8bny/hU3FQu2GEYfcdbeJ+0Q== X-Received: by 2002:a02:5142:: with SMTP id s63mr32918307jaa.82.1620839848698; Wed, 12 May 2021 10:17:28 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 01/20] bsd-user: whitespace changes Date: Wed, 12 May 2021 11:17:01 -0600 Message-Id: <20210512171720.46744-2-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d29; envelope-from=imp@bsdimp.com; helo=mail-io1-xd29.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Space after keywords, no space for function calls and spaces around operato= rs. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/main.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 36a889d084..079520737b 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -149,13 +149,13 @@ void cpu_loop(CPUX86State *env) abi_ulong pc; //target_siginfo_t info; =20 - for(;;) { + for (;;) { cpu_exec_start(cs); trapnr =3D cpu_exec(cs); cpu_exec_end(cs); process_queued_cpu_work(cs); =20 - switch(trapnr) { + switch (trapnr) { case 0x80: /* syscall from int $0x80 */ if (bsd_type =3D=3D target_freebsd) { @@ -344,7 +344,7 @@ void cpu_loop(CPUX86State *env) { int sig; =20 - sig =3D gdb_handlesig (env, TARGET_SIGTRAP); + sig =3D gdb_handlesig(env, TARGET_SIGTRAP); if (sig) { info.si_signo =3D sig; @@ -397,7 +397,7 @@ static inline void save_window_offset(CPUSPARCState *en= v, int cwp1) printf("win_overflow: sp_ptr=3D0x" TARGET_ABI_FMT_lx " save_cwp=3D%d\n= ", sp_ptr, cwp1); #endif - for(i =3D 0; i < 16; i++) { + for (i =3D 0; i < 16; i++) { /* FIXME - what to do if put_user() fails? */ put_user_ual(env->regbase[get_reg_index(env, cwp1, 8 + i)], sp_ptr= ); sp_ptr +=3D sizeof(abi_ulong); @@ -447,7 +447,7 @@ static void restore_window(CPUSPARCState *env) printf("win_underflow: sp_ptr=3D0x" TARGET_ABI_FMT_lx " load_cwp=3D%d\= n", sp_ptr, cwp1); #endif - for(i =3D 0; i < 16; i++) { + for (i =3D 0; i < 16; i++) { /* FIXME - what to do if get_user() fails? */ get_user_ual(env->regbase[get_reg_index(env, cwp1, 8 + i)], sp_ptr= ); sp_ptr +=3D sizeof(abi_ulong); @@ -467,7 +467,7 @@ static void flush_windows(CPUSPARCState *env) int offset, cwp1; =20 offset =3D 1; - for(;;) { + for (;;) { /* if restore would invoke restore_window(), then we can stop */ cwp1 =3D cpu_cwp_inc(env, env->cwp + offset); #ifndef TARGET_SPARC64 @@ -647,11 +647,11 @@ void cpu_loop(CPUSPARCState *env) #ifdef TARGET_SPARC64 badtrap: #endif - printf ("Unhandled trap: 0x%x\n", trapnr); + printf("Unhandled trap: 0x%x\n", trapnr); cpu_dump_state(cs, stderr, 0); - exit (1); + exit(1); } - process_pending_signals (env); + process_pending_signals(env); } } =20 @@ -824,15 +824,15 @@ int main(int argc, char **argv) } else if (!strcmp(r, "cpu")) { cpu_model =3D argv[optind++]; if (is_help_option(cpu_model)) { -/* XXX: implement xxx_cpu_list for targets that still miss it */ + /* XXX: implement xxx_cpu_list for targets that still miss= it */ #if defined(cpu_list) - cpu_list(); + cpu_list(); #endif exit(1); } } else if (!strcmp(r, "B")) { - guest_base =3D strtol(argv[optind++], NULL, 0); - have_guest_base =3D true; + guest_base =3D strtol(argv[optind++], NULL, 0); + have_guest_base =3D true; } else if (!strcmp(r, "drop-ld-preload")) { (void) envlist_unsetenv(envlist, "LD_PRELOAD"); } else if (!strcmp(r, "bsd")) { @@ -957,7 +957,7 @@ int main(int argc, char **argv) } } =20 - if (loader_exec(filename, argv+optind, target_environ, regs, info) != =3D 0) { + if (loader_exec(filename, argv + optind, target_environ, regs, info) != =3D 0) { printf("Error loading %s\n", filename); _exit(1); } @@ -1052,8 +1052,8 @@ int main(int argc, char **argv) env->idt.limit =3D 255; #endif env->idt.base =3D target_mmap(0, sizeof(uint64_t) * (env->idt.limit + = 1), - PROT_READ|PROT_WRITE, - MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); idt_table =3D g2h_untagged(env->idt.base); set_idt(0, 0); set_idt(1, 0); @@ -1081,8 +1081,8 @@ int main(int argc, char **argv) { uint64_t *gdt_table; env->gdt.base =3D target_mmap(0, sizeof(uint64_t) * TARGET_GDT_ENT= RIES, - PROT_READ|PROT_WRITE, - MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); env->gdt.limit =3D sizeof(uint64_t) * TARGET_GDT_ENTRIES - 1; gdt_table =3D g2h_untagged(env->gdt.base); #ifdef TARGET_ABI32 @@ -1122,9 +1122,9 @@ int main(int argc, char **argv) env->pc =3D regs->pc; env->npc =3D regs->npc; env->y =3D regs->y; - for(i =3D 0; i < 8; i++) + for (i =3D 0; i < 8; i++) env->gregs[i] =3D regs->u_regs[i]; - for(i =3D 0; i < 8; i++) + for (i =3D 0; i < 8; i++) env->regwptr[i] =3D regs->u_regs[i + 8]; } #else --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840120; cv=none; d=zohomail.com; s=zohoarc; b=E0zXWFaND7qfgKrXQJp/0qU8L2BqdlKqz56aFxU10IfEMD6DZp9P04qTfW5dbMbPUGUFAemvP/gFxcWker9s3/KTXbwVGE6XYcmyrK4bNUstRqRTc79A8ZICqTzODX4UcHAg3n/SXxxEnVOv9GZpVhK28FDqc51QZBONwvfX/7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840120; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k1upx2HFVOFVN6PSIryAU8yLJ9E9/r17hsSVgOx4tWA=; b=Kyw1uTP26v3kezdXhPD5ElqT2YZsOrD9XlVAgdcv16B1/9lPxSyaMJPzx2qb0A5sioN3J/lZzS5NpdepFbCXHjOI6LFykO3WVT9SV28EwrFWh0JvVvdJ97Ihc3J1e/EMib6BagK4UdA5mWGhs6kOVcL+huvRLhz6Y8dNQrpMWlM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16208401204142.0780780199299898; Wed, 12 May 2021 10:22:00 -0700 (PDT) Received: from localhost ([::1]:34700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsYZ-00051C-7T for importer@patchew.org; Wed, 12 May 2021 13:21:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUK-00074Z-G6 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:38 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:39689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUF-0008Gq-DO for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:35 -0400 Received: by mail-io1-xd32.google.com with SMTP id k25so22405249iob.6 for ; Wed, 12 May 2021 10:17:30 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k1upx2HFVOFVN6PSIryAU8yLJ9E9/r17hsSVgOx4tWA=; b=ATTacYXN1VijBud8Mu7fzj3Q9jbNCw5Kp2jIOJd9LwF0laQod31rVEoT8EerbS7TcV vhpYKcm1Y4sARhmyX1nlvWfBYrHcVNDo5ZuZEh5Zx2IrL7YZWYhtpirj9MLjmr3uldqy xHcm1AtD8FysWHS5t3MfDwBKYLpyGVkUbxiSf+vjXmlffzneF/MQyh2g7o3rHftb5rDD /yAfqAbdx3yFp8ve4Hh1cw5903v75NGYDK4DlMn+hIpcXqZLncMIyeYkuBlevsTuoMyO S+I0PTdYbTDWxcs5LCUm69eTHqVs9ig5zAKUz7FK2f1KIF+A6HcTcktnIWOifb9Am3ea NJNw== 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=k1upx2HFVOFVN6PSIryAU8yLJ9E9/r17hsSVgOx4tWA=; b=ErOMB4j5xxDO3nR77RJzz/ORjyr7KdEnjxuCitS3nkyTgG1sDy6y4pSP2/tUKkrWUM zjz0obn+MGw078khFsVVUTWgxdXjnD8qJiQ8HkvPiV/9QD166uBcd2Kok3E59HyeHlNI drxqeL8cRe9bwMqurIFg0RbpxV9rJHL0RMZoPkiT08AchzQpn1JdZ2ta6pQrExwbUqcO FydLdsLZH9zlb9FMq8H0aksEQ79SI1/bzKvPwpm5Mo0UubA99c+uMyQP6vu6NKDjRSEc +qSv2W8CwKxQHnGTvTTcpAyNJ5VOJyJWm6o+lsC5ZccLYs3lXwmmrab5czcI/GmzKaLL lSmw== X-Gm-Message-State: AOAM531+gSgnP9uRvLVMk8pwjVwnd0VZJ+R6bj2HEmUJ14R4qv7HFa/7 wqFBGGL5VkcItJZCU2c+RL1n4dyijxLKXg== X-Google-Smtp-Source: ABdhPJx0Pft8P9nWYXTnr28ZF56WPLPtwhzqn9SHZ8WMdgNY6jofLmL9ONmpBdkEE7nFds1HUruWOA== X-Received: by 2002:a5d:8506:: with SMTP id q6mr10927092ion.11.1620839849396; Wed, 12 May 2021 10:17:29 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 02/20] bsd-user: style tweak: use C not C++ comments Date: Wed, 12 May 2021 11:17:02 -0600 Message-Id: <20210512171720.46744-3-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d32; envelope-from=imp@bsdimp.com; helo=mail-io1-xd32.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 079520737b..5253ceb24b 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -147,7 +147,7 @@ void cpu_loop(CPUX86State *env) CPUState *cs =3D env_cpu(env); int trapnr; abi_ulong pc; - //target_siginfo_t info; + /* target_siginfo_t info; */ =20 for (;;) { cpu_exec_start(cs); @@ -196,7 +196,7 @@ void cpu_loop(CPUX86State *env) arg6, arg7, arg8); - } else { //if (bsd_type =3D=3D target_openbsd) + } else { /* if (bsd_type =3D=3D target_openbsd) */ env->regs[R_EAX] =3D do_openbsd_syscall(env, env->regs[R_EAX], env->regs[R_EBX], @@ -225,7 +225,7 @@ void cpu_loop(CPUX86State *env) env->regs[R_ECX], env->regs[8], env->regs[9], 0, 0); - else { //if (bsd_type =3D=3D target_openbsd) + else { /* if (bsd_type =3D=3D target_openbsd) */ env->regs[R_EAX] =3D do_openbsd_syscall(env, env->regs[R_EAX], env->regs[R_EDI], @@ -369,7 +369,7 @@ void cpu_loop(CPUX86State *env) #ifdef TARGET_SPARC #define SPARC64_STACK_BIAS 2047 =20 -//#define DEBUG_WIN +/* #define DEBUG_WIN */ /* WARNING: dealing with register windows _is_ complicated. More info can be found at http://www.sics.se/~psm/sparcstack.html */ static inline int get_reg_index(CPUSPARCState *env, int cwp, int index) @@ -496,7 +496,7 @@ void cpu_loop(CPUSPARCState *env) { CPUState *cs =3D env_cpu(env); int trapnr, ret, syscall_nr; - //target_siginfo_t info; + /* target_siginfo_t info; */ =20 while (1) { cpu_exec_start(cs); @@ -526,7 +526,7 @@ void cpu_loop(CPUSPARCState *env) env->regwptr[0], env->regwptr[1], env->regwptr[2], env->regwptr[3], env->regwptr[4], env->regwptr[5]); - else { //if (bsd_type =3D=3D target_openbsd) + else { /* if (bsd_type =3D=3D target_openbsd) */ #if defined(TARGET_SPARC64) syscall_nr &=3D ~(TARGET_OPENBSD_SYSCALL_G7RFLAG | TARGET_OPENBSD_SYSCALL_G2RFLAG); @@ -618,7 +618,7 @@ void cpu_loop(CPUSPARCState *env) info._sifields._sigfault._addr =3D env->dmmuregs[4]; else info._sifields._sigfault._addr =3D env->tsptr->tpc; - //queue_signal(env, info.si_signo, &info); + /* queue_signal(env, info.si_signo, &info); */ } #endif break; @@ -638,7 +638,7 @@ void cpu_loop(CPUSPARCState *env) info.si_signo =3D sig; info.si_errno =3D 0; info.si_code =3D TARGET_TRAP_BRKPT; - //queue_signal(env, info.si_signo, &info); + /* queue_signal(env, info.si_signo, &info); */ } #endif } --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840506; cv=none; d=zohomail.com; s=zohoarc; b=Wrcm6REh2kfB4AlLog0hrn91+Py117/tUGd1YFX9yH4iqXL4+3K6CpZTC3876T5v2qtabj64sn0X0EKKTTSg5N/m99dgjmzh1wVze3uEFWHDofOrnBw1Jnj5rQqLwmcDc3EQvE3+U9zJoLfuRW9pOle3R76+xSoV00rY10o4Nys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840506; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xcbvTyE06GsbXZ6wscH4ReU21BuFqy0VwV1NpioIp6Q=; b=YmCfeUzodY1j7uliv3LTKlMsA8uLljFFW1Vcosd4E3ObwseYSuJorgjobY1sKn59dYbLGYrUA4hsU05G2upW+sKmNtMBDZUYT2Wjlvx4Tmeep8Wker75VC9kOYCW3f+TvoPyfv0dZvU5vK4l7t1S/tJi6zhBlWPA4Ir7x6o0trs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840506750570.6239057892257; Wed, 12 May 2021 10:28:26 -0700 (PDT) Received: from localhost ([::1]:51350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsen-0000GY-DG for importer@patchew.org; Wed, 12 May 2021 13:28:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUK-00074e-HA for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:38 -0400 Received: from mail-io1-xd35.google.com ([2607:f8b0:4864:20::d35]:37736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUF-0008H1-Jl for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:36 -0400 Received: by mail-io1-xd35.google.com with SMTP id n40so6641844ioz.4 for ; Wed, 12 May 2021 10:17:31 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xcbvTyE06GsbXZ6wscH4ReU21BuFqy0VwV1NpioIp6Q=; b=BxgvKa8s0JoQNp16hlC1E+oKtnbiv1ag7aDWoONLREF9MSyAyXJ8UNpa1sVBkkTsfR db9W2HsBxx46Xn+KhF9EuwIVXDz/f3ojrtsa9OabkJZ2vqHP8TgEQrj61Y/McSB4hdKN pgBinujBVWEyVNvNO2L4cDgHYQ87ooK2qSexCQFCFcrWlZKJRNZHhcgB0Jd/Z383LCBe AuqUkidNbb6AP5u6WL3XjgOVger81raXpR2ZUP/13SGYuYjsA+lTqThvA2j8VQe0nIOa FZWbnEl29+ou4TonBVHU5tlqoVqfS/hiCFPaHmfCzSwMYLhq4UI2UDI8s4v1TLRFF9yb ZzvA== 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=xcbvTyE06GsbXZ6wscH4ReU21BuFqy0VwV1NpioIp6Q=; b=K82D4LrVDedP+mcDtuYtUdTJKBXJOVITyIRTP+BOY8JpHzoNUcSf95o07u4HMmna+4 fI2bjWyo0rxo5y05APxR5/PB9krEH+4DhQn2lGjDx2WyX9liGcEmHdLO5fpdlzH6LcTS 6o4KqInOqBOLUFDKhPmGOlVbXfCxFkgL+cMi/SRiqoX7QFPSOLFcqXj4nu5PDny2UzWw LbTArgsDSkXYE0OPIID0LFhAf8pm3+PApYEEy4hvbR4NIeyYq5G2ZxO++MuAivTEmRkT xBmDKFZZeboarlV91VpLDFUoDYlg5Uk+LXhQbZ0Lhw5lwr5TBvIUaFRr3XMbKhz9sLbZ y+0w== X-Gm-Message-State: AOAM530Bj1Mfr2GqRijrCB659+pxopvtiFuP6Obo55FqWWJDmP7NezMD JfiXUtlYxuFA3zLH+bkj449Q23S39VJdhg== X-Google-Smtp-Source: ABdhPJzMF3SklwvqjvsuEV0Z1FBh46RKpTsu5n3z9oacNDC68C9KOSDrHuE4NJivT95NowlWVD02Sw== X-Received: by 2002:a5e:c202:: with SMTP id v2mr5207323iop.89.1620839850262; Wed, 12 May 2021 10:17:30 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 03/20] bsd-user: style tweak: Remove #if 0'd code Date: Wed, 12 May 2021 11:17:03 -0600 Message-Id: <20210512171720.46744-4-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d35; envelope-from=imp@bsdimp.com; helo=mail-io1-xd35.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/main.c | 143 ------------------------------------------------ 1 file changed, 143 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 5253ceb24b..c342dd7829 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -243,118 +243,10 @@ void cpu_loop(CPUX86State *env) env->eflags &=3D ~CC_C; } break; -#endif -#if 0 - case EXCP0B_NOSEG: - case EXCP0C_STACK: - info.si_signo =3D SIGBUS; - info.si_errno =3D 0; - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - queue_signal(env, info.si_signo, &info); - break; - case EXCP0D_GPF: - /* XXX: potential problem if ABI32 */ -#ifndef TARGET_X86_64 - if (env->eflags & VM_MASK) { - handle_vm86_fault(env); - } else -#endif - { - info.si_signo =3D SIGSEGV; - info.si_errno =3D 0; - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - queue_signal(env, info.si_signo, &info); - } - break; - case EXCP0E_PAGE: - info.si_signo =3D SIGSEGV; - info.si_errno =3D 0; - if (!(env->error_code & 1)) - info.si_code =3D TARGET_SEGV_MAPERR; - else - info.si_code =3D TARGET_SEGV_ACCERR; - info._sifields._sigfault._addr =3D env->cr[2]; - queue_signal(env, info.si_signo, &info); - break; - case EXCP00_DIVZ: -#ifndef TARGET_X86_64 - if (env->eflags & VM_MASK) { - handle_vm86_trap(env, trapnr); - } else -#endif - { - /* division by zero */ - info.si_signo =3D SIGFPE; - info.si_errno =3D 0; - info.si_code =3D TARGET_FPE_INTDIV; - info._sifields._sigfault._addr =3D env->eip; - queue_signal(env, info.si_signo, &info); - } - break; - case EXCP01_DB: - case EXCP03_INT3: -#ifndef TARGET_X86_64 - if (env->eflags & VM_MASK) { - handle_vm86_trap(env, trapnr); - } else -#endif - { - info.si_signo =3D SIGTRAP; - info.si_errno =3D 0; - if (trapnr =3D=3D EXCP01_DB) { - info.si_code =3D TARGET_TRAP_BRKPT; - info._sifields._sigfault._addr =3D env->eip; - } else { - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - } - queue_signal(env, info.si_signo, &info); - } - break; - case EXCP04_INTO: - case EXCP05_BOUND: -#ifndef TARGET_X86_64 - if (env->eflags & VM_MASK) { - handle_vm86_trap(env, trapnr); - } else -#endif - { - info.si_signo =3D SIGSEGV; - info.si_errno =3D 0; - info.si_code =3D TARGET_SI_KERNEL; - info._sifields._sigfault._addr =3D 0; - queue_signal(env, info.si_signo, &info); - } - break; - case EXCP06_ILLOP: - info.si_signo =3D SIGILL; - info.si_errno =3D 0; - info.si_code =3D TARGET_ILL_ILLOPN; - info._sifields._sigfault._addr =3D env->eip; - queue_signal(env, info.si_signo, &info); - break; #endif case EXCP_INTERRUPT: /* just indicate that signals should be handled asap */ break; -#if 0 - case EXCP_DEBUG: - { - int sig; - - sig =3D gdb_handlesig(env, TARGET_SIGTRAP); - if (sig) - { - info.si_signo =3D sig; - info.si_errno =3D 0; - info.si_code =3D TARGET_TRAP_BRKPT; - queue_signal(env, info.si_signo, &info); - } - } - break; -#endif default: pc =3D env->segs[R_CS].base + env->eip; fprintf(stderr, "qemu: 0x%08lx: unhandled CPU exception 0x%x -= aborting\n", @@ -588,16 +480,6 @@ void cpu_loop(CPUSPARCState *env) break; case TT_TFAULT: case TT_DFAULT: -#if 0 - { - info.si_signo =3D SIGSEGV; - info.si_errno =3D 0; - /* XXX: check env->error_code */ - info.si_code =3D TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr =3D env->mmuregs[4]; - queue_signal(env, info.si_signo, &info); - } -#endif break; #else case TT_SPILL: /* window overflow */ @@ -608,19 +490,6 @@ void cpu_loop(CPUSPARCState *env) break; case TT_TFAULT: case TT_DFAULT: -#if 0 - { - info.si_signo =3D SIGSEGV; - info.si_errno =3D 0; - /* XXX: check env->error_code */ - info.si_code =3D TARGET_SEGV_MAPERR; - if (trapnr =3D=3D TT_DFAULT) - info._sifields._sigfault._addr =3D env->dmmuregs[4]; - else - info._sifields._sigfault._addr =3D env->tsptr->tpc; - /* queue_signal(env, info.si_signo, &info); */ - } -#endif break; #endif case EXCP_INTERRUPT: @@ -628,19 +497,7 @@ void cpu_loop(CPUSPARCState *env) break; case EXCP_DEBUG: { -#if 0 - int sig =3D -#endif gdb_handlesig(cs, TARGET_SIGTRAP); -#if 0 - if (sig) - { - info.si_signo =3D sig; - info.si_errno =3D 0; - info.si_code =3D TARGET_TRAP_BRKPT; - /* queue_signal(env, info.si_signo, &info); */ - } -#endif } break; default: --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840749; cv=none; d=zohomail.com; s=zohoarc; b=Iq26Y9z46NuyXQVFtPgO5cbxNgfsII2G4QtUtZMotynS4rWRxIxkmSSui7Y5b6hIilOdSubDx9Dx4QTEnrhEIdYcLGbUIjAMEej2mWtmePrUGxMe4W8nDEI8TIhdgsO3PSSdJ63Z2pB1KAi+7VeR8uFwenjjGzj+Evk5RdY8ddk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840749; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tLJeaEkFF9pn0rRHnoKamSr74c8lvvgr12qL9qBzFfY=; b=bTYesT8gYzmYCJGsxXSD0sHKdQgvlvJ1NHEYhBKWdR7sqzP2DKuywl06vjFR5vIsRq2JMfEXzr8z3Iu/FudMFNyWC8WtYt7OHgAv00bon1OLwcOIP5bxdnKWkCZuVeJMgo9IqpAodd8EdaL16K4KFpq64jvwb3bjqDAEN4f6ClA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840749509633.6854099987645; Wed, 12 May 2021 10:32:29 -0700 (PDT) Received: from localhost ([::1]:59978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsig-0006Ga-Sk for importer@patchew.org; Wed, 12 May 2021 13:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUO-00077D-TK for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:45 -0400 Received: from mail-io1-xd36.google.com ([2607:f8b0:4864:20::d36]:40600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUG-0008II-FT for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:38 -0400 Received: by mail-io1-xd36.google.com with SMTP id z24so22425746ioj.7 for ; Wed, 12 May 2021 10:17:32 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tLJeaEkFF9pn0rRHnoKamSr74c8lvvgr12qL9qBzFfY=; b=kjqFQKtR7CmkT3t0IYqZv/kWwnV5dHxsWGlT0i7waBIJfpAJs14wcIrB3Z25du/zMJ /xcvyxgBCxRZv+ocp6GXQR31/719kPEjPbiiEwsa+QeR/XFlX0Oq72LjnfrW1gz20hMi M0OUjUi4yZSUzdZ54UBuWUZ8SXTLc2BSaxrejWPnWylfn1UMOpmrsex9WBNTkFWZuY/H 9vpEzCNvEY2mN2NtSscuZj8EgiZi35BT10ypWE5axH/zmWyo2MtNGoVZb6kRCppIaHXp P3HOEgNaVdn89wbS6fAx+mNVsMbc4D158rOrC0C/9oc6wbDR4B9yoXOMgQjDfogotWtp jrmQ== 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=tLJeaEkFF9pn0rRHnoKamSr74c8lvvgr12qL9qBzFfY=; b=WsUNsdpQCAJmwN0M9yrR4cex5oBCPkkts5rpay/Mf/6EO2Ga5lWoBZH6UMcyMw8Kdf N6ufK7gCBEa9PiWfwyOG6dzOPRTSSoTQX4zlbZjFP5TeJOUWxt11pmx6NCtABMmFIisi 0NAqu0b0UAbFI2i5V5T9Q4HjDWYROO2R7E4ggVMeZRZeRx/1GCBgWYWmaLM/VHu1wSCI gL+ybpmCjG7JY+WgMsTpcdyJ8+QO8oMrEQFyyIzfk7wdDDdYOq3QzDJ6JLSAmzQrI1z7 H8qB4Mcxq7r0eMMrLLrKHM9c/9iLPB93AGPJNVtxgunlTv7CkAR860DVYJ7Z47tsHRMM FTHQ== X-Gm-Message-State: AOAM530ty1rK3XDD16se6/zmmxfGA4OjRJ0Vs1juoE/A9639BrZDDiG5 sqmhYd67X26wD8WyCf7S4g17JRp5A5e5Rg== X-Google-Smtp-Source: ABdhPJw/0MxfRbhmwlNDIXrj2/yZuz1yW3GcV/I8OPY1WUtGFCAVzxXJQUB3upCXeTRhCyCqsUPnZg== X-Received: by 2002:a6b:d11a:: with SMTP id l26mr27228993iob.88.1620839851211; Wed, 12 May 2021 10:17:31 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 04/20] bsd-user: style tweak: Use preferred block comments Date: Wed, 12 May 2021 11:17:04 -0600 Message-Id: <20210512171720.46744-5-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d36; envelope-from=imp@bsdimp.com; helo=mail-io1-xd36.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Use the preferred block comment style. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/main.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index c342dd7829..cd1c26516b 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -50,9 +50,11 @@ const char *qemu_uname_release; extern char **environ; enum BSDType bsd_type; =20 -/* XXX: on x86 MAP_GROWSDOWN only works if ESP <=3D address + 32, so - we allocate a bigger stack. Need a better solution, for example - by remapping the process stack directly at the right place */ +/* + * XXX: on x86 MAP_GROWSDOWN only works if ESP <=3D address + 32, so + * we allocate a bigger stack. Need a better solution, for example + * by remapping the process stack directly at the right place + */ unsigned long x86_stack_size =3D 512 * 1024; =20 void gemu_log(const char *fmt, ...) @@ -262,13 +264,17 @@ void cpu_loop(CPUX86State *env) #define SPARC64_STACK_BIAS 2047 =20 /* #define DEBUG_WIN */ -/* WARNING: dealing with register windows _is_ complicated. More info - can be found at http://www.sics.se/~psm/sparcstack.html */ +/* + * WARNING: dealing with register windows _is_ complicated. More info + * can be found at http://www.sics.se/~psm/sparcstack.html + */ static inline int get_reg_index(CPUSPARCState *env, int cwp, int index) { index =3D (index + cwp * 16) % (16 * env->nwindows); - /* wrap handling : if cwp is on the last window, then we use the - registers 'after' the end */ + /* + * wrap handling : if cwp is on the last window, then we use the + * registers 'after' the end + */ if (index < 8 && env->cwp =3D=3D env->nwindows - 1) index +=3D 16 * env->nwindows; return index; @@ -846,9 +852,11 @@ int main(int argc, char **argv) syscall_init(); signal_init(); =20 - /* Now that we've loaded the binary, GUEST_BASE is fixed. Delay - generating the prologue until now so that the prologue can take - the real value of GUEST_BASE into account. */ + /* + * Now that we've loaded the binary, GUEST_BASE is fixed. Delay + * generating the prologue until now so that the prologue can take + * the real value of GUEST_BASE into account. + */ tcg_prologue_init(tcg_ctx); tcg_region_init(); =20 --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840369; cv=none; d=zohomail.com; s=zohoarc; b=N+TTPnakDLN/mf8z0FW2XpR3DsQqMwaUYSDp67vSYU7fgFZlJCuo+KR89HTkNxLywfUZH3Q5aZ00VjCSsiAjmT/4yVBbNetEoFLe13canTbaZ5aSxwNn0RacBH8HZ3t65Mz+C9sLJILRJuw67FVVvJP0LULRrFvKjKDN5dESRyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840369; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lcNhuk+/UP+YWgfFE7/i6JSUSQF0xDtbR8oIBcbnvUg=; b=BkSqSGfupo1Ijs969btrZULRUyVs0aaDbVLOHKWygeAekDR9ZcQ6IAKXZUfmjbYFSL51dx0DyyVAjlCl4l8J4TVnuUvGchckQO278tQjwjJsU+OEXsQb1hnmJGb+VNu+irlmkSAaA/9oERBReCPUuIJOmClJmLAM2zVRGkdkoyM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840369712104.1540553111546; Wed, 12 May 2021 10:26:09 -0700 (PDT) Received: from localhost ([::1]:43430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsca-0003AN-KP for importer@patchew.org; Wed, 12 May 2021 13:26:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUU-00078W-NN for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:49 -0400 Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]:38599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUI-0008J5-G2 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:46 -0400 Received: by mail-il1-x12b.google.com with SMTP id c3so20815547ils.5 for ; Wed, 12 May 2021 10:17:33 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lcNhuk+/UP+YWgfFE7/i6JSUSQF0xDtbR8oIBcbnvUg=; b=rZxBW9T1C/P0K1FvKei6HG1iuWwfaQ3EDyVoVxkxRunii34upwn9++0YpaoYC2pqsH iNqvyT9giJnb4xmjGPdH109sUH+SEN3B8zgWYjGAvZtQYGquUQTVsx8EEUMP6jAxQ/KG gwsnBoyBsqXoSj3o9PoUSyX1K3rKqnT84Kwdun1Tu8YV0KxNByYxMJiLNmv1rfu5CmEs GdpX3c0mPeZBLEl62obSF6iTPyqXnPoazn3VFHBbJzn7XTFlV7ZEEaB560KXQwRWz2yT tp17mr4GEVWRj8i1hTyxKbCWBwTs7aAfuAZJR1D43+VwDuGD+IaQYpAWyr1oz/9YkbUK KrSg== 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=lcNhuk+/UP+YWgfFE7/i6JSUSQF0xDtbR8oIBcbnvUg=; b=Zgvaaz1P7JG826GJ8Ydy8+bKutZjK8YeGREn4sC5MtXjZAlrKmEjzaZ2xNuOsMa9Vv Qd4Os/G5VpIxCDm2QrNLZwO4bSdD82mMdcXSbIxwBwDmMYS11aLQFDLhDucrRuJQodr4 jow3UnEPoln0k8LOIVsULfCS7NXH096wrXhwx7iJ1xIyTKGHrAjEa1H/DzsG8Lg3EP+n N0DXiUFjdtaiBkf+61KX/iFeUj/LaC+svcRrEshosBQsJE+zv+ZEgCqgkcItRjiVR3LI vK6AVx9AxSVDDMPeNca3pPOn2C3fVaD0QqvgZH5b2/WE+mMbfNY9/uoVtfCi3uBKWLGR wY3A== X-Gm-Message-State: AOAM531AZOymkNoJaYjDxrq7xFY4PMTOHMjQ6FNCcoQd59+2T0PDbO7Q irygtItlTIxQo/oaJ9tbQp0vNNYOqE1heg== X-Google-Smtp-Source: ABdhPJwCce/Jw+h+ZcPA8esMYaZ4g53eMwE+Wgd3JFVga46hbd6HKqCjp8yfEhImsivql2MTzgyvcQ== X-Received: by 2002:a92:d2c5:: with SMTP id w5mr7759026ilg.146.1620839852194; Wed, 12 May 2021 10:17:32 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 05/20] bsd-user: Remove commented out code Date: Wed, 12 May 2021 11:17:05 -0600 Message-Id: <20210512171720.46744-6-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::12b; envelope-from=imp@bsdimp.com; helo=mail-il1-x12b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Remove dead code that's been commented out forever. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/qemu.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index b836b603af..7ccc8ad397 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -71,7 +71,6 @@ struct image_info { =20 struct sigqueue { struct sigqueue *next; - //target_siginfo_t info; }; =20 struct emulated_sigtable { @@ -193,9 +192,6 @@ extern int do_strace; /* signal.c */ void process_pending_signals(CPUArchState *cpu_env); void signal_init(void); -//int queue_signal(CPUArchState *env, int sig, target_siginfo_t *info); -//void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *in= fo); -//void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tin= fo); long do_sigreturn(CPUArchState *env); long do_rt_sigreturn(CPUArchState *env); abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong= sp); --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840904; cv=none; d=zohomail.com; s=zohoarc; b=CRSo1JLLnVsQZtNR8Uv4AueaAzdeOrkir7cS7dI8/a6KV/U83zuf4UfCYpOQmsMFiG/hlhZCsuUiMzsWriSfQwiVNtdsXEIUOoL5as6095NNpXPXAQxklSVXkEHNlBpAwqneHAiKP8KwDZAMZIe6CBdaAY/bpaw+/EbNgVzSuok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840904; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RLFKyjP117rAyI8j9vqpxACizdyhUGbM8QMFz1tkXdA=; b=Sr1GcoD2jrrNCL2SlpWJczVGI79KNBUU4eI4Wv6oqyP3trDKGw7nxM6p2k27ydgjBleOUjyjU3bXhK+irxmgtJUfjTVH8rHg+FxxCiRYHZT1yL6miIQErH8uFAbECl1JcabK/5R/sGam7tQfYiLuIG461zyf6GcPknRSplPXsfo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840904431143.59039741110632; Wed, 12 May 2021 10:35:04 -0700 (PDT) Received: from localhost ([::1]:40176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgslD-0003Ue-Du for importer@patchew.org; Wed, 12 May 2021 13:35:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUR-00077H-PW for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:45 -0400 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]:40610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUJ-0008JM-P7 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:40 -0400 Received: by mail-il1-x134.google.com with SMTP id h6so20790626ila.7 for ; Wed, 12 May 2021 10:17:34 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RLFKyjP117rAyI8j9vqpxACizdyhUGbM8QMFz1tkXdA=; b=Sg6QPJHjHbb+9wZ90Jprk5cczTe4r7zhF856OyWFGEpbBSYrERlUAcc+c6ZjNuNqcu 6Phkscwbhi8dudOsZX80OQGUfmsD051HNp6NQ5UatrUk3wEfrPA1Jn3CmZ82pMkleQk7 hwRnurQWY51fjWpqBr32tISNPXqY0TPO8OwrpYYTz6I175Z9rSwzKYBnwvDJ7xWwh2w2 p7gffSOvkC+zuZMIqWJQ6Q5eACeQoeTPJ0/cY8eY4VtQT606oTy2n+dWl5TvCPx8TOs8 G3Ljg0tstGrb5bWk38Ir0Bfmw3Qw7rWtz02rE0rc3k+I8Zah0VpEnN34VdkpAFI2HX8D Ndew== 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=RLFKyjP117rAyI8j9vqpxACizdyhUGbM8QMFz1tkXdA=; b=TIVEAQa3FYsGudoKdL+EY0E3A4tZDR56S1h3a3cpJBPhd5mq5Bjevi4hksgwlo3v3A zXuHSNUksqw259mMq6UJ5hk33MlKMYeJL3rnFZovmiwebcXJ7m2RMEBcDKzUc+fSyexM +M/S4l87Km7igbRf/xeCcWheCtStPUY5WYHpm/qrYLola2CW52rKEKgyHM+pvMGh0LHG pA2aDYKDiDdVK6Kyj/OIRGkGy+BMD25rD/ms80W9Nfle8CVmsn5/3VRtjkVJf0sjD+GI QBuDULgEpy0bsYZWvR2/qFzu4plHeLtUIv901/OFk69XlznIF6QrPmV6nuOkOJTguDB1 OTcQ== X-Gm-Message-State: AOAM5330ukNQMhhB/DAIue4myoh2QpqF75c4uwkq16hbLsvZveVY/61f 7Nw7w04sD8iakA07/u2W0g94ufLyDsHgYQ== X-Google-Smtp-Source: ABdhPJwxr/vr9rL3Uu0+/4P3hWP6x6zx4GRz6RVP2ui2u8Q0I+UzP7JgSPZpynYNGKOrrcRvMvyg5w== X-Received: by 2002:a92:cb51:: with SMTP id f17mr33452645ilq.119.1620839853728; Wed, 12 May 2021 10:17:33 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 06/20] bsd-user: style tweak: move extern to header file Date: Wed, 12 May 2021 11:17:06 -0600 Message-Id: <20210512171720.46744-7-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::134; envelope-from=imp@bsdimp.com; helo=mail-il1-x134.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" extern char **environ has no standard home, so move the declaration from th= e .c file to a handy .h file. Since this is a standard, old-school UNIX interface dating from the 5th edition, it's not quite the same issue that the rule is supposed to protect against, though. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/main.c | 1 - bsd-user/qemu.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index cd1c26516b..71bfe17f38 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -47,7 +47,6 @@ unsigned long reserved_va; =20 static const char *interp_prefix =3D CONFIG_QEMU_INTERP_PREFIX; const char *qemu_uname_release; -extern char **environ; enum BSDType bsd_type; =20 /* diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 7ccc8ad397..5a82722281 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -27,6 +27,8 @@ =20 #include "exec/user/abitypes.h" =20 +extern char **environ; + enum BSDType { target_freebsd, target_netbsd, --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840366; cv=none; d=zohomail.com; s=zohoarc; b=Qo1l/wOMDRjXFr6AZJvtByS2yKQ6icmqsrKPikvq6tf+OyNe8Cjek69pgvwQ3QE3/HygHTlQDxTwgkPtXiLfilHDG0mFYAybFRxi5PY/2iD4ekejMi8lNMcUDas2LUZVfe2hLxWaD+rDFFeoAESwU5+SRFGa58XCdfr8/1qr08c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840366; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WmsTH6YeQ6QLzMbKIKIH647DYkY/XXINReCjYAIywDM=; b=DlhlGdKyyY965Qm8dm7zNgPbF4Mr1ICqwngzJFMECrWG2LIBnGtDRa9wsOghh/EJ1b750/2tjoN8fsxZE1P+nlEopeqIVeckI5m/Exjx11wFbDjstcZLhVnnCJtFwpEMlDDeRHGRwLkijtYkHc243z5WpPd/0JIQIBGWPBhOHsY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840366766829.8134179543258; Wed, 12 May 2021 10:26:06 -0700 (PDT) Received: from localhost ([::1]:43300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgscX-00035H-QD for importer@patchew.org; Wed, 12 May 2021 13:26:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUV-00078Z-LU for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:50 -0400 Received: from mail-il1-x12f.google.com ([2607:f8b0:4864:20::12f]:33612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUK-0008Kd-7J for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:46 -0400 Received: by mail-il1-x12f.google.com with SMTP id z1so12940234ils.0 for ; Wed, 12 May 2021 10:17:35 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WmsTH6YeQ6QLzMbKIKIH647DYkY/XXINReCjYAIywDM=; b=jU3N8HXLumCmcQJcucuEP6FEeIvJRgqxz6Ls1NAEPChtmnegIxgkEdZM4d714oUGiG Ee0h5ni5rInlum90ZNBhJZcYww9KW3ikxpwzF6cpDRPMEO/t4GeaHGr5x/erU0BgV50z 8BjIVQaxTnx0azPiZXkkCWNGH2r2uDmrEWfDVWPFo3iqWmePsuqkq7wkYmpDltfXYtXY FzfonS+ig7GNN0tm2VZouLGdXBfcbYnsHDfq1+KvBCtyVyLox2AoLULhYDCESnTSzuNw Wv065Wp+dw4wrYNiWZEyd9d0ROfgNKnM86u5txw6Pg3Q8Ls6P1cM2oOzAqwJ+HuGryGB GkBQ== 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=WmsTH6YeQ6QLzMbKIKIH647DYkY/XXINReCjYAIywDM=; b=Dh9oSiPGYSBiFvIhiiGHAiLYmWKpGvI183nHbiuT6QTsrudEAQjB1zsWmCuvgP/NqA 6rPCfIPYTM3eJeObU9pdcoOn4qx7hZTjbVaP+8X+i+S0oWraJ4jXCOIyxM54Nv1NkuKo 5iA2E5xagBimd0SHnXAMu4hACQJn88jQ3bvVgCVD53930oZlpuwTtSlshWLQDN7ef3gs 4TovTuF8jyO1eau76/3aNuYfK43W6h8u0ahtJKBoJmLWf9i8GID7SUORTHwP7IMwhH0B 3wSflT65WDx1+QcQ/2V+nRjOupdShF7ppQq1vJudB5ZJWbMqN58V0MgTbQ3A2JtJlLpn OJmQ== X-Gm-Message-State: AOAM531EXXfCPS7DzLQGPMcvLsqNzUS2TcdGFS+OkB9z+LZc6EYST+we Eg//62dmk1hgXHMjzF+Mj8Asah1nf++REA== X-Google-Smtp-Source: ABdhPJwWcJwMg/AgiQHUyGybyBsSBVX/TLf3zzBVlriVeQlzYuoju9phDJG2Xbu+oGQ/TWHCytTFvA== X-Received: by 2002:a05:6e02:1a4b:: with SMTP id u11mr31905409ilv.258.1620839854501; Wed, 12 May 2021 10:17:34 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 07/20] bsd-user: style tweak: remove spacing after '*' and add after } Date: Wed, 12 May 2021 11:17:07 -0600 Message-Id: <20210512171720.46744-8-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::12f; envelope-from=imp@bsdimp.com; helo=mail-il1-x12f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/qemu.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 5a82722281..de20e8329a 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -124,19 +124,19 @@ struct linux_binprm { int argc, envc; char **argv; char **envp; - char * filename; /* Name of binary */ + char *filename; /* Name of binary */ }; =20 void do_init_thread(struct target_pt_regs *regs, struct image_info *infop); abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, abi_ulong stringp, int push_ptr); -int loader_exec(const char * filename, char ** argv, char ** envp, - struct target_pt_regs * regs, struct image_info *infop); +int loader_exec(const char *filename, char **argv, char **envp, + struct target_pt_regs *regs, struct image_info *infop); =20 -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * re= gs, - struct image_info * info); -int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * re= gs, - struct image_info * info); +int load_elf_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, + struct image_info *info); +int load_flt_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, + struct image_info *info); =20 abi_long memcpy_to_target(abi_ulong dest, const void *src, unsigned long len); @@ -246,7 +246,7 @@ static inline bool access_ok(int type, abi_ulong addr, = abi_ulong size) break;\ default:\ abort();\ - }\ + } \ 0;\ }) =20 @@ -270,7 +270,7 @@ static inline bool access_ok(int type, abi_ulong addr, = abi_ulong size) /* avoid warning */\ x =3D 0;\ abort();\ - }\ + } \ 0;\ }) =20 --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840513; cv=none; d=zohomail.com; s=zohoarc; b=MHWKR2XtBZrHncimjmKYn53PFlLw6/UymWyXh/SNoYsXjjc6IpjE3vzz4v82IGWawNLltR1IkkZpunaplSBhxmgCrtYU8JXfbViWbYkKuoWqNAFwobhboz82QkCefB5qIV0Dd9Ip+LmwxvVtQ/Et0g1TWMVhhk272oIK5zf7Ucc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840513; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7de1xvZKJV26s2gK35p2nMpLWmhXyXEYmpwBscRAUbI=; b=G28J14UBUCB0/LrewdMVZgNuxBMhO50AEMroXEAxjUMg28B02i9cqnM3ME8aHJDngNNzgOIHt3kN8aw3m1k0QHCyz1U1jBOgpI+JmAdvEpT7ijnk7Anp2Q0UeQQgBMtqvjGM2L8luB5JLI0KKLDG15jg8DJcjpVWbut6PsoOit4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840513602651.4068652926377; Wed, 12 May 2021 10:28:33 -0700 (PDT) Received: from localhost ([::1]:51886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgseu-0000dm-El for importer@patchew.org; Wed, 12 May 2021 13:28:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUZ-00079K-2a for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:52 -0400 Received: from mail-io1-xd33.google.com ([2607:f8b0:4864:20::d33]:38528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUM-0008Kr-3O for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:49 -0400 Received: by mail-io1-xd33.google.com with SMTP id d11so1861208iod.5 for ; Wed, 12 May 2021 10:17:36 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7de1xvZKJV26s2gK35p2nMpLWmhXyXEYmpwBscRAUbI=; b=P6Lq/q/Pf/s9Ch9fTQZt9ypuDbyXRQszPkkFjbi+4aEvyfMAcHXUhjFKKz/Q9G/dhW LYnJoz05Lxi1QQV6cXAt/3NdV35IS60OW3XQK9IkZGa0jbuQkEoYIFabABtEs2b0Ig5W +jxNG8gB+kHlBCj73Vy5VqimqaPG4aAotHlDmoBmJjRobxhFpJJBtKMYnASdxMD+i5uz n4DTlHnvw2fNXX0pa7YHCFx7Bdxmu3Cf2k1CDPxpk3hvgIV52blORSdXl2GRSmvMO07Q MdDwMkvq1XCt4b4o4n80IR8otA2WG9up/ZrMzLbojxt9aQS3N9yC45zt3q871SZ+Rw5y NcEw== 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=7de1xvZKJV26s2gK35p2nMpLWmhXyXEYmpwBscRAUbI=; b=rQG2oI/Me0TkZ7zIkUdWmmCYt00+7FOF8UVOpRfwJvGjT+LcT+Ub8APVPJpSjzXQZU LNbLEdMmdOeVvbYIFniN72XEspF8SzTWAi0sNPInuQMVKAbWh2q9Cbi3M5Dc5jnIz0lX 7mOc6mZRy9R6pIjGNSfDWjj+Ywn0l/MM8FNrsjob4dyXU8dSH7Cyj1Zxy4kqT0bYTy3+ ui/y74ODsA+qrCKroZ8mdzJIVWwdUl5ZE4kmO+fNT5FGxq3X9kxz1d5lr7SM4UM6w1uj ihFMrZWT5sMxRNN4qxD0rXMM/NRDS+UaxruzM8QeHYBMDhDX7GgKcmH4tPCa3DMri6zF OB1A== X-Gm-Message-State: AOAM5334Ylew2M62hK2N3daHlhlSbLUM4AhyxVmdnHBIJ0seaCRJrUFA Kg6ZxyLbCagbsez5CWjiDAtvsi6WoImCjQ== X-Google-Smtp-Source: ABdhPJwq1nhlR4efP8/ZSOrtJ2ibex98nFWcMFV8Ho7Ls+6XblyqdEGwUo/Vru8SLfVkzDkUUs4JSQ== X-Received: by 2002:a5e:880b:: with SMTP id l11mr27040990ioj.42.1620839855479; Wed, 12 May 2021 10:17:35 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 08/20] bsd-user: style tweak: Use preferred block comments Date: Wed, 12 May 2021 11:17:08 -0600 Message-Id: <20210512171720.46744-9-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d33; envelope-from=imp@bsdimp.com; helo=mail-io1-xd33.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/qemu.h | 74 ++++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index de20e8329a..7f3cfa68aa 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -47,9 +47,10 @@ extern enum BSDType bsd_type; #define THREAD #endif =20 -/* This struct is used to hold certain information about the image. - * Basically, it replicates in user space what would be certain - * task_struct fields in the kernel +/* + * This struct is used to hold certain information about the image. Basic= ally, + * it replicates in user space what would be certain task_struct fields in= the + * kernel */ struct image_info { abi_ulong load_addr; @@ -78,12 +79,13 @@ struct sigqueue { struct emulated_sigtable { int pending; /* true if signal is pending */ struct sigqueue *first; - struct sigqueue info; /* in order to always have memory for the - first signal, we put it here */ + /* in order to always have memory for the first signal, we put it here= */ + struct sigqueue info; }; =20 -/* NOTE: we force a big alignment so that the stack stored after is - aligned too */ +/* + * NOTE: we force a big alignment so that the stack stored after is aligne= d too + */ typedef struct TaskState { pid_t ts_tid; /* tid (or pid) of this task */ =20 @@ -103,7 +105,6 @@ void init_task_state(TaskState *ts); extern const char *qemu_uname_release; extern unsigned long mmap_min_addr; =20 -/* ??? See if we can avoid exposing so much of the loader internals. */ /* * MAX_ARG_PAGES defines the number of pages allocated for arguments * and envelope for the new program. 32 should suffice, this gives @@ -224,9 +225,11 @@ static inline bool access_ok(int type, abi_ulong addr,= abi_ulong size) return page_check_range((target_ulong)addr, size, type) =3D=3D 0; } =20 -/* NOTE __get_user and __put_user use host pointers and don't check access= . */ -/* These are usually used to access struct data members once the - * struct has been locked - usually with lock_user_struct(). +/* + * NOTE __get_user and __put_user use host pointers and don't check access. + * + * These are usually used to access struct data members once the struct ha= s been + * locked - usually with lock_user_struct(). */ #define __put_user(x, hptr)\ ({\ @@ -267,17 +270,18 @@ static inline bool access_ok(int type, abi_ulong addr= , abi_ulong size) x =3D (typeof(*hptr))tswap64(*(uint64_t *)(hptr));\ break;\ default:\ - /* avoid warning */\ x =3D 0;\ abort();\ } \ 0;\ }) =20 -/* put_user()/get_user() take a guest address and check access */ -/* These are usually used to access an atomic data type, such as an int, - * that has been passed by address. These internally perform locking - * and unlocking on the data type. +/* + * put_user()/get_user() take a guest address and check access + * + * These are usually used to access an atomic data type, such as an int, t= hat + * has been passed by address. These internally perform locking and unloc= king + * on the data type. */ #define put_user(x, gaddr, target_type) \ ({ \ @@ -301,7 +305,6 @@ static inline bool access_ok(int type, abi_ulong addr, = abi_ulong size) __ret =3D __get_user((x), __hptr); \ unlock_user(__hptr, __gaddr, 0); \ } else { \ - /* avoid warning */ \ (x) =3D 0; \ __ret =3D -TARGET_EFAULT; \ } \ @@ -330,22 +333,28 @@ static inline bool access_ok(int type, abi_ulong addr= , abi_ulong size) #define get_user_u8(x, gaddr) get_user((x), (gaddr), uint8_t) #define get_user_s8(x, gaddr) get_user((x), (gaddr), int8_t) =20 -/* copy_from_user() and copy_to_user() are usually used to copy data +/* + * copy_from_user() and copy_to_user() are usually used to copy data * buffers between the target and host. These internally perform * locking/unlocking of the memory. */ abi_long copy_from_user(void *hptr, abi_ulong gaddr, size_t len); abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len); =20 -/* Functions for accessing guest memory. The tget and tput functions - read/write single values, byteswapping as necessary. The lock_user fun= ction - gets a pointer to a contiguous area of guest memory, but does not perfo= rm - any byteswapping. lock_user may return either a pointer to the guest - memory, or a temporary buffer. */ +/* + * Functions for accessing guest memory. The tget and tput functions + * read/write single values, byteswapping as necessary. The lock_user fun= ction + * gets a pointer to a contiguous area of guest memory, but does not perfo= rm + * any byteswapping. lock_user may return either a pointer to the guest + * memory, or a temporary buffer. + */ =20 -/* Lock an area of guest memory into the host. If copy is true then the - host area will have the same contents as the guest. */ -static inline void *lock_user(int type, abi_ulong guest_addr, long len, in= t copy) +/* + * Lock an area of guest memory into the host. If copy is true then the + * host area will have the same contents as the guest. + */ +static inline void *lock_user(int type, abi_ulong guest_addr, long len, + int copy) { if (!access_ok(type, guest_addr, len)) return NULL; @@ -364,9 +373,10 @@ static inline void *lock_user(int type, abi_ulong gues= t_addr, long len, int copy #endif } =20 -/* Unlock an area of guest memory. The first LEN bytes must be - flushed back to guest memory. host_ptr =3D NULL is explicitly - allowed and does nothing. */ +/* + * Unlock an area of guest memory. The first LEN bytes must be flushed ba= ck to + * guest memory. host_ptr =3D NULL is explicitly allowed and does nothing. + */ static inline void unlock_user(void *host_ptr, abi_ulong guest_addr, long len) { @@ -382,8 +392,10 @@ static inline void unlock_user(void *host_ptr, abi_ulo= ng guest_addr, #endif } =20 -/* Return the length of a string in target memory or -TARGET_EFAULT if - access error. */ +/* + * Return the length of a string in target memory or -TARGET_EFAULT if acc= ess + * error. + */ abi_long target_strlen(abi_ulong gaddr); =20 /* Like lock_user but for null terminated strings. */ --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620839986; cv=none; d=zohomail.com; s=zohoarc; b=THC7mpZ5q9oCV1xOfqD6WKKml/5TK51nxAcMEtVYc9i/Of9FeGpBPPx+yYJnkk9Ja+5zTD5u2rRgmQOhBafgEb1DUKj66xqyQ/XHsPXNNpYE3ylCVprteIc7g7g+afLbLftITP0mdUv9JZpbs8gsX+ucPdNlvkqbRB09wPMy+Q8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620839986; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yWXUyWETpLT8cYtiPoj8jXWwE01ysUMsOZKweL2JKVo=; b=NP/LmvTXtJ/89jlJxQ3bvlhMSIh9IXXU+ftGqJubE2lmfLRv1bnqCbzkOQYEOp7dtswOE0cM6LTLtYx7fC4yUE2zmp/PI8lUIVs0qxrxFa1H3poa9j6hn9YAYgOUOg6yhRXsHO5znxmrPMNdkEPHVu6eZYEFXJA7x3QAYckMbvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620839985945962.1010941269867; Wed, 12 May 2021 10:19:45 -0700 (PDT) Received: from localhost ([::1]:58108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsWO-0001iY-7O for importer@patchew.org; Wed, 12 May 2021 13:19:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUZ-00079M-36 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:52 -0400 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]:43645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUM-0008L6-3f for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:49 -0400 Received: by mail-il1-x130.google.com with SMTP id j20so20760919ilo.10 for ; Wed, 12 May 2021 10:17:37 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yWXUyWETpLT8cYtiPoj8jXWwE01ysUMsOZKweL2JKVo=; b=MQol5lSN6Z3knNoh4WyVmdV12HQxnhfEt7L2JUcrp6Ev2sEZHbgsPq7c0zZ4TnC+GA lULL4Ca6xi7H2MMtLAizEdHGdCNvdCd/tCAth2ywNLw0HB0+BMjGNeIcI4OIBsf66NrO yicVjWonIBqx/6ygV6P9uvsCexq4YcodLOciKIukp+FwrPPTHXKyXTm+yHE+oy9FAyqR B2QVFLWmo/coOoAlkiAZi3+r99VozxLgD3W6HeUdgcr1yaoXYyRYDnYS++IDCwgzR9Ta W3Rin3NF/wezyonF+EcL7b5+0S9ng8MkPgXEs2T182rG9Gkql5BFg8YmMCzJBYyN1WyO u5JA== 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=yWXUyWETpLT8cYtiPoj8jXWwE01ysUMsOZKweL2JKVo=; b=EC0TpIJfd4LFCgxUBWL33KPZReAw6VDp17SEPCLtAgm7aobDRw5TuCHxgmMDHyU+jS wlPcFy5M0iicHJrMWl7VBaL/E1FYjT5NSg3QbDAXyfffw5FCoIFLDC8tOV2S62epr313 nMOPr7UF8VrQWNOU+O9p9KRHDe0gvfPGyA4nYm/yD5bdJfIZtRkk2OyUChSY3RShwOcM vVkYPJDdfCAH5VDy0/jiQgttmoGrI2UotnC+Gu20T9GgwV190ugElAFkVDrIiNER5LKp KIbjpA0i4lX6cY2uMSa9jTQOGLeTYt2jER01iZVz+zU8PzmqDNwNziDBYO/2UB4TSET5 g47w== X-Gm-Message-State: AOAM533gbxh2Xoc8XLDh+OoRLjJ3Ediuhoh/esFA8JVvFFgWdaiFr8+P dOVvloqkyGyw+N0Lv4myna71eZ0HGvVA1Q== X-Google-Smtp-Source: ABdhPJy6A80YbdixyN073EhSXC8Pw/Xdjwvfn6nyoNmicYpwxs9AaKQwTcIZ5v4BT/YcJyimG88z9w== X-Received: by 2002:a92:c5a5:: with SMTP id r5mr32750984ilt.122.1620839856431; Wed, 12 May 2021 10:17:36 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 09/20] bsd-user: style tweak: don't assign in if statements Date: Wed, 12 May 2021 11:17:09 -0600 Message-Id: <20210512171720.46744-10-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::130; envelope-from=imp@bsdimp.com; helo=mail-il1-x130.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/qemu.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 7f3cfa68aa..2494d9209d 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -288,7 +288,8 @@ static inline bool access_ok(int type, abi_ulong addr, = abi_ulong size) abi_ulong __gaddr =3D (gaddr); \ target_type *__hptr; \ abi_long __ret; \ - if ((__hptr =3D lock_user(VERIFY_WRITE, __gaddr, sizeof(target_type), = 0))) { \ + __hptr =3D lock_user(VERIFY_WRITE, __gaddr, sizeof(target_type), 0); \ + if (__hptr) { \ __ret =3D __put_user((x), __hptr); \ unlock_user(__hptr, __gaddr, sizeof(target_type)); \ } else \ @@ -301,7 +302,8 @@ static inline bool access_ok(int type, abi_ulong addr, = abi_ulong size) abi_ulong __gaddr =3D (gaddr); \ target_type *__hptr; \ abi_long __ret; \ - if ((__hptr =3D lock_user(VERIFY_READ, __gaddr, sizeof(target_type), 1= ))) { \ + __hptr =3D lock_user(VERIFY_READ, __gaddr, sizeof(target_type), 1); \ + if (__hptr) { \ __ret =3D __get_user((x), __hptr); \ unlock_user(__hptr, __gaddr, 0); \ } else { \ --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840514; cv=none; d=zohomail.com; s=zohoarc; b=aiWuVvm0EMbUnS1VMYaNWGJmz+93zx+ST0gBCFYLX5eFIBF0G6WZbEDT0NCDtLNsVOfJD5Yo+ljBArR3PlPK0vyyQHPaAvrQRwqisA9RCmRcUFmHf2rQH/g+DgRU1AmNkNdXJF46P4xXv7egGJNmtgfdSaZ9SO3YrZ/uYNzJXAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840514; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WRrrJ+IXY+0xCRPhFu92lFObilisjbpZec5alMTm5/0=; b=NSeAAhIjx0SHHMyG7cBDRHvhx9s6NeM1xTLZf/+rfUKaX2C/HkCtAmnZ5bTEHrMNAgDX+yGwmGGRM6Ags3zI8Sv3s0jG7yoc7hiz7DFcZJjOogMsgDli+0naIvDz7IE/UcPtX24PzwY2EDqVq3tArqnt+51WwuV/JYPWguwExr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840514167405.89615794692793; Wed, 12 May 2021 10:28:34 -0700 (PDT) Received: from localhost ([::1]:51972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsev-0000hE-54 for importer@patchew.org; Wed, 12 May 2021 13:28:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUZ-00079d-3Q for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:52 -0400 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]:46636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUO-0008LF-NK for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:50 -0400 Received: by mail-io1-xd2a.google.com with SMTP id o21so22007715iow.13 for ; Wed, 12 May 2021 10:17:38 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WRrrJ+IXY+0xCRPhFu92lFObilisjbpZec5alMTm5/0=; b=t8282PhNL3PHELD6ml7E5JcFq++kpraFuGho20K3QH4hVzjhu4vdN51Lpkn4HGXTnx +s7Y8u1AQNfOoQvDtj8wK/+EuXw85sTN9Jk8dP9VhFo/8XzKNmyR5cOXOvpAqnFsclPB 7pmyEEoddpqu/kh/4UJxOQajqgtWnZlzghPxTLfNNeynPMA1qzXv7Yp/NXOQtal8xv5K Bt9J7ySpQef+JKd6XN1W25+QfEklS7DpGNHIL0ZaGJWgXDO2fSWMrU0EzVX19Nz4Bqrd 3+rlepxcSOI88WYeXOHT2qMvOHqS2+PXnVdT7ZSzBK01Rc2YpnUdPJchUU1ClIqk5MG+ tr6w== 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=WRrrJ+IXY+0xCRPhFu92lFObilisjbpZec5alMTm5/0=; b=krnTofsoXZ9HotX6yDpAbnq1liaUh0sA3RVcXuGPRyQGjSiwua/FJodhHUi0/OYs6t NMtz8iORssg6xr81cHx5/n9mJ+g5EPMSoXCrzw88eARAsfT5LgF98lqP9Vwt309ADKLD /P3OuuC+GPoLrC8ySacl9/KSOySMxw+rJ7h1OWIfGn4DMHoeStQj0TvGxWkDV0tP4AZe 1twMaTYgE/Ltp90KNtcuZfmVlI7HGZ9EF48G76xflDfbRAb8im+0G9R8tY0xEwEsjC+o +PXxre/HS5rLNrntkLIqftggGsLQ6VcD38Nx2Xa2TsX4iGcc/QZugUtVeBtBpllC7M4w 2B9A== X-Gm-Message-State: AOAM5310b5i5yuWgMZQISCD5cOX9OSPEsDiXbBYKE4KtHDs/6+Cb0sv1 UqC53Qlt3v6dohR648gid1+LMn8BaxLZCQ== X-Google-Smtp-Source: ABdhPJy8jAopUG04ZUaQhomJlhnQ+AOZ9y80D7llRuDzyN+Z8yjVWurk18lDIrmqsQMU/6xkILqzuw== X-Received: by 2002:a5d:9619:: with SMTP id w25mr27855723iol.2.1620839857354; Wed, 12 May 2021 10:17:37 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 10/20] bsd-user: style tweak: use {} for all if statements, format else correctly Date: Wed, 12 May 2021 11:17:10 -0600 Message-Id: <20210512171720.46744-11-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d2a; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/qemu.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 2494d9209d..8d3767964d 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -358,16 +358,18 @@ abi_long copy_to_user(abi_ulong gaddr, void *hptr, si= ze_t len); static inline void *lock_user(int type, abi_ulong guest_addr, long len, int copy) { - if (!access_ok(type, guest_addr, len)) + if (!access_ok(type, guest_addr, len)) { return NULL; + } #ifdef DEBUG_REMAP { void *addr; addr =3D g_malloc(len); - if (copy) + if (copy) { memcpy(addr, g2h_untagged(guest_addr), len); - else + } else { memset(addr, 0, len); + } return addr; } #else @@ -384,12 +386,15 @@ static inline void unlock_user(void *host_ptr, abi_ul= ong guest_addr, { =20 #ifdef DEBUG_REMAP - if (!host_ptr) + if (!host_ptr) { return; - if (host_ptr =3D=3D g2h_untagged(guest_addr)) + } + if (host_ptr =3D=3D g2h_untagged(guest_addr)) { return; - if (len > 0) + } + if (len > 0) { memcpy(g2h_untagged(guest_addr), host_ptr, len); + } g_free(host_ptr); #endif } @@ -405,8 +410,9 @@ static inline void *lock_user_string(abi_ulong guest_ad= dr) { abi_long len; len =3D target_strlen(guest_addr); - if (len < 0) + if (len < 0) { return NULL; + } return lock_user(VERIFY_READ, guest_addr, (long)(len + 1), 1); } =20 --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840761; cv=none; d=zohomail.com; s=zohoarc; b=gdbf5LT5W/rVp/fEieLws4FcpnrrtbrTZBM1zKY+qnGYpaExD3ubmjITLVri78hppTy4F92/Y+nN2f5xCJLEERZWQOd7mLn/1s0eSE1s0D6n5UPF/VF353nuzo3W5ovM/G85KSiYlsjt3cXNXuNcinT1nNICv+rUcdHzxzTdje0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840761; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PTBbSYYJVsByI4TeGnQsbvTNd/mEb0R8DgVhE9PirYU=; b=EGaMjrHCxXA+wKZsHl3CqMux7tq0au7amnA6Au7H7A6oVzpzotag8Cjq9eKf9DXPo74Oi6jcHao4bMqOY55OrLSH0fySHRzNYh9c7hNGytaZmBXk3+bfyuJovWCy9ruKwqZIFWjAEsjh0RTJX0O0mjaFyR/993MFsQbH+p6IqfE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840761045465.85505669616714; Wed, 12 May 2021 10:32:41 -0700 (PDT) Received: from localhost ([::1]:60488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsit-0006b5-Gs for importer@patchew.org; Wed, 12 May 2021 13:32:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUe-0007EW-Ee for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:56 -0400 Received: from mail-io1-xd31.google.com ([2607:f8b0:4864:20::d31]:37733) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUO-0008LQ-Nb for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:56 -0400 Received: by mail-io1-xd31.google.com with SMTP id n40so6642185ioz.4 for ; Wed, 12 May 2021 10:17:39 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PTBbSYYJVsByI4TeGnQsbvTNd/mEb0R8DgVhE9PirYU=; b=VyInb+1E24mve4YBnCFEddWG4iil4YY3i4IhPP3HkUWBK2T8pGAEVFSUfFX4luBPYM yJpzVPX8mTtMJF8NeKCPmOPT5gcOE8HWTlYKzMtsi4fv7rTVRTnNS6ATntzv6wMWPny4 ra2mRQjQPfnmrHd2jWqxiAKyESoZuT5MNcAmWiJrU7lBNYTGhcwJe/yFgVN/IaJIOkKV 9BOjAbmAYiGiGoBpFfQYAUaXyJkK+ji2Hq2WFBqm3WL9406x3w4XEn/2FTXxy5nLWrG9 KE3AELgVdO0kt0XU1zJItjVyfV225VxOxgChmH5lygopt9sr0EfMLwWFeDPevRHnzOT5 o2NQ== 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=PTBbSYYJVsByI4TeGnQsbvTNd/mEb0R8DgVhE9PirYU=; b=opJ8mqTsEu0v6QwnB07V9dlh+lWMRYj6pxR1aTv8s9SNa4pKn3DbUURLiuBQPa9IhF 3LMfzkI9VeT1tiRLukD8UO5+yexTRUa2dKqcu5ApWgsWrff6nEA0sEVdjsrr/1U1McWP wllDAyyBc0k6RCGLjxqdCL4qklc/sEpUHsV+XN5ycAPTBLYJcVvJECaxrPshXkjjBD8b 8CsuXfk4dpXGPO+NUpUp3Qi7giqfbrwDH24Z2ne2BhhTG8/BP+EgSMDOdON1LcqAEpwN Xrj45+Nnyt5sIeH3ORoaRy9ErNYweD4IBDc+PGF5oUtYs+Hof3g2J5HACli9HNsXgntC 1Rxw== X-Gm-Message-State: AOAM532xkI0GelMmKrULuhwOfCeDYNmbZbWBhE09hm7CaizCBMus4Jgd E8jx8VNXMr67KozDvi6I3+Wh/vl7Zm4hxA== X-Google-Smtp-Source: ABdhPJwrWtFRX0o39HdcSFCeATA2ix7g5Yct5XGMSCJ0+u5O0NuzDNka8dZakP/k7Y83fi+ODO88JQ== X-Received: by 2002:a05:6602:14d3:: with SMTP id b19mr19779112iow.154.1620839858160; Wed, 12 May 2021 10:17:38 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 11/20] bsd-user: style tweak: use {} consistently in for / if / else statements Date: Wed, 12 May 2021 11:17:11 -0600 Message-Id: <20210512171720.46744-12-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d31; envelope-from=imp@bsdimp.com; helo=mail-io1-xd31.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Fix various issues with {} not being present on if / for statements. Minor line length tweaks Move an assignment in an if out. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/main.c | 66 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 71bfe17f38..0f9e6bfbc0 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -217,7 +217,7 @@ void cpu_loop(CPUX86State *env) #ifndef TARGET_ABI32 case EXCP_SYSCALL: /* syscall from syscall instruction */ - if (bsd_type =3D=3D target_freebsd) + if (bsd_type =3D=3D target_freebsd) { env->regs[R_EAX] =3D do_freebsd_syscall(env, env->regs[R_EAX], env->regs[R_EDI], @@ -226,7 +226,7 @@ void cpu_loop(CPUX86State *env) env->regs[R_ECX], env->regs[8], env->regs[9], 0, 0); - else { /* if (bsd_type =3D=3D target_openbsd) */ + } else { /* if (bsd_type =3D=3D target_openbsd) */ env->regs[R_EAX] =3D do_openbsd_syscall(env, env->regs[R_EAX], env->regs[R_EDI], @@ -250,7 +250,8 @@ void cpu_loop(CPUX86State *env) break; default: pc =3D env->segs[R_CS].base + env->eip; - fprintf(stderr, "qemu: 0x%08lx: unhandled CPU exception 0x%x -= aborting\n", + fprintf(stderr, + "qemu: 0x%08lx: unhandled CPU exception 0x%x - abortin= g\n", (long)pc, trapnr); abort(); } @@ -274,8 +275,9 @@ static inline int get_reg_index(CPUSPARCState *env, int= cwp, int index) * wrap handling : if cwp is on the last window, then we use the * registers 'after' the end */ - if (index < 8 && env->cwp =3D=3D env->nwindows - 1) + if (index < 8 && env->cwp =3D=3D env->nwindows - 1) { index +=3D 16 * env->nwindows; + } return index; } =20 @@ -287,8 +289,9 @@ static inline void save_window_offset(CPUSPARCState *en= v, int cwp1) =20 sp_ptr =3D env->regbase[get_reg_index(env, cwp1, 6)]; #ifdef TARGET_SPARC64 - if (sp_ptr & 3) + if (sp_ptr & 3) { sp_ptr +=3D SPARC64_STACK_BIAS; + } #endif #if defined(DEBUG_WIN) printf("win_overflow: sp_ptr=3D0x" TARGET_ABI_FMT_lx " save_cwp=3D%d\n= ", @@ -337,8 +340,9 @@ static void restore_window(CPUSPARCState *env) cwp1 =3D cpu_cwp_inc(env, env->cwp + 1); sp_ptr =3D env->regbase[get_reg_index(env, cwp1, 6)]; #ifdef TARGET_SPARC64 - if (sp_ptr & 3) + if (sp_ptr & 3) { sp_ptr +=3D SPARC64_STACK_BIAS; + } #endif #if defined(DEBUG_WIN) printf("win_underflow: sp_ptr=3D0x" TARGET_ABI_FMT_lx " load_cwp=3D%d\= n", @@ -351,8 +355,9 @@ static void restore_window(CPUSPARCState *env) } #ifdef TARGET_SPARC64 env->canrestore++; - if (env->cleanwin < env->nwindows - 1) + if (env->cleanwin < env->nwindows - 1) { env->cleanwin++; + } env->cansave--; #else env->wim =3D new_wim; @@ -368,11 +373,13 @@ static void flush_windows(CPUSPARCState *env) /* if restore would invoke restore_window(), then we can stop */ cwp1 =3D cpu_cwp_inc(env, env->cwp + offset); #ifndef TARGET_SPARC64 - if (env->wim & (1 << cwp1)) + if (env->wim & (1 << cwp1)) { break; + } #else - if (env->canrestore =3D=3D 0) + if (env->canrestore =3D=3D 0) { break; + } env->cansave++; env->canrestore--; #endif @@ -407,8 +414,9 @@ void cpu_loop(CPUSPARCState *env) #else /* FreeBSD uses 0x141 for syscalls too */ case 0x141: - if (bsd_type !=3D target_freebsd) + if (bsd_type !=3D target_freebsd) { goto badtrap; + } /* fallthrough */ case 0x100: #endif @@ -417,7 +425,8 @@ void cpu_loop(CPUSPARCState *env) ret =3D do_freebsd_syscall(env, syscall_nr, env->regwptr[0], env->regwptr[1], env->regwptr[2], env->regwptr[3], - env->regwptr[4], env->regwptr[5],= 0, 0); + env->regwptr[4], env->regwptr[5], + 0, 0); else if (bsd_type =3D=3D target_netbsd) ret =3D do_netbsd_syscall(env, syscall_nr, env->regwptr[0], env->regwptr[1], @@ -610,8 +619,9 @@ int main(int argc, char **argv) envlist_t *envlist =3D NULL; bsd_type =3D target_openbsd; =20 - if (argc <=3D 1) + if (argc <=3D 1) { usage(); + } =20 error_init(argv[0]); module_call_init(MODULE_INIT_TRACE); @@ -631,11 +641,13 @@ int main(int argc, char **argv) =20 optind =3D 1; for (;;) { - if (optind >=3D argc) + if (optind >=3D argc) { break; + } r =3D argv[optind]; - if (r[0] !=3D '-') + if (r[0] !=3D '-') { break; + } optind++; r++; if (!strcmp(r, "-")) { @@ -652,24 +664,28 @@ int main(int argc, char **argv) log_file =3D argv[optind++]; } else if (!strcmp(r, "E")) { r =3D argv[optind++]; - if (envlist_setenv(envlist, r) !=3D 0) + if (envlist_setenv(envlist, r) !=3D 0) { usage(); + } } else if (!strcmp(r, "ignore-environment")) { envlist_free(envlist); envlist =3D envlist_create(); } else if (!strcmp(r, "U")) { r =3D argv[optind++]; - if (envlist_unsetenv(envlist, r) !=3D 0) + if (envlist_unsetenv(envlist, r) !=3D 0) { usage(); + } } else if (!strcmp(r, "s")) { r =3D argv[optind++]; x86_stack_size =3D strtol(r, (char **)&r, 0); - if (x86_stack_size <=3D 0) + if (x86_stack_size <=3D 0) { usage(); - if (*r =3D=3D 'M') + } + if (*r =3D=3D 'M') { x86_stack_size *=3D MiB; - else if (*r =3D=3D 'k' || *r =3D=3D 'K') + } else if (*r =3D=3D 'k' || *r =3D=3D 'K') { x86_stack_size *=3D KiB; + } } else if (!strcmp(r, "L")) { interp_prefix =3D argv[optind++]; } else if (!strcmp(r, "p")) { @@ -809,11 +825,13 @@ int main(int argc, char **argv) if (!have_guest_base) { FILE *fp; =20 - if ((fp =3D fopen("/proc/sys/vm/mmap_min_addr", "r")) !=3D NULL) { + fp =3D fopen("/proc/sys/vm/mmap_min_addr", "r"); + if (fp !=3D NULL) { unsigned long tmp; if (fscanf(fp, "%lu", &tmp) =3D=3D 1) { mmap_min_addr =3D tmp; - qemu_log_mask(CPU_LOG_PAGE, "host mmap_min_addr=3D0x%lx\n"= , mmap_min_addr); + qemu_log_mask(CPU_LOG_PAGE, "host mmap_min_addr=3D0x%lx\n", + mmap_min_addr); } fclose(fp); } @@ -986,10 +1004,12 @@ int main(int argc, char **argv) env->pc =3D regs->pc; env->npc =3D regs->npc; env->y =3D regs->y; - for (i =3D 0; i < 8; i++) + for (i =3D 0; i < 8; i++) { env->gregs[i] =3D regs->u_regs[i]; - for (i =3D 0; i < 8; i++) + } + for (i =3D 0; i < 8; i++) { env->regwptr[i] =3D regs->u_regs[i + 8]; + } } #else #error unsupported target CPU --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840757; cv=none; d=zohomail.com; s=zohoarc; b=LZZW0xzRzYAduV6zwYhIeKNIOn2KSJGNiuVTsPcc0Upv0amdVTJr5kuDTu4vI5eGAK3Rr8babb94RKyVuf95Q9A3kguVnTszMnL8rh8LpSN0YNMX0HI8EuAyhK015JUb1qL0g3Z/7a98b8pXH0+5Cp6X0TgJeWcuhszYdBJ0tek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840757; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NZAeTzWq6yzAsdTF9f48XYP2VE7+jJHqHG4YMFKg6Bk=; b=a7J8JpradOGAfl9fF51Be03Fom+vMOiPExyfVfUdSMJdhCO5bMHM65Ku7qPdJDFnkpdCMFy1V69eFusL0yiLGvvmDYgXlmSE6uZ9u768AhTFMpvdOjEEzj8xXVg973rPWdLX8K/PXpFdAoEHVA4Wfl5Hi7gIsCKF02oNCSxFme4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840757328827.2353211923443; Wed, 12 May 2021 10:32:37 -0700 (PDT) Received: from localhost ([::1]:60480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsip-0006as-MU for importer@patchew.org; Wed, 12 May 2021 13:32:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUf-0007K5-Kx for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:57 -0400 Received: from mail-il1-x132.google.com ([2607:f8b0:4864:20::132]:42928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUR-0008LV-J9 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:57 -0400 Received: by mail-il1-x132.google.com with SMTP id s9so3526671ilp.9 for ; Wed, 12 May 2021 10:17:40 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NZAeTzWq6yzAsdTF9f48XYP2VE7+jJHqHG4YMFKg6Bk=; b=ojLqkrW3oOlf+9giqzX5ScNEMmouAcrxY5pa3xi7fhzz8IL3a/PFRX2HOsy1gfjs0w HLiaRRpBzFHeSv1wDaD3Y5Zx91LrDMal5WYyMLRl7SP7uOvzLO3vH7NAHewbZ34iQOa7 Xf13dN0+fqOoZMR0LQAuIkuy8mNpfMCgbs5m++rb4wVDU4ZEym1ErLmok73322O8dvK8 E+KUUHcmaJePseCVlt8fz/BN0uF20704R5u84AP+mtzyE2ag4slCO30HnTTLKY5qamKq C7HziKx7EG7GvSWDPNvkFv6ZRCYYX+7m3/Sh1UGfmQCWyDKruxzJDT5oH1OpvqEtqHar cwaw== 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=NZAeTzWq6yzAsdTF9f48XYP2VE7+jJHqHG4YMFKg6Bk=; b=gImVf6aJymLf3+A/5/mspVLffhAVeMs7HCCJyWoIDcirPTbJecGx/Bks0wZCqTAGdz W/OFZWdMbB04okonuy68tE6MaSLlBdcoboyJ74ruLRnQxtCwMTCfZt8l1A4rUsFuiNEK xAi47VnDllaEMqY+pwTjnsceR8BxgoEco9OfEkdzvLvZ7L+oREPHcRl/Jm9sDwgeCyH4 6iDK8jF7c8sHh1GCnxY6wwoGCpErr8CGI13oJnOkg1XmgVt1CkpfVJUYZ5HYCirljazS 0mqQ1+WN5ATA0ILmUCplAa+N2/Z/apz5+Nz+NhrGjUCmfHH0UIeXPP8HDSA0nEwPg210 T/2w== X-Gm-Message-State: AOAM532p6MiNB301Tic3/h51Uq0x2VajxnoV5tciuzaCgqfLHmFuhXzk iFSF3YiGskA1mrP0oghbmxcwS8phN9CjYw== X-Google-Smtp-Source: ABdhPJzgG5I26KwUaxvExXhqAmmhCGfE+x+7eMHLtHxCamAo81qhey5JM6CFGpF1KCusXW8fOh/tlA== X-Received: by 2002:a92:c54b:: with SMTP id a11mr17975094ilj.174.1620839859133; Wed, 12 May 2021 10:17:39 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 12/20] bsd-user: use qemu_strtoul in preference to strtol Date: Wed, 12 May 2021 11:17:12 -0600 Message-Id: <20210512171720.46744-13-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::132; envelope-from=imp@bsdimp.com; helo=mail-il1-x132.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 0f9e6bfbc0..18f806b032 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -36,6 +36,7 @@ #include "tcg/tcg.h" #include "qemu/timer.h" #include "qemu/envlist.h" +#include "qemu/cutils.h" #include "exec/log.h" #include "trace/control.h" =20 @@ -612,7 +613,7 @@ int main(int argc, char **argv) TaskState ts1, *ts =3D &ts1; CPUArchState *env; CPUState *cpu; - int optind; + int optind, rv; const char *r; const char *gdbstub =3D NULL; char **target_environ, **wrk; @@ -677,8 +678,8 @@ int main(int argc, char **argv) } } else if (!strcmp(r, "s")) { r =3D argv[optind++]; - x86_stack_size =3D strtol(r, (char **)&r, 0); - if (x86_stack_size <=3D 0) { + rv =3D qemu_strtoul(r, &r, 0, &x86_stack_size); + if (rv < 0 || x86_stack_size <=3D 0) { usage(); } if (*r =3D=3D 'M') { @@ -709,7 +710,10 @@ int main(int argc, char **argv) exit(1); } } else if (!strcmp(r, "B")) { - guest_base =3D strtol(argv[optind++], NULL, 0); + rv =3D qemu_strtoul(argv[optind++], NULL, 0, &guest_base); + if (rv < 0) { + usage(); + } have_guest_base =3D true; } else if (!strcmp(r, "drop-ld-preload")) { (void) envlist_unsetenv(envlist, "LD_PRELOAD"); --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620841055; cv=none; d=zohomail.com; s=zohoarc; b=C8f+lx2Lahw0Bt30Vk8GGcJ4XuPN8KaoyF0mRuyMqY60kKdHk7aKzRDfhSf6g97eZpMJrHrG9Gb3/zqNUkx4a1vQNT0/YACr1sVqczDzVs7+Rnz4b22QyHn6YO4hnpZ5TK1qS7VLIZIa3lKOJ1ajHK+Bmov4pDgOCKAaDZCBp9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620841055; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GpE3wC45Fnc/dgkusbMwlLDMFZnri/Qx3jjP89BaThI=; b=DSlW84ax8G11gEK6vkDjyy679mwQIxg+xhWjzn++397xKNajQ01Y5wtjhYvJydGsFDLmhDkEtgi+Nie/Pq/sssxw1/acWYvd2Dw4L/+DRaNgvBIwgzfHIedG5yUT7DhwRP0l/NGHeNx4JxioH2soDnoYAG4ksh8vN4+/R/rSxB0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620841055775651.3272982397016; Wed, 12 May 2021 10:37:35 -0700 (PDT) Received: from localhost ([::1]:49210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsne-0001Bj-Id for importer@patchew.org; Wed, 12 May 2021 13:37:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUe-0007Df-5t for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:56 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]:33615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUR-0008Ld-Kt for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:55 -0400 Received: by mail-il1-x131.google.com with SMTP id z1so12940482ils.0 for ; Wed, 12 May 2021 10:17:41 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GpE3wC45Fnc/dgkusbMwlLDMFZnri/Qx3jjP89BaThI=; b=fHoC+GPYTW6uSbPHkfCZJh4DrP3k3vOJ7MxAZkdUXGHbMutWyBb5KViVMn/C8S8sKz it8F14Tspo2d19F5h0QSOjo2YHMrXTitKGG/9dM8HgOI7GtS60dOcUg9PrKGmx7WtJiJ r3adCLc6oUVLJMYq5psB4ikdzz6zlh/y95rZJqxHTqboAvkZ07pShwSlOmen0+FQTvtC QfF+Ldk581GLST3rNEt5FfrscXcN5yHX1esyCEv0SBRT9WUEbeng942omVBuZDMjdUty LYP6C08iQLdRUX+J4RSNXo+eHniq+5a6ataElDbCko5DE8lKWpfRCWLQjn5EcyIbQihO ryhQ== 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=GpE3wC45Fnc/dgkusbMwlLDMFZnri/Qx3jjP89BaThI=; b=Ky6xDlB/Yrdweertje+DCZvXnk7BQzr5OOiZIgQZY3UGNrESEw578ezzQ7vnh6iXnW w+1JBwbMJ2xa/cqO/OlnJfIEK1lIVeV+WGwgWeSQRuW7WzmnLKJxejUxvHtffgixLe+R aDhDz3JRgSXHWCDCwAh/Sj/qzScGN3KIH//lnEboN+g4ExFMRenzwDuwnwo+ua3Hiria YY8S5xJ2FUKW4A3Niygv35T4/ACSciu8VNkPO0AyNJw3/KhHlusw0/+L4eOwHeKjzdPJ bbU1KX02M8Oxj2s3PnjWKVqEvYkPbnTi44zLC9FfvymEFvqO2Oo2AI8khFAS6wtjnAc/ Wg4A== X-Gm-Message-State: AOAM532XqsSk3vNt809UfFQSVEu+mllEpVXwLMFuuAFHdKiK+iuUFyC4 5nIPG5FfUbB5ubJqqnZ+Q0nue2NmB+5J8g== X-Google-Smtp-Source: ABdhPJymImrkSyrazAwFe1+9Z+Mz/d3fWRAo6e7lfRps5GQ40C0+fjVPwx6e1h351uW+BmMrmCF3tA== X-Received: by 2002:a05:6e02:1708:: with SMTP id u8mr33300223ill.188.1620839860077; Wed, 12 May 2021 10:17:40 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 13/20] bsd-user: whitespace changes Date: Wed, 12 May 2021 11:17:13 -0600 Message-Id: <20210512171720.46744-14-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::131; envelope-from=imp@bsdimp.com; helo=mail-il1-x131.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Fix various whitespace-only issues from checkpatch: keyword space ( no space before ( on function calls spaces around operators suspect indentations (including one functions reindented) extra spaces around unary operators Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/elfload.c | 326 ++++++++++++++++++++++----------------------- 1 file changed, 163 insertions(+), 163 deletions(-) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 5f4d824d78..3c9d8c2845 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -111,7 +111,7 @@ static uint32_t get_elf_hwcap(void) =20 #ifdef TARGET_X86_64 #define ELF_START_MMAP 0x2aaaaab000ULL -#define elf_check_arch(x) ( ((x) =3D=3D ELF_ARCH) ) +#define elf_check_arch(x) (((x) =3D=3D ELF_ARCH)) =20 #define ELF_CLASS ELFCLASS64 #define ELF_DATA ELFDATA2LSB @@ -134,7 +134,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i /* * This is used to ensure we don't load something for the wrong architectu= re. */ -#define elf_check_arch(x) ( ((x) =3D=3D EM_386) || ((x) =3D=3D EM_486) ) +#define elf_check_arch(x) (((x) =3D=3D EM_386) || ((x) =3D=3D EM_486)) =20 /* * These are used to set parameters in the core dumps. @@ -168,7 +168,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i =20 #define ELF_START_MMAP 0x80000000 =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_ARM ) +#define elf_check_arch(x) ((x) =3D=3D EM_ARM) =20 #define ELF_CLASS ELFCLASS32 #ifdef TARGET_WORDS_BIGENDIAN @@ -184,7 +184,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i memset(regs, 0, sizeof(*regs)); regs->ARM_cpsr =3D 0x10; if (infop->entry & 1) - regs->ARM_cpsr |=3D CPSR_T; + regs->ARM_cpsr |=3D CPSR_T; regs->ARM_pc =3D infop->entry & 0xfffffffe; regs->ARM_sp =3D infop->start_stack; /* FIXME - what to for failure of get_user()? */ @@ -224,9 +224,9 @@ enum #define ELF_START_MMAP 0x80000000 =20 #ifndef TARGET_ABI32 -#define elf_check_arch(x) ( (x) =3D=3D EM_SPARCV9 || (x) =3D=3D EM_SPARC32= PLUS ) +#define elf_check_arch(x) ((x) =3D=3D EM_SPARCV9 || (x) =3D=3D EM_SPARC32P= LUS) #else -#define elf_check_arch(x) ( (x) =3D=3D EM_SPARC32PLUS || (x) =3D=3D EM_SPA= RC ) +#define elf_check_arch(x) ((x) =3D=3D EM_SPARC32PLUS || (x) =3D=3D EM_SPAR= C) #endif =20 #define ELF_CLASS ELFCLASS64 @@ -261,7 +261,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i #else #define ELF_START_MMAP 0x80000000 =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_SPARC ) +#define elf_check_arch(x) ((x) =3D=3D EM_SPARC) =20 #define ELF_CLASS ELFCLASS32 #define ELF_DATA ELFDATA2MSB @@ -285,13 +285,13 @@ static inline void init_thread(struct target_pt_regs = *regs, struct image_info *i =20 #if defined(TARGET_PPC64) && !defined(TARGET_ABI32) =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_PPC64 ) +#define elf_check_arch(x) ((x) =3D=3D EM_PPC64) =20 #define ELF_CLASS ELFCLASS64 =20 #else =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_PPC ) +#define elf_check_arch(x) ((x) =3D=3D EM_PPC) =20 #define ELF_CLASS ELFCLASS32 =20 @@ -376,7 +376,7 @@ static inline void init_thread(struct target_pt_regs *_= regs, struct image_info * =20 #define ELF_START_MMAP 0x80000000 =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_MIPS ) +#define elf_check_arch(x) ((x) =3D=3D EM_MIPS) =20 #ifdef TARGET_MIPS64 #define ELF_CLASS ELFCLASS64 @@ -406,7 +406,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i =20 #define ELF_START_MMAP 0x80000000 =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_SH ) +#define elf_check_arch(x) ((x) =3D=3D EM_SH) =20 #define ELF_CLASS ELFCLASS32 #define ELF_DATA ELFDATA2LSB @@ -428,7 +428,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i =20 #define ELF_START_MMAP 0x80000000 =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_CRIS ) +#define elf_check_arch(x) ((x) =3D=3D EM_CRIS) =20 #define ELF_CLASS ELFCLASS32 #define ELF_DATA ELFDATA2LSB @@ -448,7 +448,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i =20 #define ELF_START_MMAP 0x80000000 =20 -#define elf_check_arch(x) ( (x) =3D=3D EM_68K ) +#define elf_check_arch(x) ((x) =3D=3D EM_68K) =20 #define ELF_CLASS ELFCLASS32 #define ELF_DATA ELFDATA2MSB @@ -473,7 +473,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i =20 #define ELF_START_MMAP (0x30000000000ULL) =20 -#define elf_check_arch(x) ( (x) =3D=3D ELF_ARCH ) +#define elf_check_arch(x) ((x) =3D=3D ELF_ARCH) =20 #define ELF_CLASS ELFCLASS64 #define ELF_DATA ELFDATA2MSB @@ -538,8 +538,8 @@ struct exec =20 /* Necessary parameters */ #define TARGET_ELF_EXEC_PAGESIZE TARGET_PAGE_SIZE -#define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_= PAGESIZE-1)) -#define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) +#define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_= PAGESIZE - 1)) +#define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE - 1)) =20 #define INTERPRETER_NONE 0 #define INTERPRETER_AOUT 1 @@ -547,12 +547,12 @@ struct exec =20 #define DLINFO_ITEMS 12 =20 -static inline void memcpy_fromfs(void * to, const void * from, unsigned lo= ng n) +static inline void memcpy_fromfs(void *to, const void *from, unsigned long= n) { memcpy(to, from, n); } =20 -static int load_aout_interp(void * exptr, int interp_fd); +static int load_aout_interp(void *exptr, int interp_fd); =20 #ifdef BSWAP_NEEDED static void bswap_ehdr(struct elfhdr *ehdr) @@ -613,7 +613,7 @@ static void bswap_sym(struct elf_sym *sym) * to be put directly into the top of new user memory. * */ -static abi_ulong copy_elf_strings(int argc,char ** argv, void **page, +static abi_ulong copy_elf_strings(int argc, char **argv, void **page, abi_ulong p) { char *tmp, *tmp1, *pag =3D NULL; @@ -638,10 +638,10 @@ static abi_ulong copy_elf_strings(int argc,char ** ar= gv, void **page, --p; --tmp; --len; if (--offset < 0) { offset =3D p % TARGET_PAGE_SIZE; - pag =3D (char *)page[p/TARGET_PAGE_SIZE]; + pag =3D (char *)page[p / TARGET_PAGE_SIZE]; if (!pag) { pag =3D g_try_malloc0(TARGET_PAGE_SIZE); - page[p/TARGET_PAGE_SIZE] =3D pag; + page[p / TARGET_PAGE_SIZE] =3D pag; if (!pag) return 0; } @@ -672,8 +672,8 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct li= nux_binprm *bprm, * it for args, we'll use it for something else... */ size =3D x86_stack_size; - if (size < MAX_ARG_PAGES*TARGET_PAGE_SIZE) - size =3D MAX_ARG_PAGES*TARGET_PAGE_SIZE; + if (size < MAX_ARG_PAGES * TARGET_PAGE_SIZE) + size =3D MAX_ARG_PAGES * TARGET_PAGE_SIZE; error =3D target_mmap(0, size + qemu_host_page_size, PROT_READ | PROT_WRITE, @@ -686,7 +686,7 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct li= nux_binprm *bprm, /* we reserve one extra page at the top of the stack as guard */ target_mprotect(error + size, qemu_host_page_size, PROT_NONE); =20 - stack_base =3D error + size - MAX_ARG_PAGES*TARGET_PAGE_SIZE; + stack_base =3D error + size - MAX_ARG_PAGES * TARGET_PAGE_SIZE; p +=3D stack_base; =20 for (i =3D 0 ; i < MAX_ARG_PAGES ; i++) { @@ -708,7 +708,7 @@ static void set_brk(abi_ulong start, abi_ulong end) end =3D HOST_PAGE_ALIGN(end); if (end <=3D start) return; - if(target_mmap(start, end - start, + if (target_mmap(start, end - start, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED | MAP_PRIVATE | MAP_ANON, -1, 0) =3D=3D -= 1) { perror("cannot mmap brk"); @@ -738,12 +738,12 @@ static void padzero(abi_ulong elf_bss, abi_ulong last= _bss) end_addr =3D HOST_PAGE_ALIGN(elf_bss); if (end_addr1 < end_addr) { mmap((void *)g2h_untagged(end_addr1), end_addr - end_addr1, - PROT_READ|PROT_WRITE|PROT_EXEC, - MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0); + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_FIXED | MAP_PRIVATE | MAP_ANON, -1, 0); } } =20 - nbyte =3D elf_bss & (qemu_host_page_size-1); + nbyte =3D elf_bss & (qemu_host_page_size - 1); if (nbyte) { nbyte =3D qemu_host_page_size - nbyte; do { @@ -781,10 +781,10 @@ static abi_ulong create_elf_tables(abi_ulong p, int a= rgc, int envc, /* * Force 16 byte _final_ alignment here for generality. */ - sp =3D sp &~ (abi_ulong)15; + sp =3D sp & ~(abi_ulong)15; size =3D (DLINFO_ITEMS + 1) * 2; if (k_platform) - size +=3D 2; + size +=3D 2; #ifdef DLINFO_ARCH_ITEMS size +=3D DLINFO_ARCH_ITEMS * 2; #endif @@ -792,7 +792,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int arg= c, int envc, size +=3D (!ibcs ? 3 : 1); /* argc itself */ size *=3D n; if (size & 15) - sp -=3D 16 - (size & 15); + sp -=3D 16 - (size & 15); =20 /* This is correct because Linux defines * elf_addr_t as Elf32_Off / Elf64_Off @@ -800,13 +800,13 @@ static abi_ulong create_elf_tables(abi_ulong p, int a= rgc, int envc, #define NEW_AUX_ENT(id, val) do { \ sp -=3D n; put_user_ual(val, sp); \ sp -=3D n; put_user_ual(id, sp); \ - } while(0) + } while (0) =20 - NEW_AUX_ENT (AT_NULL, 0); + NEW_AUX_ENT(AT_NULL, 0); =20 /* There must be exactly DLINFO_ITEMS entries here. */ NEW_AUX_ENT(AT_PHDR, (abi_ulong)(load_addr + exec->e_phoff)); - NEW_AUX_ENT(AT_PHENT, (abi_ulong)(sizeof (struct elf_phdr))); + NEW_AUX_ENT(AT_PHENT, (abi_ulong)(sizeof(struct elf_phdr))); NEW_AUX_ENT(AT_PHNUM, (abi_ulong)(exec->e_phnum)); NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(TARGET_PAGE_SIZE)); NEW_AUX_ENT(AT_BASE, (abi_ulong)(interp_load_addr)); @@ -834,90 +834,90 @@ static abi_ulong create_elf_tables(abi_ulong p, int a= rgc, int envc, } =20 =20 -static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex, +static abi_ulong load_elf_interp(struct elfhdr *interp_elf_ex, int interpreter_fd, abi_ulong *interp_load_addr) { - struct elf_phdr *elf_phdata =3D NULL; - struct elf_phdr *eppnt; - abi_ulong load_addr =3D 0; - int load_addr_set =3D 0; - int retval; - abi_ulong last_bss, elf_bss; - abi_ulong error; - int i; + struct elf_phdr *elf_phdata =3D NULL; + struct elf_phdr *eppnt; + abi_ulong load_addr =3D 0; + int load_addr_set =3D 0; + int retval; + abi_ulong last_bss, elf_bss; + abi_ulong error; + int i; =20 - elf_bss =3D 0; - last_bss =3D 0; - error =3D 0; + elf_bss =3D 0; + last_bss =3D 0; + error =3D 0; =20 #ifdef BSWAP_NEEDED - bswap_ehdr(interp_elf_ex); + bswap_ehdr(interp_elf_ex); #endif - /* First of all, some simple consistency checks */ - if ((interp_elf_ex->e_type !=3D ET_EXEC && - interp_elf_ex->e_type !=3D ET_DYN) || - !elf_check_arch(interp_elf_ex->e_machine)) { - return ~((abi_ulong)0UL); - } + /* First of all, some simple consistency checks */ + if ((interp_elf_ex->e_type !=3D ET_EXEC && + interp_elf_ex->e_type !=3D ET_DYN) || + !elf_check_arch(interp_elf_ex->e_machine)) { + return ~((abi_ulong)0UL); + } =20 =20 - /* Now read in all of the header information */ + /* Now read in all of the header information */ =20 - if (sizeof(struct elf_phdr) * interp_elf_ex->e_phnum > TARGET_PAGE= _SIZE) - return ~(abi_ulong)0UL; + if (sizeof(struct elf_phdr) * interp_elf_ex->e_phnum > TARGET_PAGE_SIZ= E) + return ~(abi_ulong)0UL; =20 - elf_phdata =3D (struct elf_phdr *) - malloc(sizeof(struct elf_phdr) * interp_elf_ex->e_phnum); + elf_phdata =3D (struct elf_phdr *) + malloc(sizeof(struct elf_phdr) * interp_elf_ex->e_phnum); =20 - if (!elf_phdata) - return ~((abi_ulong)0UL); + if (!elf_phdata) + return ~((abi_ulong)0UL); =20 - /* - * If the size of this structure has changed, then punt, since - * we will be doing the wrong thing. - */ - if (interp_elf_ex->e_phentsize !=3D sizeof(struct elf_phdr)) { - free(elf_phdata); - return ~((abi_ulong)0UL); - } + /* + * If the size of this structure has changed, then punt, since + * we will be doing the wrong thing. + */ + if (interp_elf_ex->e_phentsize !=3D sizeof(struct elf_phdr)) { + free(elf_phdata); + return ~((abi_ulong)0UL); + } =20 - retval =3D lseek(interpreter_fd, interp_elf_ex->e_phoff, SEEK_SET); - if(retval >=3D 0) { - retval =3D read(interpreter_fd, - (char *) elf_phdata, - sizeof(struct elf_phdr) * interp_elf_ex->e_phnu= m); - } - if (retval < 0) { - perror("load_elf_interp"); - exit(-1); - free (elf_phdata); - return retval; - } + retval =3D lseek(interpreter_fd, interp_elf_ex->e_phoff, SEEK_SET); + if (retval >=3D 0) { + retval =3D read(interpreter_fd, + (char *) elf_phdata, + sizeof(struct elf_phdr) * interp_elf_ex->e_phnum); + } + if (retval < 0) { + perror("load_elf_interp"); + exit(-1); + free (elf_phdata); + return retval; + } #ifdef BSWAP_NEEDED - eppnt =3D elf_phdata; - for (i=3D0; ie_phnum; i++, eppnt++) { - bswap_phdr(eppnt); - } + eppnt =3D elf_phdata; + for (i =3D 0; ie_phnum; i++, eppnt++) { + bswap_phdr(eppnt); + } #endif =20 - if (interp_elf_ex->e_type =3D=3D ET_DYN) { - /* in order to avoid hardcoding the interpreter load - address in qemu, we allocate a big enough memory zone */ - error =3D target_mmap(0, INTERP_MAP_SIZE, - PROT_NONE, MAP_PRIVATE | MAP_ANON, - -1, 0); - if (error =3D=3D -1) { - perror("mmap"); - exit(-1); - } - load_addr =3D error; - load_addr_set =3D 1; + if (interp_elf_ex->e_type =3D=3D ET_DYN) { + /* in order to avoid hardcoding the interpreter load + address in qemu, we allocate a big enough memory zone */ + error =3D target_mmap(0, INTERP_MAP_SIZE, + PROT_NONE, MAP_PRIVATE | MAP_ANON, + -1, 0); + if (error =3D=3D -1) { + perror("mmap"); + exit(-1); } + load_addr =3D error; + load_addr_set =3D 1; + } =20 - eppnt =3D elf_phdata; - for(i=3D0; ie_phnum; i++, eppnt++) - if (eppnt->p_type =3D=3D PT_LOAD) { + eppnt =3D elf_phdata; + for (i =3D 0; i < interp_elf_ex->e_phnum; i++, eppnt++) + if (eppnt->p_type =3D=3D PT_LOAD) { int elf_type =3D MAP_PRIVATE | MAP_DENYWRITE; int elf_prot =3D 0; abi_ulong vaddr =3D 0; @@ -930,23 +930,23 @@ static abi_ulong load_elf_interp(struct elfhdr * inte= rp_elf_ex, elf_type |=3D MAP_FIXED; vaddr =3D eppnt->p_vaddr; } - error =3D target_mmap(load_addr+TARGET_ELF_PAGESTART(vaddr), - eppnt->p_filesz + TARGET_ELF_PAGEOFFSET(eppnt->p_vaddr), - elf_prot, - elf_type, - interpreter_fd, - eppnt->p_offset - TARGET_ELF_PAGEOFFSET(eppnt->p_vaddr)); + error =3D target_mmap(load_addr + TARGET_ELF_PAGESTART(vaddr), + eppnt->p_filesz + TARGET_ELF_PAGEOFFSET(ep= pnt->p_vaddr), + elf_prot, + elf_type, + interpreter_fd, + eppnt->p_offset - TARGET_ELF_PAGEOFFSET(ep= pnt->p_vaddr)); =20 if (error =3D=3D -1) { - /* Real error */ - close(interpreter_fd); - free(elf_phdata); - return ~((abi_ulong)0UL); + /* Real error */ + close(interpreter_fd); + free(elf_phdata); + return ~((abi_ulong)0UL); } =20 if (!load_addr_set && interp_elf_ex->e_type =3D=3D ET_DYN) { - load_addr =3D error; - load_addr_set =3D 1; + load_addr =3D error; + load_addr_set =3D 1; } =20 /* @@ -962,31 +962,31 @@ static abi_ulong load_elf_interp(struct elfhdr * inte= rp_elf_ex, */ k =3D load_addr + eppnt->p_memsz + eppnt->p_vaddr; if (k > last_bss) last_bss =3D k; - } + } =20 - /* Now use mmap to map the library into memory. */ + /* Now use mmap to map the library into memory. */ =20 - close(interpreter_fd); + close(interpreter_fd); =20 - /* - * Now fill out the bss section. First pad the last page up - * to the page boundary, and then perform a mmap to make sure - * that there are zeromapped pages up to and including the last - * bss page. - */ - padzero(elf_bss, last_bss); - elf_bss =3D TARGET_ELF_PAGESTART(elf_bss + qemu_host_page_size - 1= ); /* What we have mapped so far */ - - /* Map the last of the bss segment */ - if (last_bss > elf_bss) { - target_mmap(elf_bss, last_bss-elf_bss, - PROT_READ|PROT_WRITE|PROT_EXEC, - MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0); - } - free(elf_phdata); + /* + * Now fill out the bss section. First pad the last page up + * to the page boundary, and then perform a mmap to make sure + * that there are zeromapped pages up to and including the last + * bss page. + */ + padzero(elf_bss, last_bss); + elf_bss =3D TARGET_ELF_PAGESTART(elf_bss + qemu_host_page_size - 1); /= * What we have mapped so far */ + + /* Map the last of the bss segment */ + if (last_bss > elf_bss) { + target_mmap(elf_bss, last_bss - elf_bss, + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_FIXED | MAP_PRIVATE | MAP_ANON, -1, 0); + } + free(elf_phdata); =20 - *interp_load_addr =3D load_addr; - return ((abi_ulong) interp_elf_ex->e_entry) + load_addr; + *interp_load_addr =3D load_addr; + return ((abi_ulong) interp_elf_ex->e_entry) + load_addr; } =20 static int symfind(const void *s0, const void *s1) @@ -1102,7 +1102,7 @@ static void load_symbols(struct elfhdr *hdr, int fd) } continue; } -#if defined(TARGET_ARM) || defined (TARGET_MIPS) +#if defined(TARGET_ARM) || defined(TARGET_MIPS) /* The bottom address bit marks a Thumb or MIPS16 symbol. */ syms[i].st_value &=3D ~(target_ulong)1; #endif @@ -1143,8 +1143,8 @@ static void load_symbols(struct elfhdr *hdr, int fd) syminfos =3D s; } =20 -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * re= gs, - struct image_info * info) +int load_elf_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, + struct image_info *info) { struct elfhdr elf_ex; struct elfhdr interp_elf_ex; @@ -1178,13 +1178,13 @@ int load_elf_binary(struct linux_binprm * bprm, str= uct target_pt_regs * regs, =20 /* First of all, some simple consistency checks */ if ((elf_ex.e_type !=3D ET_EXEC && elf_ex.e_type !=3D ET_DYN) || - (! elf_check_arch(elf_ex.e_machine))) { + (!elf_check_arch(elf_ex.e_machine))) { return -ENOEXEC; } =20 bprm->p =3D copy_elf_strings(1, &bprm->filename, bprm->page, bprm->p); - bprm->p =3D copy_elf_strings(bprm->envc,bprm->envp,bprm->page,bprm->p); - bprm->p =3D copy_elf_strings(bprm->argc,bprm->argv,bprm->page,bprm->p); + bprm->p =3D copy_elf_strings(bprm->envc, bprm->envp, bprm->page,bprm->= p); + bprm->p =3D copy_elf_strings(bprm->argc, bprm->argv, bprm->page,bprm->= p); if (!bprm->p) { retval =3D -E2BIG; } @@ -1196,21 +1196,21 @@ int load_elf_binary(struct linux_binprm * bprm, str= uct target_pt_regs * regs, } =20 retval =3D lseek(bprm->fd, elf_ex.e_phoff, SEEK_SET); - if(retval > 0) { - retval =3D read(bprm->fd, (char *) elf_phdata, + if (retval > 0) { + retval =3D read(bprm->fd, (char *)elf_phdata, elf_ex.e_phentsize * elf_ex.e_phnum); } =20 if (retval < 0) { perror("load_elf_binary"); exit(-1); - free (elf_phdata); + free(elf_phdata); return -errno; } =20 #ifdef BSWAP_NEEDED elf_ppnt =3D elf_phdata; - for (i=3D0; ip_type =3D=3D PT_INTERP) { - if ( elf_interpreter !=3D NULL ) + if (elf_interpreter !=3D NULL) { - free (elf_phdata); + free(elf_phdata); free(elf_interpreter); close(bprm->fd); return -EINVAL; @@ -1245,16 +1245,16 @@ int load_elf_binary(struct linux_binprm * bprm, str= uct target_pt_regs * regs, elf_interpreter =3D (char *)malloc(elf_ppnt->p_filesz); =20 if (elf_interpreter =3D=3D NULL) { - free (elf_phdata); + free(elf_phdata); close(bprm->fd); return -ENOMEM; } =20 retval =3D lseek(bprm->fd, elf_ppnt->p_offset, SEEK_SET); - if(retval >=3D 0) { + if (retval >=3D 0) { retval =3D read(bprm->fd, elf_interpreter, elf_ppnt->p_fil= esz); } - if(retval < 0) { + if (retval < 0) { perror("load_elf_binary2"); exit(-1); } @@ -1265,8 +1265,8 @@ int load_elf_binary(struct linux_binprm * bprm, struc= t target_pt_regs * regs, =20 /* JRP - Need to add X86 lib dir stuff here... */ =20 - if (strcmp(elf_interpreter,"/usr/lib/libc.so.1") =3D=3D 0 || - strcmp(elf_interpreter,"/usr/lib/ld.so.1") =3D=3D 0) { + if (strcmp(elf_interpreter, "/usr/lib/libc.so.1") =3D=3D 0 || + strcmp(elf_interpreter, "/usr/lib/ld.so.1") =3D=3D 0) { ibcs2_interpreter =3D 1; } =20 @@ -1275,7 +1275,7 @@ int load_elf_binary(struct linux_binprm * bprm, struc= t target_pt_regs * regs, #endif if (retval >=3D 0) { retval =3D open(path(elf_interpreter), O_RDONLY); - if(retval >=3D 0) { + if (retval >=3D 0) { interpreter_fd =3D retval; } else { @@ -1287,8 +1287,8 @@ int load_elf_binary(struct linux_binprm * bprm, struc= t target_pt_regs * regs, =20 if (retval >=3D 0) { retval =3D lseek(interpreter_fd, 0, SEEK_SET); - if(retval >=3D 0) { - retval =3D read(interpreter_fd,bprm->buf,128); + if (retval >=3D 0) { + retval =3D read(interpreter_fd, bprm->buf, 128); } } if (retval >=3D 0) { @@ -1298,7 +1298,7 @@ int load_elf_binary(struct linux_binprm * bprm, struc= t target_pt_regs * regs, if (retval < 0) { perror("load_elf_binary3"); exit(-1); - free (elf_phdata); + free(elf_phdata); free(elf_interpreter); close(bprm->fd); return retval; @@ -1308,17 +1308,17 @@ int load_elf_binary(struct linux_binprm * bprm, str= uct target_pt_regs * regs, } =20 /* Some simple consistency checks for the interpreter */ - if (elf_interpreter){ + if (elf_interpreter) { interpreter_type =3D INTERPRETER_ELF | INTERPRETER_AOUT; =20 /* Now figure out which format our binary is */ if ((N_MAGIC(interp_ex) !=3D OMAGIC) && (N_MAGIC(interp_ex) !=3D Z= MAGIC) && (N_MAGIC(interp_ex) !=3D QMAGIC)) { - interpreter_type =3D INTERPRETER_ELF; + interpreter_type =3D INTERPRETER_ELF; } =20 if (interp_elf_ex.e_ident[0] !=3D 0x7f || - strncmp((char *)&interp_elf_ex.e_ident[1], "ELF",3) !=3D 0= ) { + strncmp((char *)&interp_elf_ex.e_ident[1], "ELF", 3) !=3D = 0) { interpreter_type &=3D ~INTERPRETER_ELF; } =20 @@ -1334,20 +1334,20 @@ int load_elf_binary(struct linux_binprm * bprm, str= uct target_pt_regs * regs, and then start this sucker up */ =20 { - char * passed_p; + char *passed_p; =20 if (interpreter_type =3D=3D INTERPRETER_AOUT) { snprintf(passed_fileno, sizeof(passed_fileno), "%d", bprm->fd); passed_p =3D passed_fileno; =20 if (elf_interpreter) { - bprm->p =3D copy_elf_strings(1,&passed_p,bprm->page,bprm->= p); + bprm->p =3D copy_elf_strings(1, &passed_p, bprm->page, bpr= m->p); bprm->argc++; } } if (!bprm->p) { free(elf_interpreter); - free (elf_phdata); + free(elf_phdata); close(bprm->fd); return -E2BIG; } @@ -1393,7 +1393,7 @@ int load_elf_binary(struct linux_binprm * bprm, struc= t target_pt_regs * regs, * address. */ =20 - for(i =3D 0, elf_ppnt =3D elf_phdata; i < elf_ex.e_phnum; i++, elf_ppn= t++) { + for (i =3D 0, elf_ppnt =3D elf_phdata; i < elf_ex.e_phnum; i++, elf_pp= nt++) { int elf_prot =3D 0; int elf_flags =3D 0; abi_ulong error; @@ -1538,7 +1538,7 @@ int load_elf_binary(struct linux_binprm * bprm, struc= t target_pt_regs * regs, printf("(brk) %x\n" , info->brk); #endif =20 - if ( info->personality =3D=3D PER_SVR4 ) + if (info->personality =3D=3D PER_SVR4) { /* Why this, you ask??? Well SVr4 maps page 0 as read-only, and some applications "depend" upon this behavior. @@ -1553,7 +1553,7 @@ int load_elf_binary(struct linux_binprm * bprm, struc= t target_pt_regs * regs, return 0; } =20 -static int load_aout_interp(void * exptr, int interp_fd) +static int load_aout_interp(void *exptr, int interp_fd) { printf("a.out interpreter not yet supported\n"); return(0); --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840436; cv=none; d=zohomail.com; s=zohoarc; b=aNueuJghTlPoUhzqq36txt79X0msPAtwByGx68ZsSgLAks820knvQzHFBy1UlC7J5HClTW1R6Rw0B0iQuRHYE/A3IlbpIA/tUH02VrZN7aqyPk8SF5/TbGSomNReJcxfIvX7D7xsoozBDEAk5uPYldxpPz+eS7AVoWUMJRVyaWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840436; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FOyYT6v3FJ+0uJnT7gsJB6d2fgSg7HmjK7xr2jCaye4=; b=ne5YbifMXWWKCqB33EBTVy0/RgUAcNBZhZcD/pkJ2XsCX2QhQYmr4qhM6nq1Z975vwHi2Da/4xOIxYGUr3cqlADiGu2O27b4YiulBHFlFDNwrQoXNQ1jlS05AKg5GP5+ZYFvw1lA0O9TgvNRseBrfLoS2BLtLXEBL9XFbq3zAlI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840436315950.9153677867877; Wed, 12 May 2021 10:27:16 -0700 (PDT) Received: from localhost ([::1]:47016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsdf-0005jE-2G for importer@patchew.org; Wed, 12 May 2021 13:27:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUd-0007C7-Le for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:55 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]:40608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUR-0008Lh-Ji for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:55 -0400 Received: by mail-il1-x131.google.com with SMTP id h6so20790972ila.7 for ; Wed, 12 May 2021 10:17:41 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FOyYT6v3FJ+0uJnT7gsJB6d2fgSg7HmjK7xr2jCaye4=; b=lMtTiG/Ty13XxDpq0VZzh8ea6/2a11rxAKz3l8MsdI5v4z8kdzqaUjLdZOg9teM6yj eqy2Pk6Z4JhcaxaP2ZNasE4ThjIcwpcQFdHUjK5NWlBkFy3CirTrDqHq/0mIZ+kNPFrp /XND14Qh1VLhkGnVG2H1K2A+VrsV7LjCqvIW4n+uGJdbqdLxLPsf8nrr1ydGAs2iGJ76 TUrm127HQvtP1YW0adLwAazCOfyFbA4zhWjTExM2DlUqcKILSJMuPZh0WdV+7Z68l0/5 U93TjpeSyd8kiBydovl/H0Z68Rcy/4GWR6PdrbUAXnU5f2ef0zKy3PPLTyoIdMOwFLyT 9iCQ== 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=FOyYT6v3FJ+0uJnT7gsJB6d2fgSg7HmjK7xr2jCaye4=; b=KnHVFjjVrO9WtAMUN2SZemqmX3gwBZLZ02t8nNtDSwAECs1xyAsDfn3lgx9BozNkwC qvZxjXJ2RZC44AdB1QCyeWlBdtzn0iwU8YO8dy8FiUIP0Q3Q5aYOhoHQxRJyxU7Dgi7r 4bV/1Jg3jYQxWne4ad7JZiudHf1TwWCfBFkyfwbZXoSlZpRN+9Wvc8ueXJIra/CEagav LmwVQhEMyKk6xolve5X36S5yuFxPOhEzpvBHkeFAW6x0ipvxHc4913STDPfkeHkd+pCY u6jOWc7nRvysupd5lMAjtiEJ9IuZM3EyZB5lf6WsW663158k+nCWB0ysHX8nlTNG+l/A X+tg== X-Gm-Message-State: AOAM532LRxq+RJF2oxRvYPh06pc9RXIGkXqRGib04mgf9GinNW6tao4K kSSqcZypA/H9NGkewa5ToY6OrWSEk+GGgw== X-Google-Smtp-Source: ABdhPJxTbiIe2gTADaxUnQaXAfncCTAt5yhnJ2CqF0gsYvdjmdN9VcK/XSWPVIe5SPkK6YwVD2FTRQ== X-Received: by 2002:a05:6e02:ee1:: with SMTP id j1mr18433529ilk.105.1620839860888; Wed, 12 May 2021 10:17:40 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 14/20] bsd-user: style tweak: keyword space ( Date: Wed, 12 May 2021 11:17:14 -0600 Message-Id: <20210512171720.46744-15-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::131; envelope-from=imp@bsdimp.com; helo=mail-il1-x131.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/syscall.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index 4abff796c7..7d986e9700 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -95,7 +95,7 @@ static abi_long do_freebsd_sysarch(CPUX86State *env, int = op, abi_ulong parms) abi_ulong val; int idx; =20 - switch(op) { + switch (op) { #ifdef TARGET_ABI32 case TARGET_FREEBSD_I386_SET_GSBASE: case TARGET_FREEBSD_I386_SET_FSBASE: @@ -272,7 +272,7 @@ static abi_long lock_iovec(int type, struct iovec *vec,= abi_ulong target_addr, target_vec =3D lock_user(VERIFY_READ, target_addr, count * sizeof(stru= ct target_iovec), 1); if (!target_vec) return -TARGET_EFAULT; - for(i =3D 0;i < count; i++) { + for (i =3D 0;i < count; i++) { base =3D tswapl(target_vec[i].iov_base); vec[i].iov_len =3D tswapl(target_vec[i].iov_len); if (vec[i].iov_len !=3D 0) { @@ -298,7 +298,7 @@ static abi_long unlock_iovec(struct iovec *vec, abi_ulo= ng target_addr, target_vec =3D lock_user(VERIFY_READ, target_addr, count * sizeof(stru= ct target_iovec), 1); if (!target_vec) return -TARGET_EFAULT; - for(i =3D 0;i < count; i++) { + for (i =3D 0;i < count; i++) { if (target_vec[i].iov_base) { base =3D tswapl(target_vec[i].iov_base); unlock_user(vec[i].iov_base, base, copy ? vec[i].iov_len : 0); @@ -326,10 +326,10 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, a= bi_long arg1, #endif record_syscall_start(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, = 0); =20 - if(do_strace) + if (do_strace) print_freebsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); =20 - switch(num) { + switch (num) { case TARGET_FREEBSD_NR_exit: #ifdef CONFIG_GPROF _mcleanup(); @@ -428,10 +428,10 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, ab= i_long arg1, =20 record_syscall_start(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, = 0); =20 - if(do_strace) + if (do_strace) print_netbsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); =20 - switch(num) { + switch (num) { case TARGET_NETBSD_NR_exit: #ifdef CONFIG_GPROF _mcleanup(); @@ -507,10 +507,10 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, a= bi_long arg1, =20 record_syscall_start(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, = 0); =20 - if(do_strace) + if (do_strace) print_openbsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); =20 - switch(num) { + switch (num) { case TARGET_OPENBSD_NR_exit: #ifdef CONFIG_GPROF _mcleanup(); --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840226; cv=none; d=zohomail.com; s=zohoarc; b=hoL58aZz3hoXbUrnOVj+MyTV09f0bmwn9q0jFrxyxH9Kj63ZP+k80fFaLotnZ7k58JNpHWJconJh0F68SGF7x1QWA/16cN0FhkXTffWtt/+ak8c172xhmWtQijty+EFpbQhzSJsiRzDG5WSRPmP3rRdnKg6YS5vXceWkNyLbItA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840226; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o9W9TsWDfUy9rNviBTYIU9THi5aRC//53zh1Wgxdr7U=; b=GzN8a/9CCfLYX9CHGe/xdIFNKJEaFg84P+BRaHKnZfWTtDiRo6zQhDmGD1/EQdGtdh8IEMFRYuU44+BVTPwGMENDaTxtLPU0+VfUQC/sKkHCAgMWMR3HbUhfZTQe9nGC+PzyFm54qZO6PbDHnfpUTODnVSvM8cQocyeHXcZtLpQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840226615487.7435327326298; Wed, 12 May 2021 10:23:46 -0700 (PDT) Received: from localhost ([::1]:38440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsaH-00087h-2F for importer@patchew.org; Wed, 12 May 2021 13:23:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUb-0007Ak-31 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:55 -0400 Received: from mail-il1-x133.google.com ([2607:f8b0:4864:20::133]:34415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUR-0008Lm-Jl for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:52 -0400 Received: by mail-il1-x133.google.com with SMTP id c16so1905401ilo.1 for ; Wed, 12 May 2021 10:17:42 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o9W9TsWDfUy9rNviBTYIU9THi5aRC//53zh1Wgxdr7U=; b=TjbLK30iWul2RGWtUVFQCa2od4t8t4wAcAtoe4+BCdIHnBfNcnCElO88nY0Uvg78D7 RXXZEwbaSFX9jqvzJhlnBHlaPL0TEKwnjUP2vFCaxZwPd2n65p1ztJ+dliDSXtLu21Kj S59D+qaAdeY2CmJJiaNZlhLrJ4he/4wf5MsCMGx92sj0Wnnk2Gnt6sjTYsvsIiHuOGFp /58Sj7Kf9hiw0ymVDcumOuNtaK9hKuZDxgL7NYP+qDcnv+08VLQ22KrNHrsgKZDvNr63 yhNzTTIsICNFr1Xef/EnVZ4HDY+VqiqVrvSYvxvso7wYmkwl+o+z79kvEq5tgBgcfSXF EnwA== 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=o9W9TsWDfUy9rNviBTYIU9THi5aRC//53zh1Wgxdr7U=; b=Ri7IFur34D+9ls5k8w4y7VZsyurg4tHyyDM7hiOQFANlcbrqQEIWjrroW2gCh3wro9 xfTTZ0F9zPvkMsM1o9273WfhjDIBbmKp6KjoYbP137H5Im9um5iEDqgWJmdHvKQiqFS7 Bak7BubS4+yZnI3o4W5HfEXO3xHdDJicWrHAR49xJFN4qKwGZ+Zpayx1vL1wSuJh3+e8 rO6Qf6/Il3gzLt7ecc3VIM2raOdsu/t7VTnnvjW6f+UXrZLvYxbx3P0kLrVkQTrpqycA YydGnftF8CLk7qkfHLzTO/N8Cd98BJLsy02fNKdg0DpeGYlRyRKV2Vrstyz4ZJHxWpg7 1ecQ== X-Gm-Message-State: AOAM533ryp5Omfcfr6Xxcd+yIDdEeq1RNT5RqW3xuCMa0TRpn4fxFStl GSAkUE/J2a89axv/9iAPiPal6c7lgCmvjw== X-Google-Smtp-Source: ABdhPJypX2i7SJuHFQcWRYCe60WZE4k2CdB092taMePadZfctPlgtuc+LHx2vF4/Rs261tyywjJ0Cg== X-Received: by 2002:a05:6e02:13ca:: with SMTP id v10mr29971659ilj.191.1620839861805; Wed, 12 May 2021 10:17:41 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 15/20] bsd-user: style tweak: keyword space ( Date: Wed, 12 May 2021 11:17:15 -0600 Message-Id: <20210512171720.46744-16-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::133; envelope-from=imp@bsdimp.com; helo=mail-il1-x133.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/uaccess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsd-user/uaccess.c b/bsd-user/uaccess.c index 91e2067933..89163257f4 100644 --- a/bsd-user/uaccess.c +++ b/bsd-user/uaccess.c @@ -46,7 +46,7 @@ abi_long target_strlen(abi_ulong guest_addr1) int max_len, len; =20 guest_addr =3D guest_addr1; - for(;;) { + for (;;) { max_len =3D TARGET_PAGE_SIZE - (guest_addr & ~TARGET_PAGE_MASK); ptr =3D lock_user(VERIFY_READ, guest_addr, max_len, 1); if (!ptr) --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620841059; cv=none; d=zohomail.com; s=zohoarc; b=MhnklBk7eXU7shkITqkJ9EuKeZyClpNMHNm1xAhGvynlOqfjixshGlNqBrvyrzb9A+xyz1Z4yY9M3CZLcYKLWiOnjn4jvxHnlQQ7UEmB3jo2jzD923dvvPzc0Aq9TngAqgEN5FcbvT+CO7geIzVtRYx8XaGbzdtY/9Opnel9N7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620841059; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9CWQeDefbyCahK2RutY5l8BK3paDWDE19Ob7lheCkIw=; b=GsaoXUFOdFQqTDScm5O9Jit7CVm55W93cF2eQIcps3TXX4ZF/1O7bLyHX89FgqmC+K808D9+5wEEpbBX7wkr+fn0uea47aCvaOwdgEil1ZfznYyOCQcgsBj9+lIyfrthe/+TZbCkigR2SloS93hoB21VqF9KhmtfRKtH9mKXWG0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620841059735837.2770713080647; Wed, 12 May 2021 10:37:39 -0700 (PDT) Received: from localhost ([::1]:49694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsni-0001VG-CX for importer@patchew.org; Wed, 12 May 2021 13:37:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUh-0007Sd-M1 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:59 -0400 Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]:39858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUX-0008OX-RX for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:59 -0400 Received: by mail-il1-x12b.google.com with SMTP id o9so15653856ilh.6 for ; Wed, 12 May 2021 10:17:48 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9CWQeDefbyCahK2RutY5l8BK3paDWDE19Ob7lheCkIw=; b=nBKgr5Lo0T03oRsGjWiG4y+GvuqkMK7F4aFESXLZG5fT2CsD7W+EbmVTHiGj2lC6Jw z2hkBv8PPQnR6u7BNkgTjWeP2Vtq+1QUKK2CO8QuPUlN9xFrV1dpQ5RrlR0Pw0bMLCTw ZnCWuOfdi2o3hga7TBKsXd1T9ybGClNpFVbKxGzqaed6Vip9Sp1O7NAFdiytsQwAbYlp G14Vef9EFR7KsbbTXZmPEKs8sbDVYHkyOwqg0PKeAZKiksD9yOmA0pw4jwnzqT6Fqkto oLIxJSeegnVEBxpxJl/iuOltMY73TOAdVjpeppwauVoQONR8uNbFP51EEyG3Y/+AfkuW dIYg== 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=9CWQeDefbyCahK2RutY5l8BK3paDWDE19Ob7lheCkIw=; b=a+N/AS24SudVSl7sb3V7gby6n3qj3o0iNWW3sJ3yY2GA0ItWCD3OTcgbpwSJ9C6mKD hWszq5kJJbGw1gK/ukkYTT5QM8t6r84p81r++ZFNthJ2E+hLk8uXi7arkIMtAvF1yAxL sZEXzRDRE2lrRCXW7xU6UBaHPRe3MICcKIqUstAsrYpbP/s2dDtFAPEtQLjX4N+A9qZx +8Ias0lRhjtLbchWleHt6Ru2AbLl6Ioa8onZHfsr3Kvzix9R9KTF3hWbeY56SiimSrfP KalKhehoh/juaxNtL13I20AP7C4SLfGwCV2HsHo/RtG6sZpo85Q2fQ+cRIICRBwpg9NT jcDA== X-Gm-Message-State: AOAM531Xeoxkqs4W3l8C79iyZQcftvOCXaNOiqs0n/czf/aK64qmOmvo bCfcWEvxM/UaamdNRnaWbXPDmYQVji9cYg== X-Google-Smtp-Source: ABdhPJzSpkmFbj65f27lrQ9Fiyh8A1H1IFJBYOVynFSNCgqP7CHeQkjn8pIqLVrkYEsWgZSbMU9Nzg== X-Received: by 2002:a92:6804:: with SMTP id d4mr31972569ilc.5.1620839862727; Wed, 12 May 2021 10:17:42 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 16/20] bsd-user: style tweak: Remove #if 0'd code Date: Wed, 12 May 2021 11:17:16 -0600 Message-Id: <20210512171720.46744-17-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::12b; envelope-from=imp@bsdimp.com; helo=mail-il1-x12b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/strace.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/bsd-user/strace.c b/bsd-user/strace.c index 2c3b59caf0..be40b8a20c 100644 --- a/bsd-user/strace.c +++ b/bsd-user/strace.c @@ -128,14 +128,6 @@ static void print_syscall_ret_addr(const struct syscal= lname *name, abi_long ret) } } =20 -#if 0 /* currently unused */ -static void -print_syscall_ret_raw(struct syscallname *name, abi_long ret) -{ - gemu_log(" =3D 0x" TARGET_ABI_FMT_lx "\n", ret); -} -#endif - /* * An array of all of the syscalls we know about */ --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840833; cv=none; d=zohomail.com; s=zohoarc; b=lMgkmknCj6n556UmAilK/kAg6P6C9RR6ttp865ttQb9/zl7vBhzH0KSVUwy7NYh1YfmI4g653oZjkaJhlfojldeQauNHTGcM8PxzF9OUtspEKQXfiofXYCPhUERdyg1JLfm34Cg3GYcGscEh88OSXwtDUL4gUmvFiohLl3EhDL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840833; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+CUmFkP2o3lErLZkJ9Syb5R++GYvoD8jrEJtgqEheiI=; b=AJ1fn/jH3EKw5K+HHakONmc/VjzfSq+3dXkdFypfUYdtB79nOgew5mlpqDMtsTzdS4roSeYZkJrxKuc9Ha/U6aWJlCk78pDbXTVsOAkI2LBa7xlKJebtTIOuJFdLqrZBylJB7AxclNAtzqLKhoi/WmsgvducwpQoLPN3694tGa0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840833674427.29197499781776; Wed, 12 May 2021 10:33:53 -0700 (PDT) Received: from localhost ([::1]:36018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsk4-0000iV-1e for importer@patchew.org; Wed, 12 May 2021 13:33:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUg-0007OW-Ls for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:58 -0400 Received: from mail-il1-x12d.google.com ([2607:f8b0:4864:20::12d]:38602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUU-0008MU-GN for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:58 -0400 Received: by mail-il1-x12d.google.com with SMTP id c3so20816037ils.5 for ; Wed, 12 May 2021 10:17:45 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+CUmFkP2o3lErLZkJ9Syb5R++GYvoD8jrEJtgqEheiI=; b=SMlDoMHBX/NYzeZHJpBlXjvmnrhjFaBHFnlbtwx0kolgB0yc91NDzNH9D66O1HAekt gZlHBCqUnGpKZMJPpVrKkSFE43QGnFmxsUpujjOiBNsrBtoBTetfqCn8Vmqe2IzD26SM MylklBGSGwX0ct7jCb1XE3yAVl1f9zub+nAPH9lczbpbc9b0LNW1xmUgXegySPyzaaGB AXCnuDGqVauePioe7Ba3tBuTbOanUZuzegRetF5mBK7pSUEJRo4XeQd6M1/T5B6vol+U PMDfYgcHnOgw2Rfeb6u5Wn8lguWn4BqHSV65Py7T3I2/sH1pKzTGuYHiTLcc5n/6RmzG Q7GQ== 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=+CUmFkP2o3lErLZkJ9Syb5R++GYvoD8jrEJtgqEheiI=; b=noCD8ZCz9nbf9/8WJioiaB+74sbwHti2tXOTaLA1SH0lE3m78LFY1Bu3TGzjgvErKt 9ghitNcg8rSVv2eqeUClpMF64C+jsopMhuQolkdUgQM73N7vDEQ+rtMl5OKweNMxB736 cKZm75C0J0wfMPWqujv6MrqFx+e9kaOoIwFH4ZvRcXLhuQpFWWlWV/KMEMdjGKddwfMm e1h5EJ7mBbA7oAYLKKbRR9Aj9MU6ZMoDLzXgqIbRGwOUE0rvrp9kcMwiVjVKME/OLO7A oktqf96pE9D8A/SBF0R5H+msTUjpf0uOS5Ndry4uJrQYEe193bQLB9bzSkFYsdKb9BUs 8d+Q== X-Gm-Message-State: AOAM533DYorLVUuWWi9fwpYS+ZaAKsZSb10IXzG8iJ+4v0jUBBayG55a IICpDl/qCSvpYPtx47W3aRIWT7PNCv7zLw== X-Google-Smtp-Source: ABdhPJyiWCkf2qz1BrVqi973+cjYqtYsZjD1hHNNbo6kS0D4YEBuEZMJZ/FaiFtP2jzyrRDvPipcmQ== X-Received: by 2002:a92:c0cd:: with SMTP id t13mr22917713ilf.280.1620839863989; Wed, 12 May 2021 10:17:43 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 17/20] bsd-user: style tweak: keyword space ( Date: Wed, 12 May 2021 11:17:17 -0600 Message-Id: <20210512171720.46744-18-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::12d; envelope-from=imp@bsdimp.com; helo=mail-il1-x12d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/mmap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 01ec808003..0ac1b92706 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -93,11 +93,11 @@ int target_mprotect(abi_ulong start, abi_ulong len, int= prot) if (start > host_start) { /* handle host page containing start */ prot1 =3D prot; - for(addr =3D host_start; addr < start; addr +=3D TARGET_PAGE_SIZE)= { + for (addr =3D host_start; addr < start; addr +=3D TARGET_PAGE_SIZE= ) { prot1 |=3D page_get_flags(addr); } if (host_end =3D=3D host_start + qemu_host_page_size) { - for(addr =3D end; addr < host_end; addr +=3D TARGET_PAGE_SIZE)= { + for (addr =3D end; addr < host_end; addr +=3D TARGET_PAGE_SIZE= ) { prot1 |=3D page_get_flags(addr); } end =3D host_end; @@ -110,7 +110,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int= prot) } if (end < host_end) { prot1 =3D prot; - for(addr =3D end; addr < host_end; addr +=3D TARGET_PAGE_SIZE) { + for (addr =3D end; addr < host_end; addr +=3D TARGET_PAGE_SIZE) { prot1 |=3D page_get_flags(addr); } ret =3D mprotect(g2h_untagged(host_end - qemu_host_page_size), @@ -148,7 +148,7 @@ static int mmap_frag(abi_ulong real_start, =20 /* get the protection of the target pages outside the mapping */ prot1 =3D 0; - for(addr =3D real_start; addr < real_end; addr++) { + for (addr =3D real_start; addr < real_end; addr++) { if (addr < start || addr >=3D end) prot1 |=3D page_get_flags(addr); } @@ -225,9 +225,9 @@ static abi_ulong mmap_find_vma(abi_ulong start, abi_ulo= ng size) if (addr =3D=3D 0) addr =3D mmap_next_start; addr_start =3D addr; - for(;;) { + for (;;) { prot =3D 0; - for(addr1 =3D addr; addr1 < (addr + size); addr1 +=3D TARGET_PAGE_= SIZE) { + for (addr1 =3D addr; addr1 < (addr + size); addr1 +=3D TARGET_PAGE= _SIZE) { prot |=3D page_get_flags(addr1); } if (prot =3D=3D 0) @@ -262,7 +262,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, in= t prot, printf("MAP_FIXED "); if (flags & MAP_ANON) printf("MAP_ANON "); - switch(flags & TARGET_BSD_MAP_FLAGMASK) { + switch (flags & TARGET_BSD_MAP_FLAGMASK) { case MAP_PRIVATE: printf("MAP_PRIVATE "); break; @@ -321,7 +321,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, in= t prot, end =3D start + len; real_end =3D HOST_PAGE_ALIGN(end); =20 - for(addr =3D real_start; addr < real_end; addr +=3D TARGET_PAGE_SI= ZE) { + for (addr =3D real_start; addr < real_end; addr +=3D TARGET_PAGE_S= IZE) { flg =3D page_get_flags(addr); if (flg & PAGE_RESERVED) { errno =3D ENXIO; @@ -433,11 +433,11 @@ int target_munmap(abi_ulong start, abi_ulong len) if (start > real_start) { /* handle host page containing start */ prot =3D 0; - for(addr =3D real_start; addr < start; addr +=3D TARGET_PAGE_SIZE)= { + for (addr =3D real_start; addr < start; addr +=3D TARGET_PAGE_SIZE= ) { prot |=3D page_get_flags(addr); } if (real_end =3D=3D real_start + qemu_host_page_size) { - for(addr =3D end; addr < real_end; addr +=3D TARGET_PAGE_SIZE)= { + for (addr =3D end; addr < real_end; addr +=3D TARGET_PAGE_SIZE= ) { prot |=3D page_get_flags(addr); } end =3D real_end; @@ -447,7 +447,7 @@ int target_munmap(abi_ulong start, abi_ulong len) } if (end < real_end) { prot =3D 0; - for(addr =3D end; addr < real_end; addr +=3D TARGET_PAGE_SIZE) { + for (addr =3D end; addr < real_end; addr +=3D TARGET_PAGE_SIZE) { prot |=3D page_get_flags(addr); } if (prot !=3D 0) --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840611; cv=none; d=zohomail.com; s=zohoarc; b=W1YpRdYAmupNg5N+1DYrBS1wKYpRqy3sPXYA6AXXONbS+4Etp8Z+9WdT9aH8YQrNDoVGnRiPxVGC6H2xjRFLidQlVhqlX7NTJ/MPBS4CJSqs1mxLnckwL8BTW5RaS+KHdZikLgLRZ/djyqIUqF8dzh8XZsSOnzj+4IOziXYj5vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840611; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DcXgMF9UlcBLkEbYZL77DciaFqqy1JLy93/coOTrH2M=; b=IHIQW3EWKcsiRqjBOw1wP7u0p+MPB4TrLS/O5d3GiSF/q9yPpl/PHGS1C3ADEZBMlsLXEonI49JJzsJOMbua/uyD/tMfaFmMrAafqJGqBYXO3Wacc5SerB7GcN5ri5EEWZwQWxmZvxPGRPf3ctGKbQ0o7oxy0SvNAMUq8EJj784= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620840611870266.54936574123076; Wed, 12 May 2021 10:30:11 -0700 (PDT) Received: from localhost ([::1]:55564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgsgT-00039a-JZ for importer@patchew.org; Wed, 12 May 2021 13:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUf-0007JE-EC for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:57 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:34775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUU-0008Ma-GE for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:57 -0400 Received: by mail-io1-xd32.google.com with SMTP id l21so22427207iob.1 for ; Wed, 12 May 2021 10:17:45 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DcXgMF9UlcBLkEbYZL77DciaFqqy1JLy93/coOTrH2M=; b=NNp/sT1XAfmZnELlDG1cJgBb97QOdah7FA87yuOHvCncPJryTbZzSxz7CUcR/9w/mv x9WYxi8U9qWng9vfYgIvPa/w6ghb1dNYgIHLSvHOHoTRaSC1RiGnp5ytSosfUOq5Brdf owlwuYOfWA+MS2f+igSfoq8eDepWIp6tU9NN9GQJwiMEdERHhiY/UbqIZs5mqGeBwZIO Xsb4gO/YZdDyM400/RFhuxKp4h/IqUBPpKU9XsEXk9mh12zpMt9ed7zTntlcnk+pxIc2 Wpj9TZT7Xu9TlOD2YPKGtlx/vJ4yGJ7g3jJ6DT8piuAjflsrY02aG0CDOjaaGpL1vSrX 45Ag== 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=DcXgMF9UlcBLkEbYZL77DciaFqqy1JLy93/coOTrH2M=; b=oWB9a1CrUUhyodsKLTBjVhI9+Zn2yWaJJ24qGgRI64eQ2huDFs4wQuR1eoxd3DhOIM 0eiYp+Q7731PBXRgrgLt/tqlF3pNNKn6D1oMUr8jInQ4/E53dUEItUHJAuDV55He0O0a hLKPcgl3KFDzpergpwchF2TPIZLZ3FtHGXnrtjvxFt1qQfs+qxyZO+xwAXaTXsQVCqEv n2hifwM52KCPkIN8yxJSCGmPJJQDotgzLg6h85T0TQrrBm1cIRQ6SfNNwZAx4513z+pa wi4WDOUtoA19kPBiir2ZfhGh0PvCa5RwL2tGab5TUY3fN4ksYLn9FfW0keD9TgAFsU+P n84A== X-Gm-Message-State: AOAM533RgM8Ml1jItVD8CUwWZrNQx0r9pOeZ9NC7ea84p1Gu1YJuZQpg WtXZxgDprTgvMe2/J3Mq1jiAilADz/enYA== X-Google-Smtp-Source: ABdhPJylKFpGQ4sf2feRgKJB3CFmkLUvzfvJrFkSvos7ADSjIg2Vm2C0mtzjBJKw8qsCGVJWf0KP0w== X-Received: by 2002:a05:6602:55:: with SMTP id z21mr16248994ioz.54.1620839864900; Wed, 12 May 2021 10:17:44 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 18/20] bsd-user: remove target_signal.h, it's unused Date: Wed, 12 May 2021 11:17:18 -0600 Message-Id: <20210512171720.46744-19-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d32; envelope-from=imp@bsdimp.com; helo=mail-io1-xd32.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Remove the target_signal.h file. None of its contents are currently used an= d the bsd-user fork doesn't use them (so this reduces the diffs there). Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/i386/target_signal.h | 20 -------------------- bsd-user/qemu.h | 1 - bsd-user/signal.c | 1 - bsd-user/sparc/target_signal.h | 27 --------------------------- bsd-user/sparc64/target_signal.h | 27 --------------------------- bsd-user/x86_64/target_signal.h | 19 ------------------- 6 files changed, 95 deletions(-) delete mode 100644 bsd-user/i386/target_signal.h delete mode 100644 bsd-user/sparc/target_signal.h delete mode 100644 bsd-user/sparc64/target_signal.h delete mode 100644 bsd-user/x86_64/target_signal.h diff --git a/bsd-user/i386/target_signal.h b/bsd-user/i386/target_signal.h deleted file mode 100644 index 2ef36d1f98..0000000000 --- a/bsd-user/i386/target_signal.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - - -static inline abi_ulong get_sp_from_cpustate(CPUX86State *state) -{ - return state->regs[R_ESP]; -} - -#endif /* TARGET_SIGNAL_H */ diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 8d3767964d..eb66d15df7 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -38,7 +38,6 @@ extern enum BSDType bsd_type; =20 #include "syscall_defs.h" #include "target_syscall.h" -#include "target_signal.h" #include "exec/gdbstub.h" =20 #if defined(CONFIG_USE_NPTL) diff --git a/bsd-user/signal.c b/bsd-user/signal.c index f6f7aa2427..ad6d935569 100644 --- a/bsd-user/signal.c +++ b/bsd-user/signal.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" =20 #include "qemu.h" -#include "target_signal.h" =20 void signal_init(void) { diff --git a/bsd-user/sparc/target_signal.h b/bsd-user/sparc/target_signal.h deleted file mode 100644 index 5b2abba40f..0000000000 --- a/bsd-user/sparc/target_signal.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - - -#ifndef UREG_I6 -#define UREG_I6 6 -#endif -#ifndef UREG_FP -#define UREG_FP UREG_I6 -#endif - -static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) -{ - return state->regwptr[UREG_FP]; -} - -#endif /* TARGET_SIGNAL_H */ diff --git a/bsd-user/sparc64/target_signal.h b/bsd-user/sparc64/target_sig= nal.h deleted file mode 100644 index 5b2abba40f..0000000000 --- a/bsd-user/sparc64/target_signal.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - - -#ifndef UREG_I6 -#define UREG_I6 6 -#endif -#ifndef UREG_FP -#define UREG_FP UREG_I6 -#endif - -static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) -{ - return state->regwptr[UREG_FP]; -} - -#endif /* TARGET_SIGNAL_H */ diff --git a/bsd-user/x86_64/target_signal.h b/bsd-user/x86_64/target_signa= l.h deleted file mode 100644 index 659cd401b8..0000000000 --- a/bsd-user/x86_64/target_signal.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - -static inline abi_ulong get_sp_from_cpustate(CPUX86State *state) -{ - return state->regs[R_ESP]; -} - -#endif /* TARGET_SIGNAL_H */ --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620841334; cv=none; d=zohomail.com; s=zohoarc; b=nieZxakBx5qGp9w4NojqQ3NdF05EDIkoyGaa8F7UZ12wX8+Pl0KfrEFp2s2u0BvzrTqR3SXcSdUEy3XURXjlyvkVydbReTRPHqHsRiZuTQPolVh7oV/CIwCiA9qUVAtohUWa871sdNLjZNYY+G4JPsC8zsPJYToX6ilXu95ijF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620841334; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dpPy8lhuqjxSmBaq/swlFjptC79bOmZiRmqH9jnLUiw=; b=PQfk+iThdNYxn6W0OfzPx1vv3vVBWkqudpqu0Mt51mbecSasnim4wCkvjYS7kXosezuThGDPeHvwIPpHKox2RFyoBCG8syytBixfuRHBIUzBgeyUYGNG0Tec4hJ1qVKcly9GrcEKPjSbtpY10NEsYKaf8C9KcTbPz2B6O6SLIgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620841334613791.406707230149; Wed, 12 May 2021 10:42:14 -0700 (PDT) Received: from localhost ([::1]:59250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgss9-00080c-Na for importer@patchew.org; Wed, 12 May 2021 13:42:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUh-0007QK-3Z for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:59 -0400 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]:33533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUV-0008NP-E0 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:58 -0400 Received: by mail-io1-xd2e.google.com with SMTP id a11so22396709ioo.0 for ; Wed, 12 May 2021 10:17:46 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dpPy8lhuqjxSmBaq/swlFjptC79bOmZiRmqH9jnLUiw=; b=wLe9MHDY1MXHZCe+AotSsYfEXJEuVMZKejSRa6YySQT7M9lCu2KYFrlWziplFDw8gj 5RTOrVioLoHX7OCdVB53+z9NsBLODZbMn9YTarytlTbT2IPJoHeEe/oLFuQr4L2I+Ohk k33PVwvGVJM83LaQ06DW+MbcH9xOO7B6n5qREELHF+35vFAaQVl0DbfsmWseVUtQ2Xw4 cyAMWEB0YNgUuS47fB/b2ZtPFzF04XXeBCTQMytDT7hb/bdNJzjUESzh7Jm5haO8DUTg aDo8DlUxSUYwiBeW2f0H5nxtpuoeo5NM7GW6VFU47lfTAdgdzivkSR7om5N0b6FeKQmQ tlaQ== 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=dpPy8lhuqjxSmBaq/swlFjptC79bOmZiRmqH9jnLUiw=; b=rNM5gR54Jja/8nty7MLGhADwpqttg6kVxfDbwHIixSWA8zXnoSOXcjK9b0J49qQjr0 SR8kNXPppsE8cmmH3DJZn+MAji04qK/XmkRn067PeP/tvoXDElorV0EfpYrbJRxxqhsN vXXewK4zh33Z9AMWqymrXHfIRbQFxb37cOg2k/P/c8EYwI6w5k3wv2qemuGTNC7Tln28 Y2r8rwcgLhAdLWlmDcVJ8RR1zYvddAEAb69Yh5Gz3cqrWNsIZWur69ML8Re6hQYJVNyS dhQ13pMIziPnjHdbeU5jhX6jZz5qEwkho8ZCMC+tHJ5UqS6tlevt6+wpFThimEa5RKhp 9O5Q== X-Gm-Message-State: AOAM532GzEuxNDIGbOeLGa4rwBZyiR//l33R8bSNmMFpfe6J05PAeisf jm/355/tHk3RMX6Wv+i0goSh83pH6C+s2g== X-Google-Smtp-Source: ABdhPJwkrjoTbHXNtSNSQOEXp1YIyF9mpFy4u3qggxMyrXynxUPO1PXLWdyhJjVRrwuandJgJAbbPg== X-Received: by 2002:a5e:8305:: with SMTP id x5mr26727715iom.112.1620839865800; Wed, 12 May 2021 10:17:45 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 19/20] bsd-user: Stop building the sparc targets Date: Wed, 12 May 2021 11:17:19 -0600 Message-Id: <20210512171720.46744-20-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d2e; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The forked bsd-user tree doesn't really support these targets. They aren't functional at the moment anyway. Remove them from the build so that the maj= or reorg patch series can focus on one platform (x86) before adding addition platforms once things are shuffled. This should make it easier to review and satisfy that all revisions of a patch series are buildable. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- default-configs/targets/sparc-bsd-user.mak | 3 --- default-configs/targets/sparc64-bsd-user.mak | 4 ---- 2 files changed, 7 deletions(-) delete mode 100644 default-configs/targets/sparc-bsd-user.mak delete mode 100644 default-configs/targets/sparc64-bsd-user.mak diff --git a/default-configs/targets/sparc-bsd-user.mak b/default-configs/t= argets/sparc-bsd-user.mak deleted file mode 100644 index 9ba3d7b07f..0000000000 --- a/default-configs/targets/sparc-bsd-user.mak +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_ARCH=3Dsparc -TARGET_ALIGNED_ONLY=3Dy -TARGET_WORDS_BIGENDIAN=3Dy diff --git a/default-configs/targets/sparc64-bsd-user.mak b/default-configs= /targets/sparc64-bsd-user.mak deleted file mode 100644 index 8dd3217800..0000000000 --- a/default-configs/targets/sparc64-bsd-user.mak +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_ARCH=3Dsparc64 -TARGET_BASE_ARCH=3Dsparc -TARGET_ALIGNED_ONLY=3Dy -TARGET_WORDS_BIGENDIAN=3Dy --=20 2.22.1 From nobody Fri May 17 02:03:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620840912; cv=none; d=zohomail.com; s=zohoarc; b=IGKRMPe2YoyZP2xMOGkN90qLafnIs0DJpER4BQHCYZ24XRh9QviJtw5+KUL6JxaRmoJAj0iltwRqVaiVazU/jKqJTZ0F81jM8KfPrSfM67tuVl+dHzMh20v4rHIbkOQhq/hg1ubbxDF/1NFYdcW7R+J2yVL4+USe65VMuFTRrw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620840912; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f7bQctyGCIlr/5eXGNXi6VxjLIggmhyddGK0Cjfe3ZM=; b=V/0lrDA/jSf+oL9vPKF1F1PbTb0+TTCM4FFSeZgGabD+6ssY1WXsxlWk/rL8sF2m+QgZAuJ3Y0F82KKFe46KTBQLuSXEasEny6vbYKZ8LQvVNifDSK8wiRpjNJyrTWhgT29QOBnnfyk1DrGGvcRPOFMAR2yNOb/X8SWDhocxrkE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16208409122931006.0729363175184; Wed, 12 May 2021 10:35:12 -0700 (PDT) Received: from localhost ([::1]:40926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgslL-0003z9-2c for importer@patchew.org; Wed, 12 May 2021 13:35:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgsUf-0007LT-V7 for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:57 -0400 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]:37728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgsUW-0008Og-RH for qemu-devel@nongnu.org; Wed, 12 May 2021 13:17:57 -0400 Received: by mail-io1-xd2a.google.com with SMTP id n40so6642561ioz.4 for ; Wed, 12 May 2021 10:17:47 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id d2sm192064ile.18.2021.05.12.10.17.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 May 2021 10:17:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f7bQctyGCIlr/5eXGNXi6VxjLIggmhyddGK0Cjfe3ZM=; b=Ilo/2n4Bl1RODYMQ9ceW961vBnv1cNk7Xy1I1wTsR3AiIjdoSepckj0JjDtsDvD2X7 e70HCBWFUnDCigYOBJ26uyhvWhj8qSopkCav5StsrEwwPbIE8DDRJxuaF9UImDKhVlIR t+6tarYRIqtO4jZEmq38quZCI8jidUXDNFYIeigzlOD+npbzNsMfg64y4TBlL2tXP5pL wIuMtS+IQDIAKyzO5ILzkAk/5Fe7S+8wNIFFHVj70SgvJZHcAcxbuOmCsgQPdHYsYrG4 pZBB7dXxwOJE5mVSzRi/sdd/XKxvSUu2bFx4xJfMj9i7vs1vYVk8w/ZFCRuOfRYMb2jA CABw== 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=f7bQctyGCIlr/5eXGNXi6VxjLIggmhyddGK0Cjfe3ZM=; b=Aou33ClVf3/KkzjWu+61JWOimkGcchbXEj+qy7k7SpnCK+XbRRbitdbrvV70gtCOSR w/Q6PTX4epHKlYclLmv01xgtcKQUNsiWwh6jznav8bjaMysj3w6hwPpVK7nVSlzSBou5 10PReOp3m9D/jKWUygfFJsA4IMvWWK8fUcxzxUMHAPBMo1jWbhaP076NyFsRj5JWBU73 jHSi1IxX7BNLQhXftgEwKG0UlKZ1YDAy5t429F0XXvLT8hHm/EYFr5w0MTSQXbaSeQyJ 1FZk3xtO0Z/NsST55oF0N2vPdq56Gcg7cCxbl1GdtXZU0ONSeBgFtdLt91RYHhmTZD3C Tz1Q== X-Gm-Message-State: AOAM5335hqjJPKypqf5h/PRxQyIZentHdeQ45DD7P1s6XdATB6GKs6fg 7Abg1Uu5E9EfSiEpXFISKw0cj/rFULNPjg== X-Google-Smtp-Source: ABdhPJxRJWGYol7zt32ibDgXFiPdZjyJzUXOlrWsMjVOythPS1i8V09Ob28Q69LGeddwDV9RKZBSdA== X-Received: by 2002:a5e:d711:: with SMTP id v17mr18268235iom.65.1620839866940; Wed, 12 May 2021 10:17:46 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 20/20] bsd-user: rename linux_binprm to bsd_binprm Date: Wed, 12 May 2021 11:17:20 -0600 Message-Id: <20210512171720.46744-21-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210512171720.46744-1-imp@bsdimp.com> References: <20210512171720.46744-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d2a; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kevans@freebsd.org, Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename linux_binprm to bsd_binprm to reflect that we're loading BSD binarie= s, not ELF ones. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/bsdload.c | 4 ++-- bsd-user/elfload.c | 4 ++-- bsd-user/qemu.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index e1ed3b7b60..8d83f21eda 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -32,7 +32,7 @@ static int count(char **vec) return i; } =20 -static int prepare_binprm(struct linux_binprm *bprm) +static int prepare_binprm(struct bsd_binprm *bprm) { struct stat st; int mode; @@ -127,7 +127,7 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_u= long sp, int loader_exec(const char *filename, char **argv, char **envp, struct target_pt_regs *regs, struct image_info *infop) { - struct linux_binprm bprm; + struct bsd_binprm bprm; int retval; int i; =20 diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 3c9d8c2845..6edceb3ea6 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -662,7 +662,7 @@ static abi_ulong copy_elf_strings(int argc, char **argv= , void **page, return p; } =20 -static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, +static abi_ulong setup_arg_pages(abi_ulong p, struct bsd_binprm *bprm, struct image_info *info) { abi_ulong stack_base, size, error; @@ -1143,7 +1143,7 @@ static void load_symbols(struct elfhdr *hdr, int fd) syminfos =3D s; } =20 -int load_elf_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, +int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, struct image_info *info) { struct elfhdr elf_ex; diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index eb66d15df7..c02e8a5ca1 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -115,7 +115,7 @@ extern unsigned long mmap_min_addr; * This structure is used to hold the arguments that are * used when loading binaries. */ -struct linux_binprm { +struct bsd_binprm { char buf[128]; void *page[MAX_ARG_PAGES]; abi_ulong p; @@ -133,9 +133,9 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_u= long sp, int loader_exec(const char *filename, char **argv, char **envp, struct target_pt_regs *regs, struct image_info *infop); =20 -int load_elf_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, +int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, struct image_info *info); -int load_flt_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, +int load_flt_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, struct image_info *info); =20 abi_long memcpy_to_target(abi_ulong dest, const void *src, --=20 2.22.1