From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 B7825C33C99 for ; Tue, 7 Jan 2020 07:09:32 +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 81CB82077B for ; Tue, 7 Jan 2020 07:09:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YSbg9Soz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81CB82077B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioizZ-0002Bn-Lp for qemu-devel@archiver.kernel.org; Tue, 07 Jan 2020 02:09:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42013) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioioE-0006lL-F6 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 01:57:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioioC-00041I-Ue for qemu-devel@nongnu.org; Tue, 07 Jan 2020 01:57:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35504 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioioC-00040m-RP for qemu-devel@nongnu.org; Tue, 07 Jan 2020 01:57:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578380264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VpOkeoKoXEKKyNRY7Ln59c934syBDj+3pmaQUilkUio=; b=YSbg9SozHpeSOerROQGrtY1rod7dLeGEikAL26b4/V7GbHkQnD4J+W0vm4L8GKpK9a+A5m ifQnNS/nWsQV/8F8a7FrV/KxvZapzkc1aqUSGjg2ft/sMrWVFK2JFU/pWE35IOFxrRK6aH uw/rmBglJ7rl1bvhbgL2dU3SYCA2r9c= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196-idweUGefOD275Hyudk9PIQ-1; Tue, 07 Jan 2020 01:57:42 -0500 Received: by mail-wr1-f70.google.com with SMTP id u12so28227035wrt.15 for ; Mon, 06 Jan 2020 22:57:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=VpOkeoKoXEKKyNRY7Ln59c934syBDj+3pmaQUilkUio=; b=tnUhEWf+1JzdwNGANpl7NFICDB4LtrTe5CXwnq/UnVAe269Dx6JdkE//xRppXsfjYI 8cnyV//CEmRrxEqyOU2Nli8eVR8brqlYcEYgCnFN0dewzRVyFDO83h4AoNL+3EqMi3QU wvfI9kWB4l2KG1wzjy4ZKbNF5cQLEPmLzAyFwgsGYddZQWmJaX062oefpqAIOQIRufnW qD/1vzEaiWSIpvrzRSU1y4pNDYuUvU45V/sU9nvLDSmQrvvyDbbUlwFBcN6Y9Qw97hva ZmxGGs5Ce/Y0DWONfVAjo1/9DXzw9sVdxa1df+c1HyXTzfDXWbtxSLCa2NLgfWmq1its Io8A== X-Gm-Message-State: APjAAAW29gEVFaHpw+wxELmKxFXg5UA9zXXJ7wUX8TlS7OILdEiRh5ku 7dFm2CLGtJMNxLkM06GLroFKZLXcaGWccYdFrYwTr48JdpLFf+imygzwHdhIGBpLxpXMnrsG3Lv vG5Rh1Sai+2tZ21U= X-Received: by 2002:adf:e641:: with SMTP id b1mr106561355wrn.34.1578380261441; Mon, 06 Jan 2020 22:57:41 -0800 (PST) X-Google-Smtp-Source: APXvYqxGELeSczwP4wCls3XD8md79K5yPaMZHjGnUtn7m0/MAvj0834Zc220gGFNAvm1J6GwpNo0rA== X-Received: by 2002:adf:e641:: with SMTP id b1mr106561333wrn.34.1578380261189; Mon, 06 Jan 2020 22:57:41 -0800 (PST) Received: from [192.168.1.35] (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id r68sm23696442wmr.43.2020.01.06.22.57.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Jan 2020 22:57:40 -0800 (PST) Subject: Re: [PATCH v1 57/59] linux-user/syscall.c: fix trailing whitespaces and style To: Daniel Henrique Barboza , qemu-devel@nongnu.org References: <20200106182425.20312-1-danielhb413@gmail.com> <20200106182425.20312-58-danielhb413@gmail.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Tue, 7 Jan 2020 07:57:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200106182425.20312-58-danielhb413@gmail.com> Content-Language: en-US X-MC-Unique: idweUGefOD275Hyudk9PIQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: qemu-trivial@nongnu.org, Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 1/6/20 7:24 PM, Daniel Henrique Barboza wrote: > There are trailing whitespaces in this file that, if removed > by a text editor that refuses to let the traiing whitespace typo "trailing" > alone, which happens to be the editor I am using, will cause > checkpatch.pl to warn about styling problems in the resulting > patch. This happens because the trailing whitespace lines > are using a deprecated style. Maybe you can use 'git add -p' to only add the lines with relevant changes. > To keep the intended change I wanted to do (remove unneeded > labels in do_ioctl_blkpg() and do_sendrecvmsg_locked()) > trivial, this patch is another trivial change to fix the > trailing whitespaces and the code style errors that > checkpatch.pl warns about. Doing this change beforehand will > keep the next patch focused just on the label removal changes. > > CC: Riku Voipio > CC: Laurent Vivier > Signed-off-by: Daniel Henrique Barboza > --- > linux-user/syscall.c | 30 +++++++++++++++++------------- > 1 file changed, 17 insertions(+), 13 deletions(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 171c0caef3..49c6151c2d 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -1062,7 +1062,7 @@ static inline rlim_t target_to_host_rlim(abi_ulong target_rlim) > { > abi_ulong target_rlim_swap; > rlim_t result; > - > + > target_rlim_swap = tswapal(target_rlim); > if (target_rlim_swap == TARGET_RLIM_INFINITY) > return RLIM_INFINITY; > @@ -1070,7 +1070,7 @@ static inline rlim_t target_to_host_rlim(abi_ulong target_rlim) > result = target_rlim_swap; > if (target_rlim_swap != (rlim_t)result) > return RLIM_INFINITY; > - > + > return result; > } > > @@ -1078,13 +1078,13 @@ static inline abi_ulong host_to_target_rlim(rlim_t rlim) > { > abi_ulong target_rlim_swap; > abi_ulong result; > - > + > if (rlim == RLIM_INFINITY || rlim != (abi_long)rlim) > target_rlim_swap = TARGET_RLIM_INFINITY; > else > target_rlim_swap = rlim; > result = tswapal(target_rlim_swap); > - > + > return result; > } > > @@ -1526,10 +1526,11 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh, > abi_ulong target_cmsg_addr; > struct target_cmsghdr *target_cmsg, *target_cmsg_start; > socklen_t space = 0; > - > + > msg_controllen = tswapal(target_msgh->msg_controllen); > - if (msg_controllen < sizeof (struct target_cmsghdr)) > + if (msg_controllen < sizeof(struct target_cmsghdr)) { > goto the_end; > + } > target_cmsg_addr = tswapal(target_msgh->msg_control); > target_cmsg = lock_user(VERIFY_READ, target_cmsg_addr, msg_controllen, 1); > target_cmsg_start = target_cmsg; > @@ -1610,8 +1611,9 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, > socklen_t space = 0; > > msg_controllen = tswapal(target_msgh->msg_controllen); > - if (msg_controllen < sizeof (struct target_cmsghdr)) > + if (msg_controllen < sizeof(struct target_cmsghdr)) { > goto the_end; > + } > target_cmsg_addr = tswapal(target_msgh->msg_control); > target_cmsg = lock_user(VERIFY_WRITE, target_cmsg_addr, msg_controllen, 0); > target_cmsg_start = target_cmsg; > @@ -5592,9 +5594,9 @@ abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr) > } > unlock_user_struct(target_ldt_info, ptr, 1); > > - if (ldt_info.entry_number < TARGET_GDT_ENTRY_TLS_MIN || > + if (ldt_info.entry_number < TARGET_GDT_ENTRY_TLS_MIN || > ldt_info.entry_number > TARGET_GDT_ENTRY_TLS_MAX) > - return -TARGET_EINVAL; > + return -TARGET_EINVAL; > seg_32bit = ldt_info.flags & 1; > contents = (ldt_info.flags >> 1) & 3; > read_exec_only = (ldt_info.flags >> 3) & 1; > @@ -5670,7 +5672,7 @@ static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr) > lp = (uint32_t *)(gdt_table + idx); > entry_1 = tswap32(lp[0]); > entry_2 = tswap32(lp[1]); > - > + > read_exec_only = ((entry_2 >> 9) & 1) ^ 1; > contents = (entry_2 >> 10) & 3; > seg_not_present = ((entry_2 >> 15) & 1) ^ 1; > @@ -5686,8 +5688,8 @@ static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr) > (read_exec_only << 3) | (limit_in_pages << 4) | > (seg_not_present << 5) | (useable << 6) | (lm << 7); > limit = (entry_1 & 0xffff) | (entry_2 & 0xf0000); > - base_addr = (entry_1 >> 16) | > - (entry_2 & 0xff000000) | > + base_addr = (entry_1 >> 16) | > + (entry_2 & 0xff000000) | > ((entry_2 & 0xff) << 16); > target_ldt_info->base_addr = tswapal(base_addr); > target_ldt_info->limit = tswap32(limit); > @@ -10554,8 +10556,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, > return get_errno(fchown(arg1, low2highuid(arg2), low2highgid(arg3))); > #if defined(TARGET_NR_fchownat) > case TARGET_NR_fchownat: > - if (!(p = lock_user_string(arg2))) > + p = lock_user_string(arg2); > + if (!p) { > return -TARGET_EFAULT; > + } > ret = get_errno(fchownat(arg1, p, low2highuid(arg3), > low2highgid(arg4), arg5)); > unlock_user(p, arg2, 0); >