From patchwork Fri Apr 30 17:27:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12233921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7204C433B4 for ; Fri, 30 Apr 2021 17:51:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E92461186 for ; Fri, 30 Apr 2021 17:51:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E92461186 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcXIM-0004Fe-2w for qemu-devel@archiver.kernel.org; Fri, 30 Apr 2021 13:51:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcWvt-0001Bs-90 for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:05 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]:46763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcWvp-0003mD-TO for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:04 -0400 Received: by mail-oi1-x22a.google.com with SMTP id m13so70677822oiw.13 for ; Fri, 30 Apr 2021 10:28:01 -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=88kJGdKOyrj+N0c0p0woyth0FHSFaX4rzOPFlVxWZbI=; b=sS+rzJPaaA3Ab+ObCYYMSSL09NWVbXzyj6uaPxd1dYDqvclr6Z5B8zZ5fa2E3oKbI4 RxRUy2KJBEFgM5uT+rPu0lc0aagkFpoMOTwwJLLFkp0nV9QyMDD5blR7og/QMTOYk3xn 4X5W3Yy156nhTxJy61uwZ4C3wqGTmE4EUMttm7Q6OeEYr0hSPlPplrWOnubZXT6p11JW 8WUHpJ8sFQJOtEohsmBS16cEIDLGfbxBteAwyS9rty+7QbeIR4I6x92r3P6MPJ5M/Z9a sTxkwfzfeVu2GuGQc7owW4JcUanQTHHfTj4DBZwTCU377nCMsHdmwCfX/+ouCSrUKe2Q JPrw== 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=88kJGdKOyrj+N0c0p0woyth0FHSFaX4rzOPFlVxWZbI=; b=VsBAx6xF3S8iVMvQB+GLt5hMushaCpykif0zLCwPA6mK5X4y9H/jl9Fu8gMdC4+I7h WCj1FvoWtwoZrbiYyKoksMpgSt36cNGuA3vi8cQkzRw/7ji/CucgY1Z4yn4TwHiqhJPw DdC658Gfh60PF8/SAEr2/gLy/xb+jsCD78WlL+YpiBRgsgQepk6rkFXayrpIbnT+sjzD Ya5mC8Wx8ZwXM1GeRH5y5ugH78XRPZlkk59RoIJHyBUZtXr+SMQe6lFXTjXyGyDTSLCb eb9uw8WTrotz1ahQDOpbPDiuY7fhh54Jc4xtQcwkKPDvw7CHGOUzQWL1qRFLFyrOjrh9 wxYg== X-Gm-Message-State: AOAM533i8NFq7g1RfNxP9JKwVZw6DrGmHBjJ5N4Gn1jUfHEkprodft0+ NaTMcN26GvOZ5kqEBSD8rmFcEfgP2629wg== X-Google-Smtp-Source: ABdhPJznHyYCyjrt14w4j2kfl3kUr+tZumAhhIa5ul5VH9UzoSjko/nrBi15VbfLyjIZeKnaPXwaQw== X-Received: by 2002:aca:d70b:: with SMTP id o11mr4668306oig.151.1619803680430; Fri, 30 Apr 2021 10:28:00 -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 d207sm297587oob.7.2021.04.30.10.27.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 10:27:59 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 1/5] bsd-user: whitespace changes Date: Fri, 30 Apr 2021 11:27:42 -0600 Message-Id: <20210430172746.99818-2-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210430172746.99818-1-imp@bsdimp.com> References: <20210430172746.99818-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::22a; envelope-from=imp@bsdimp.com; helo=mail-oi1-x22a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" keyword space paren, no space before ( in function calls, spaces around operators. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/bsdload.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index f38c4faacf..546946b91d 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -20,11 +20,11 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, return 0; } -static int count(char ** vec) +static int count(char **vec) { int i; - for(i = 0; *vec; i++) { + for (i = 0; *vec; i++) { vec++; } @@ -37,15 +37,15 @@ static int prepare_binprm(struct linux_binprm *bprm) int mode; int retval; - if(fstat(bprm->fd, &st) < 0) { + if (fstat(bprm->fd, &st) < 0) { return(-errno); } mode = st.st_mode; - if(!S_ISREG(mode)) { /* Must be regular file */ + if (!S_ISREG(mode)) { /* Must be regular file */ return(-EACCES); } - if(!(mode & 0111)) { /* Must have at least one execute bit set */ + if (!(mode & 0111)) { /* Must have at least one execute bit set */ return(-EACCES); } @@ -53,7 +53,7 @@ static int prepare_binprm(struct linux_binprm *bprm) bprm->e_gid = getegid(); /* Set-uid? */ - if(mode & S_ISUID) { + if (mode & S_ISUID) { bprm->e_uid = st.st_uid; } @@ -69,10 +69,10 @@ static int prepare_binprm(struct linux_binprm *bprm) memset(bprm->buf, 0, sizeof(bprm->buf)); retval = lseek(bprm->fd, 0L, SEEK_SET); - if(retval >= 0) { + if (retval >= 0) { retval = read(bprm->fd, bprm->buf, 128); } - if(retval < 0) { + if (retval < 0) { perror("prepare_binprm"); exit(-1); /* return(-errno); */ @@ -125,15 +125,15 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, return sp; } -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) { struct linux_binprm bprm; int retval; int i; - bprm.p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int); - for (i=0 ; i=0) { + if (retval >= 0) { if (bprm.buf[0] == 0x7f && bprm.buf[1] == 'E' && bprm.buf[2] == 'L' && bprm.buf[3] == 'F') { - retval = load_elf_binary(&bprm,regs,infop); + retval = load_elf_binary(&bprm, regs, infop); } else { fprintf(stderr, "Unknown binary format\n"); return -1; } } - if(retval>=0) { + if (retval >= 0) { /* success. Initialize important registers */ do_init_thread(regs, infop); return retval; } /* Something went wrong, return the inode and free the argument pages*/ - for (i=0 ; i X-Patchwork-Id: 12233919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A87F6C433B4 for ; Fri, 30 Apr 2021 17:49:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1166F61469 for ; Fri, 30 Apr 2021 17:49:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1166F61469 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcXGF-0002S2-BK for qemu-devel@archiver.kernel.org; Fri, 30 Apr 2021 13:49:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcWvt-0001C9-E4 for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:05 -0400 Received: from mail-oo1-xc36.google.com ([2607:f8b0:4864:20::c36]:36477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcWvq-0003mx-N3 for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:05 -0400 Received: by mail-oo1-xc36.google.com with SMTP id c6-20020a4aacc60000b02901e6260b12e2so13179621oon.3 for ; Fri, 30 Apr 2021 10:28:02 -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=OenvJJJ3X+Wq8Y9NxLH1nYHg0VleC8tnRAqVxJQdJCI=; b=WMvYncXQwvQjPfnyghBq97APifyAgGdgDIC29qFfn397zpsPIXd46yY7eYmDRs3w7E sRf2/Z7OoWO6Ej88eoDa71+ve0NqsYsYW+tVLGcAPPQ12nPBSX89eXG2HHkh8zccObjf J2ZYP/4D/EkxScaJCQWLsEM3lMMYSt2tq4k/Q1zXPx4FyuC5iIKboz7Sp6464pW8Kxh9 XXdbdBU9WcRcen4+qVnsMWWahB/Ej6RQYCU6TrJTXvojsCszedoR4YHz/kUK3l57EOlU OCR1xPCCiqfeSn1SpR1rm2r4/h9x74NsoozZxNCuTGCskB7R5B82dkU62ACLc5B4a12H NV5g== 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=OenvJJJ3X+Wq8Y9NxLH1nYHg0VleC8tnRAqVxJQdJCI=; b=pT+Pdf8IN5IBqP+qVt7M+50FkSQbInz9WqhSox1y82yPEuAgfBG/7d9lXkNmypLKf0 0o48hcW+O7x0ApLyw0JlXHzEwyEZFCvkPVXQNNNXkewyZFOQefWTGFwoAjAGlfah2VTs od3BkBdziGxT9/o442x4/ZXvOQz4UJ2HLiZQ7aPuC17bzya0Jb07LvHlKUQy9jgm/B4q VAGOQYblNltTMC+5Cd+uRPx2ua1NvOKca7wqsDfhH4jG04QhjqKPGhiACriS2pX53S9N tbiw6cDL28jm6jQwSSZdm7+p1AiFLNipy3JwdhbpKqw32AyG73tPsbZo69kEHfEhXqrI R37w== X-Gm-Message-State: AOAM531A0tLt869v3hBnsXtVRy7QjG+ylA3RjyjyfRMwbAgm7JkbJxu+ F2sBIVSPxZUkfn2Aib6WL1okixTu4iL0JQ== X-Google-Smtp-Source: ABdhPJwqQpXYkPP/uBvXsrqKo50ArEqIrOEh1I+nPn6fCjbEvEsu0/2haOdNuD9yhFp3aRQeUA1LSg== X-Received: by 2002:a4a:c689:: with SMTP id m9mr5389864ooq.70.1619803681301; Fri, 30 Apr 2021 10:28:01 -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 d207sm297587oob.7.2021.04.30.10.28.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 10:28:00 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 2/5] bsd-user: style tweak: keyword space ( Date: Fri, 30 Apr 2021 11:27:43 -0600 Message-Id: <20210430172746.99818-3-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210430172746.99818-1-imp@bsdimp.com> References: <20210430172746.99818-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::c36; envelope-from=imp@bsdimp.com; helo=mail-oo1-xc36.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/qemu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index d2bcaab741..b836b603af 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -233,7 +233,7 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size) #define __put_user(x, hptr)\ ({\ int size = sizeof(*hptr);\ - switch(size) {\ + switch (size) {\ case 1:\ *(uint8_t *)(hptr) = (uint8_t)(typeof(*hptr))(x);\ break;\ @@ -255,7 +255,7 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size) #define __get_user(x, hptr) \ ({\ int size = sizeof(*hptr);\ - switch(size) {\ + switch (size) {\ case 1:\ x = (typeof(*hptr))*(uint8_t *)(hptr);\ break;\ From patchwork Fri Apr 30 17:27:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12233931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65D9DC433ED for ; Fri, 30 Apr 2021 18:09:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 181BB61468 for ; Fri, 30 Apr 2021 18:09:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 181BB61468 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcXZt-0002yu-1Y for qemu-devel@archiver.kernel.org; Fri, 30 Apr 2021 14:09:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcWvt-0001Cx-Ql for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:05 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]:38782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcWvr-0003nY-Pf for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:05 -0400 Received: by mail-oi1-x22a.google.com with SMTP id d25so33185484oij.5 for ; Fri, 30 Apr 2021 10:28:03 -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=0Fz+RgLlV/5d3FX/11NndYX6n76xs9r7NNgNsOK4IgI=; b=vi0+EeMjleH3uSmWGbCdvu/kRkNqCKH+LFk2L4zSCvfdL1JYR5itxQam2J7qQpN9k+ zZJXlFA7JruffL6qd4EWK6jgTQ4gSaAL2RqjSC55GhJHiDs+7hGzBwog2eM/fiN9aLeZ hmm4dEsY318qP08Itc1GASr1rj5g0qCVpwO9w1LoO5KeTg4kR5xkLtRyqMiSpQOxYc7n u0GBvMj6gf1hLneBsSZnUcVU7tJiijpxMJrqx/xHU6o0lMARnj7hAO/0Zxn8jQ8JHnuc Dkg2U92t1lv1eIo13KGWnTens0U8UYvHXYW6rkZEGuUXV+Evk6d5WOkavHodHV9hOx5Q a/9g== 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=0Fz+RgLlV/5d3FX/11NndYX6n76xs9r7NNgNsOK4IgI=; b=bfm8j4PDgme0Wmxpca4C9DAnYC47GEnmBUwk3IF1/oqW6Miym9Pb/AlToEkEyNhrDp D4ilax38JLnLIDI2zwgCInCIM/n8q8FuQX3AtcCh8Q/6OJl0Cw1Q2X8yw1XSmg5Dk8/m gq787bSknqMnZ0Sn+FaS7d1Cio4bwNX5o9oEhklw1odNaPOn9HQsFKgTxqJmXFWInFCC wouiP+tgWRKuxmAFcxdnEByORco1DnqdU65S2FIqlG7LXIyWmXTF+rBfTaeO5gZhTYoC YR4G0ZBMcFH3R/fHZAPe2oyA1wmCuOE+Y0PPVWSCRwV7I9kx/hHM3RcWPK3II7f9i2Wh sivA== X-Gm-Message-State: AOAM533JcjezX4DCMmrvNCFRQ54BIUlxLyCfP7m1RlUAVOx+6hsf5tIX UQDiBWV70SyAc1M9yBLT92IrfT5QpBBb5g== X-Google-Smtp-Source: ABdhPJy+Qv2uK6iYq3p9Pjm0/jd609OKFLKtPjSIBqcpbCWnD1HKgS3VRPDKIIb8g224sq9TdIwXuw== X-Received: by 2002:aca:d416:: with SMTP id l22mr4835137oig.124.1619803682215; Fri, 30 Apr 2021 10:28:02 -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 d207sm297587oob.7.2021.04.30.10.28.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 10:28:01 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 3/5] bsd-user: style tweak: return is not a function, eliminate () Date: Fri, 30 Apr 2021 11:27:44 -0600 Message-Id: <20210430172746.99818-4-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210430172746.99818-1-imp@bsdimp.com> References: <20210430172746.99818-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::22a; envelope-from=imp@bsdimp.com; helo=mail-oi1-x22a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/bsdload.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index 546946b91d..fd14ffa4cd 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -28,7 +28,7 @@ static int count(char **vec) vec++; } - return(i); + return i; } static int prepare_binprm(struct linux_binprm *bprm) @@ -38,15 +38,15 @@ static int prepare_binprm(struct linux_binprm *bprm) int retval; if (fstat(bprm->fd, &st) < 0) { - return(-errno); + return -errno; } mode = st.st_mode; if (!S_ISREG(mode)) { /* Must be regular file */ - return(-EACCES); + return -EACCES; } if (!(mode & 0111)) { /* Must have at least one execute bit set */ - return(-EACCES); + return -EACCES; } bprm->e_uid = geteuid(); @@ -75,10 +75,9 @@ static int prepare_binprm(struct linux_binprm *bprm) if (retval < 0) { perror("prepare_binprm"); exit(-1); - /* return(-errno); */ } else { - return(retval); + return retval; } } @@ -169,5 +168,5 @@ int loader_exec(const char *filename, char **argv, char **envp, for (i = 0 ; i < MAX_ARG_PAGES ; i++) { g_free(bprm.page[i]); } - return(retval); + return retval; } From patchwork Fri Apr 30 17:27:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12233963 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26F7CC43460 for ; Fri, 30 Apr 2021 18:16:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 99E8A6146D for ; Fri, 30 Apr 2021 18:16:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99E8A6146D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcXgL-0005fx-FN for qemu-devel@archiver.kernel.org; Fri, 30 Apr 2021 14:16:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcWvu-0001FH-Nk for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:06 -0400 Received: from mail-oo1-xc32.google.com ([2607:f8b0:4864:20::c32]:43995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcWvs-0003nf-HZ for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:06 -0400 Received: by mail-oo1-xc32.google.com with SMTP id p6-20020a4adc060000b02901f9a8fc324fso2026114oov.10 for ; Fri, 30 Apr 2021 10:28:04 -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=L6Xf956Ggs9i29nhhZxcpOFa3qNKKv09WnMU85+P6h8=; b=uvZz5Ta22xKZRUKsxP0XoF0vUFUEojichcGTX34vJg+SE7nXYSdRZIoDpaopuAKbFx 6TQQyTLVwvZxoHVJON6kyZoAadTzX9onxw9ZprafQ4hLE3SDiV/HjzGOsamx8eTn7RyD 4Oq/c+y5k4jKq2jsIxefD3fgJyiyged6qQjOM03/1Uu0E8aC3vJeVeYpwwaEWgTlCXQm ACY7SkZMG1J7ZTgWKvya2BmzbRqMQVFA5oKX4jt51VFT2NS7Xawo/cAn9JvxCJVgNhe6 tKSVxB3ojDUBXqKmL9Sqpxvgpx/MTbBnTIkWVi35slUDYu2Ln02yuPrq2CPJtzWwJIOw aGhA== 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=L6Xf956Ggs9i29nhhZxcpOFa3qNKKv09WnMU85+P6h8=; b=R0woxaX5Ec0sD7bKp8uoUYRpe973zjbbueJkpxCRTjgZCsz2HobC/wMiBAuRILH5ys N9OhCXWULcNWj+baEdZ81r+2kJ1jgl94VkYwnn4w2srW/ki8WgIeyglc4JpDgBLga2cQ QDuU2v7MMASdfi+w9JwnVpF/kS/EodhwGLQnnzCuRZ6153DyEOactP/4etnSbKXeJb2D 8+E0cfch2NgRjhpidz//MpOo/Lq+vIlCjzmO3VBGPeaN3hKDpodFsRW2RurBMLrS5zU2 WMiSfNsDPRYR+SoZMrrbnXkrzHXC5BC0GxVPn/QrX7YjTpc63sHL2w+dqthXeP0eOK5g mriQ== X-Gm-Message-State: AOAM53261X8kKeEA+XIKnO/1ogIEI0Q19CAEuRFnM4AxVc124Bpdx0i0 leIePjvckfmsnuHBAse9YqkPl01gbPg5NA== X-Google-Smtp-Source: ABdhPJxqAT0U6UAECQZeX0lamgXR1hMlzDZWSY5FSTm09Z2psMrrnAUTkOHgXQXMQgfmhlcKSlqrjw== X-Received: by 2002:a4a:da4e:: with SMTP id f14mr5404600oou.88.1619803683198; Fri, 30 Apr 2021 10:28:03 -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 d207sm297587oob.7.2021.04.30.10.28.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 10:28:02 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 4/5] bsd-user: put back a break; that had gone missing... Date: Fri, 30 Apr 2021 11:27:45 -0600 Message-Id: <20210430172746.99818-5-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210430172746.99818-1-imp@bsdimp.com> References: <20210430172746.99818-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::c32; envelope-from=imp@bsdimp.com; helo=mail-oo1-xc32.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/syscall.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index adc3d21b54..4abff796c7 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -199,6 +199,7 @@ static int sysctl_oldcvt(void *holdp, size_t holdlen, uint32_t kind) #else case CTLTYPE_LONG: *(uint64_t *)holdp = tswap64(*(long *)holdp); + break; case CTLTYPE_ULONG: *(uint64_t *)holdp = tswap64(*(unsigned long *)holdp); break; From patchwork Fri Apr 30 17:27:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12233925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92C92C433ED for ; Fri, 30 Apr 2021 17:52:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E667A61456 for ; Fri, 30 Apr 2021 17:52:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E667A61456 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcXJh-000682-Sm for qemu-devel@archiver.kernel.org; Fri, 30 Apr 2021 13:52:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcWvv-0001HH-Ic for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:07 -0400 Received: from mail-oo1-xc30.google.com ([2607:f8b0:4864:20::c30]:47092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcWvt-0003nz-Na for qemu-devel@nongnu.org; Fri, 30 Apr 2021 13:28:07 -0400 Received: by mail-oo1-xc30.google.com with SMTP id k26-20020a4adfba0000b02901f992c7ec7bso2218270ook.13 for ; Fri, 30 Apr 2021 10:28:05 -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=fseFyTir1UuEOvm76mfhyfMzoaGC4uNp7JEOiDXfHFs=; b=PRoCjOb5ZSKO02WqT030zeRZd3n8Km36wBCk7vwSyPP7bxrFWMma0ybvEcM1wZhvz0 A0kf5EyfsPnhe8wJjUJmEAq/04LSHxl+i+RjR3BlMFoyJsMaMm3Rp/Rb//VBUlRNIiWr rj1QzPCG15D1iXuKBkl+l7QOZtmFKNZTqgprBgbMCAe6KBUTNgGN4fTrPEixlZtgFIQH JGx8np5//iUCjZGhpzGyheR1WcDiWddagTu2dQW8sEdQS//0W0bfGrvRxsSWVjdMOBI1 5rrN3bShpyayWuVAuCksfWkeAoMakupWhs/mAnbZmBvAWgbYxDamWrwyrJRZNHL3yqY2 AZ1Q== 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=fseFyTir1UuEOvm76mfhyfMzoaGC4uNp7JEOiDXfHFs=; b=AyT7M1BWRk8EL2p86+RuB/oEpIXBBlQKSy0yu5B8k0V2aeYbuNgndwGkiEi1jaT7WG m5dSVn5Sff2SZFl2ipJlWYNp1sjLbsxgEsTxYH22JNwDt7/5cxGkIaIHNTa2dAN2hGFz A3xDd81daw0/creH9MY+x16GJP953qVlOcNibXRniCOgRTw3ceZ/Ri7Wzo0WGDLiwDcG K87MY7qfFTnjb0+INOTfRkGo7NvCS1X8GRf3i38rLsJF/u/zvnl+9NANTDAcqK5baeMP c0G3MAznPhX5DDidGTyn18rj/ZVYXpg8rNlPG4Wo5Rr/Y9U6RLh04okDcT6zzJJT6JtQ aq5g== X-Gm-Message-State: AOAM530N4pPxCETp+NCvjaNqZfsSOuee0oJMmk4daZf3CLoH65qWvPSl H0ghCvhGM0LTG0I09m4k84gg0WrVdiCVaw== X-Google-Smtp-Source: ABdhPJxiA27uwAkaBVvGkRi4OF57wJA7eOSueXraEXSDUmgunZEkf34vnarO58f1Qg5TNEVOYZ4nKQ== X-Received: by 2002:a4a:d02a:: with SMTP id w10mr5390947oor.72.1619803684303; Fri, 30 Apr 2021 10:28:04 -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 d207sm297587oob.7.2021.04.30.10.28.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 10:28:03 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 5/5] bsd-user: style tweak: Put {} around all if/else/for statements Date: Fri, 30 Apr 2021 11:27:46 -0600 Message-Id: <20210430172746.99818-6-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210430172746.99818-1-imp@bsdimp.com> References: <20210430172746.99818-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::c30; envelope-from=imp@bsdimp.com; helo=mail-oo1-xc30.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/bsdload.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index fd14ffa4cd..e1ed3b7b60 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -13,8 +13,9 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, void *host_ptr; host_ptr = lock_user(VERIFY_WRITE, dest, len, 0); - if (!host_ptr) + if (!host_ptr) { return -TARGET_EFAULT; + } memcpy(host_ptr, src, len); unlock_user(host_ptr, dest, 1); return 0; @@ -75,8 +76,7 @@ static int prepare_binprm(struct linux_binprm *bprm) if (retval < 0) { perror("prepare_binprm"); exit(-1); - } - else { + } else { return retval; } } @@ -132,11 +132,13 @@ int loader_exec(const char *filename, char **argv, char **envp, int i; bprm.p = TARGET_PAGE_SIZE * MAX_ARG_PAGES - sizeof(unsigned int); - for (i = 0 ; i < MAX_ARG_PAGES ; i++) /* clear page-table */ + for (i = 0 ; i < MAX_ARG_PAGES ; i++) { /* clear page-table */ bprm.page[i] = NULL; + } retval = open(filename, O_RDONLY); - if (retval < 0) + if (retval < 0) { return retval; + } bprm.fd = retval; bprm.filename = (char *)filename; bprm.argc = count(argv);