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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 56D50C636CD for ; Wed, 1 Feb 2023 14:56:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNEV9-00056K-Av; Wed, 01 Feb 2023 09:54:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNEV5-0004iT-S5 for qemu-devel@nongnu.org; Wed, 01 Feb 2023 09:54:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNEV4-0007mZ-6S for qemu-devel@nongnu.org; Wed, 01 Feb 2023 09:54:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675263253; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=rli+7QqLtkD0IltQemu/9idMcsAx9s7XKPRZlDuPyks=; b=ZbJO0skl50KFbF+J3vZ0aDEQKTxwTdQaVy0VSCla9c81cIObjDXDqkmkTM4KQo0njaw3w1 e4hDgIsfxTi8jiZ7CrWR+4uE+ubWvvnX/axla17j6BxM+maHHdpo690Hluz4uYnDDsv/gS 7rbnu+QsEKC7OwbEy/7TdxQM1WY4R6g= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-558-Hopj-Pc2PJSfntanvg4RRQ-1; Wed, 01 Feb 2023 09:54:11 -0500 X-MC-Unique: Hopj-Pc2PJSfntanvg4RRQ-1 Received: by mail-wm1-f69.google.com with SMTP id j37-20020a05600c1c2500b003deaf780ab6so966841wms.4 for ; Wed, 01 Feb 2023 06:54:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:reply-to:user-agent:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rli+7QqLtkD0IltQemu/9idMcsAx9s7XKPRZlDuPyks=; b=Xk/txuSqlh4K8u+CURtzsxg3QFKAbE8dEih/xBsXeeLUEXdU44gsxpiHcqzu4OUdtY NFEAAnSjlVbfdzU5Uo7VD0p43uZwtEd4ks/X+pADjTKcYx+rPcl4wr3FddpY80OoLulQ ntUGqKh5jyRT5V1QpKvPGcvZSx3ERLggoPg+cC9yn8DlVsUWTu79fkSBGcPb4b4sB9KX KS+Ft2U+FGJ8GSxxbXTI8ug2Ul4/3gUUIcY8YDjGZk6X9+A9TAUBNM5mDHqSRnVPRJ18 6MYku/JsP3w8ZCe1RwfUQV1LQgKM8h0+Ev6gfQk+p2KBoLd+TVNS01bU57WZycn95jvk jyiA== X-Gm-Message-State: AO0yUKVaxu6RLCdyA9QrjVfd/HGnMQzQ61WdSaFTmBDkp1wLLHvGyh8m tuLvqU53GJw+nTkg5viYUSqgldHBxOwX5qRrS3TzImvkHGym2CSkSC5EctToP9VP2wmsZqFKB7n vGC+uZQ/6PsIqxS4= X-Received: by 2002:a5d:6f08:0:b0:2be:110d:5d59 with SMTP id ay8-20020a5d6f08000000b002be110d5d59mr2846014wrb.51.1675263250848; Wed, 01 Feb 2023 06:54:10 -0800 (PST) X-Google-Smtp-Source: AK7set81sQiLFlKfIUP9BniB+PZyYqM10ctV5D/EhpK12WABCrtD7J2sZ27y5TEcMD65gUfJsLXOGA== X-Received: by 2002:a5d:6f08:0:b0:2be:110d:5d59 with SMTP id ay8-20020a5d6f08000000b002be110d5d59mr2845979wrb.51.1675263250584; Wed, 01 Feb 2023 06:54:10 -0800 (PST) Received: from redhat.com ([46.136.252.173]) by smtp.gmail.com with ESMTPSA id k4-20020a5d66c4000000b002bdc19f8e8asm17616608wrw.79.2023.02.01.06.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 06:54:10 -0800 (PST) From: Juan Quintela To: Markus Armbruster Cc: qemu-devel@nongnu.org, richard.henderson@linaro.org, pbonzini@redhat.com, kwolf@redhat.com, hreitz@redhat.com, imp@bsdimp.com, kevans@freebsd.org, berrange@redhat.com, groug@kaod.org, qemu_oss@crudebyte.com, mst@redhat.com, philmd@linaro.org, peter.maydell@linaro.org, alistair@alistair23.me, jasowang@redhat.com, jonathan.cameron@huawei.com, kbastian@mail.uni-paderborn.de, dgilbert@redhat.com, michael.roth@amd.com, kkostiuk@redhat.com, tsimpson@quicinc.com, palmer@dabbelt.com, bin.meng@windriver.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Subject: Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message In-Reply-To: <87cz6twldq.fsf@pond.sub.org> (Markus Armbruster's message of "Wed, 01 Feb 2023 14:44:33 +0100") References: <20230130132156.1868019-1-armbru@redhat.com> <20230130132156.1868019-5-armbru@redhat.com> <87sffsnmb2.fsf@secure.mitica> <875ycly2h5.fsf@pond.sub.org> <87bkmdfrys.fsf@secure.mitica> <87cz6twldq.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Date: Wed, 01 Feb 2023 15:54:09 +0100 Message-ID: <877cx11lny.fsf@secure.mitica> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: quintela@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Markus Armbruster wrote: > Juan Quintela writes: > >> Markus Armbruster wrote: >>> Juan Quintela writes: >>> >>>> Markus Armbruster wrote: >>>>> The script drops #include "qemu/osdep.h" from headers. Mention it in >>>>> the commit message it uses for --git. >>>>> >>>>> Signed-off-by: Markus Armbruster >>>>> --- >>>>> scripts/clean-includes | 4 ++-- >>>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/scripts/clean-includes b/scripts/clean-includes >>>>> index f0466a6262..f9722c3aec 100755 >>>>> --- a/scripts/clean-includes >>>>> +++ b/scripts/clean-includes >>>>> @@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then >>>>> git commit --signoff -F - <>>>> $GITSUBJ: Clean up includes >>>>> >>>>> -Clean up includes so that osdep.h is included first and headers >>>>> -which it implies are not included manually. >>>>> +Clean up includes so that qemu/osdep.h is included first in .c, and >>>>> +not in .h, and headers which it implies are not included manually. >>>> >>>> I give a tree. >>>> >>>> Clean up includes so qemu/osdep.h is never used in .h files. It makes >>>> sure that qemu/osdep.h is only used in .c files. Once there, it assures >>>> that .h files already included in qemu/osdep.h are not included a second >>>> time on the .c file. >>>> >>>> What do you think? >>> >>> Neglects to mention qemu/osdep.h goes first in .c. >> >> /me tries again >> >> What about: >> >> The file qemu/osdep.h should only be included in .c files. And it has >> to be the first included file. > > Suggest "has to be included first." Ok to this change. > >> This script does several things: >> - Remove qemu/osdep.h from .h files. > > Correct. Could say "inclusion of qemu/osdep.h" I try to minimize whatever word that "includes" "includ*" (pun intended). >> - If qemu/osdep.h is included in a .c file it is moved to the first >> included position if it is anywhere else. > > Not quite. The script ensures all the .c include it, and include it > first. Oh, then it is easier. - It ensures that qemu/osdep.h is the first included file in all .c files. >> - Remove from .h files all include files that are already present in >> qemu/osdep.h. > > They're removed from .h, too. Ah, didn't know this bit. > Sure you want to continue wordsmithing? ;) Yeap, I *hate* error messages that I can't parse (or have to read it ten times before I understand them). So, we end with: The file qemu/osdep.h should only be included in .c files. And it has to be included first. This script does three things: - Remove qemu/osdep.h from .h files. - It ensures that qemu/osdep.h is the first included file in all .c files. - Include files contained in qemu/osdep.h are removed form all .c and .h files. Is this better? Later, Juan.