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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 DD678C4363D for ; Fri, 2 Oct 2020 18:46:37 +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 255F4206C3 for ; Fri, 2 Oct 2020 18:46:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KrKKiF7R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 255F4206C3 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]:42360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kOQ4i-0002l3-4D for qemu-devel@archiver.kernel.org; Fri, 02 Oct 2020 14:46:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOQ3z-00028m-AF for qemu-devel@nongnu.org; Fri, 02 Oct 2020 14:45:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kOQ3v-0002rW-Rl for qemu-devel@nongnu.org; Fri, 02 Oct 2020 14:45:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601664345; 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=iJNPrlK91pj22z4V+LsEVtzGFM48MsVQxjlpmlq9114=; b=KrKKiF7Roo7s2X14LM0Vp5giahzCJj5mlqGhW+E0Q7nbjcGzZgFjl2mbqbEkLeJiCSz2yP 4p698pmb+3InykDZ+70PgS0DqzMEnwvowCkVuAjHC6PgV9b1S2Gi73N/nu0L0SdLahDTu2 rlhwVJKU/GSnDOiJ2kLL4AGUknxx0f0= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-vf9FvDmdMKyDngaa9-yC9g-1; Fri, 02 Oct 2020 14:45:43 -0400 X-MC-Unique: vf9FvDmdMKyDngaa9-yC9g-1 Received: by mail-wm1-f72.google.com with SMTP id a25so709890wmb.2 for ; Fri, 02 Oct 2020 11:45:43 -0700 (PDT) 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=iJNPrlK91pj22z4V+LsEVtzGFM48MsVQxjlpmlq9114=; b=BzYFICVRq4UNsuQRxuyfx4csfO8gMaokbg/7Bixt4H8FmPJgFYdzmsHLZ9AhbtEKsg I/+kf6PQNkjkGOOqdbXRR7iXikthK6rjR/iCj+by7fO4tAUxQXBBPLfvwayAGo+2NDvR yFPd0aQ96p/YXfZ+KXedgQlUAUhHbnYUlCKirkqA8wgLgOJIbsQcLpBzpOxnmD/4dCgy h89SqLvW9IcE2ZgbkNzX8sIAXsNvp/D4zXRnWha0el3YGYdo7lKpZlz6mLzPyx9kjttj BWc0LYLrN9+tzvGPduobUxJpInTHsXlb9QsBhkf+P+d6+vACcwSpy4N+fcrQLTRp8Phz lw7g== X-Gm-Message-State: AOAM533I4Vl9/iH7ISSRvTJ96mjzO30IGgTUhvpDCK9yZQNveSK4QGR+ bLb9gFIawaW0xdNoM7uhtOuSaQuZFRSt+GJdpNa8tPCvPH7DbqWGYlfleKaimRXXsUdyxqeQj3H bNprBDYL91LWzeYM= X-Received: by 2002:a1c:19c1:: with SMTP id 184mr4497918wmz.114.1601664342420; Fri, 02 Oct 2020 11:45:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNcIqp+G0VvCv3l+B0PlJA5pfBPRdsSx/cN9sVwilquiz8rN+yYg1Mfr4XvdLujhwtMthfhg== X-Received: by 2002:a1c:19c1:: with SMTP id 184mr4497902wmz.114.1601664342157; Fri, 02 Oct 2020 11:45:42 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:47e0:e742:75ba:b84d? ([2001:b07:6468:f312:47e0:e742:75ba:b84d]) by smtp.gmail.com with ESMTPSA id u12sm2710932wrt.81.2020.10.02.11.45.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Oct 2020 11:45:41 -0700 (PDT) Subject: Re: [PULL v8 00/86] Misc QEMU patches for 2020-09-24 To: Eduardo Habkost References: <20200930195850.278104-1-pbonzini@redhat.com> <5c9a0783-f7ea-7872-f5f4-44ba9e65a1b2@redhat.com> <20201002182457.GE7303@habkost.net> From: Paolo Bonzini Message-ID: <2be76d12-695b-363f-c74b-f1b461aec3df@redhat.com> Date: Fri, 2 Oct 2020 20:45:40 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20201002182457.GE7303@habkost.net> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/01 23:37:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 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, NICE_REPLY_A=-0.256, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?B?TWljaGFsIFByw612b3puw61r?= , qemu-devel@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 02/10/20 20:24, Eduardo Habkost wrote: > On Fri, Oct 02, 2020 at 06:27:35PM +0200, Paolo Bonzini wrote: >> On 02/10/20 17:58, Michal Prívozník wrote: >>>> >>> >>> cd442a45db60a1a72fcf980c24bd1227f13f8a87 is the first bad commit >>> >>> Sorry for noticing this earlier, but is this known? The build starts >>> failing for me after this commit: >>> >>> /usr/bin/sphinx-build -Dversion=5.1.50 -Drelease= -W >>> -Ddepfile=docs/devel.d -Ddepfile_stamp=docs/devel.stamp -b html -d >>> /home/zippy/work/qemu/qemu.git/build/docs/devel.p >>> /home/zippy/work/qemu/qemu.git/docs/devel >>> /home/zippy/work/qemu/qemu.git/build/docs/devel >>> Running Sphinx v3.2.1 >>> building [mo]: targets for 0 po files that are out of date >>> building [html]: targets for 20 source files that are out of date >>> updating environment: [new config] 20 added, 0 changed, 0 removed >>> reading sources... [100%] testing >> >> No, this is new. It works with older versions of Sphinx (I have 2.2.2 >> despite being on Fedora 32 which is pretty recent). >> >> For now Sphinx 3 is not supported by kerneldoc, we probably should apply >> a patch like >> >> https://www.spinics.net/lists/linux-doc/msg83277.html > > We already have Sphinx 3.x hacks inside our fork of kernel-doc, > see commit 152d1967f650 ("kernel-doc: Use c:struct for Sphinx 3.0 > and later"). > > If we want to keep deviating from upstream kernel-doc, the > following patch seems to work. Do we want to? > > Signed-off-by: Eduardo Habkost > --- > diff --git a/scripts/kernel-doc b/scripts/kernel-doc > index 40ad782e342..03b49380426 100755 > --- a/scripts/kernel-doc > +++ b/scripts/kernel-doc > @@ -838,6 +838,13 @@ sub output_function_rst(%) { > $lineprefix = ""; > output_highlight_rst($args{'purpose'}); > $start = "\n\n**Syntax**\n\n ``"; > + } elsif ($args{'functiontype'} eq "") { > + # this is a macro, Sphinx 3.x requires c:macro:: > + if ((split(/\./, $sphinx_version))[0] >= 3) { > + print ".. c:macro:: "; > + } else { > + print ".. c:function:: "; > + } > } else { > print ".. c:function:: "; > } >> >> Paolo >> > I can try sending these to upstream Linux, too. Paolo