From patchwork Wed May 14 19:00:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 889884 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2783437wrr; Wed, 14 May 2025 12:06:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5vFK52ciDlsWDk4JzAqCUWAQBzZWo6/6e/tQ/MRcBdGlxIe6sbxJOICA4upcc+6pdIKmUbQ==@linaro.org X-Google-Smtp-Source: AGHT+IGQca8I3wBxhvKkAEP3uCsVIv1Tm7ej3nc2UHCalC3Z+nqNI0d0UdzBo0ugVX+98LdzrShV X-Received: by 2002:ad4:5048:0:b0:6f8:997d:fc83 with SMTP id 6a1803df08f44-6f8997dfe2cmr37046756d6.23.1747249576683; Wed, 14 May 2025 12:06:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747249576; cv=none; d=google.com; s=arc-20240605; b=Pj7inIdN9QNmu1aWBx1q5sBnFW96/ac5VEjK6LQWhQtdEMw6o/dR0fZfoQgC1hlTsK kI0UP/dCH2EOjmiG1abeQCpAL0wjzXpaGcHfFG5qt7k0QTQxPdOiUhqsYBy/aulCPc7l z43G2BijPiFZnT/QXUJTUUQ9pdZkYomJjUnTicqeEgIP/Z6NIbB4g682Em3UVW7oy4fH p859jGw/Wf4ZN4SJ84t3LAOQRUhS6Kxz05/s/Xc7aeL+qkJhVjbace9SmrrNtokvaGfw JMppoQZ+HI8lPbQ+cOUW5IlOEqJNt0D8akuO/bRCzyXfwSuWTQv5IA81dC2+dA/N4ACA vKvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=Qvjpy9fii0rZ+pzDpXZbeaop6G3Ie27gLJJ6TkY9SC0=; fh=in5AYaflw3DFQzBcnu0CidqVfrZJS4E+AOESKz4G06s=; b=KgxKM35FIJcNyF4KseJaYlE++xR3PONzD+O8X2eZ71TDFIV5i23Foua6Yot0JlcGqr CkT1BrJBHq8VKf3JnUime2KdulcABj1SKEgYNvPBnrad6QU8Rtbp+99hssw/3unP1mQI lLUDApoDfdTyX86QTDHIfGtN/FAVyywqKSyYoENjSVv6s6Zkh86LJmgyUv8sn3fRo4Cw ZtiIUu7Mhw73uV9Av6rAlelWI3xVDzOxlzsBfmyjNR4xcz0hjpPjp+MaPEtD0CYJ9cEf CIiMrP3YVU3sanil46QPWmIVPH8JzICa2FiQNFo68dEl4HHnG62dVUrkfY978Ca68VR7 ygCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a58d93si142076626d6.411.2025.05.14.12.06.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 May 2025 12:06:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFHQA-0004YG-Kt; Wed, 14 May 2025 15:05:39 -0400 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 1uFHMN-00052Q-BK; Wed, 14 May 2025 15:01:44 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFHMK-0007ZB-Up; Wed, 14 May 2025 15:01:42 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B6E86121D99; Wed, 14 May 2025 22:00:32 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id BCC0220BA8B; Wed, 14 May 2025 22:00:42 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Dario Faggioli , Eric Blake , Pierrick Bouvier , Michael Tokarev Subject: [Stable-10.0.1 15/23] docs: Don't define duplicate label in qemu-block-drivers.rst.inc Date: Wed, 14 May 2025 22:00:27 +0300 Message-Id: <20250514190041.104759-15-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Sphinx requires that labels within documents are unique across the whole manual. This is because the "create a hyperlink" directive specifies only the name of the label, not a filename+label. Some Sphinx versions will warn about duplicate labels, but even if there is no warning there is still an ambiguity and no guarantee that the hyperlink will be created to the right target. For QEMU this is awkward, because we have various .rst.inc fragments which we include into multiple .rst files. If you define a label in the .rst.inc file then it will be a duplicate label. We have mostly worked around this by not putting labels into those .rst.inc files, or by adding "insert a label" functionality into the hxtool extension (see commit 1eeb432a953b0 "doc/sphinx/hxtool.py: add optional label argument to SRST directive"). Unfortunately in commit 7f6314427e78 ("docs/devel: add a codebase section") we accidentally added a duplicate label, because not all Sphinx versions warn about the mistake. In this case the link was only from the developer docs codebase summary, so as the simplest fix for the stable branch, we drop the link entirely. Cc: qemu-stable@nongnu.org Fixes: 1eeb432a953b0 "doc/sphinx/hxtool.py: add optional label argument to SRST directive" Reported-by: Dario Faggioli Signed-off-by: Peter Maydell Acked-by: Eric Blake Reviewed-by: Pierrick Bouvier Message-id: 20250501093126.716667-1-peter.maydell@linaro.org (cherry picked from commit 82707dd4f07613eed8d639956a43bddffca5cd5c) Signed-off-by: Michael Tokarev diff --git a/docs/devel/codebase.rst b/docs/devel/codebase.rst index ef98578296..085da10a22 100644 --- a/docs/devel/codebase.rst +++ b/docs/devel/codebase.rst @@ -116,7 +116,7 @@ yet, so sometimes the source code is all you have. * `monitor `_: `Monitor ` implementation (HMP & QMP). * `nbd `_: - QEMU `NBD (Network Block Device) ` server. + QEMU NBD (Network Block Device) server. * `net `_: Network (host) support. * `pc-bios `_: diff --git a/docs/system/qemu-block-drivers.rst.inc b/docs/system/qemu-block-drivers.rst.inc index cfe1acb78a..384e95ba76 100644 --- a/docs/system/qemu-block-drivers.rst.inc +++ b/docs/system/qemu-block-drivers.rst.inc @@ -500,8 +500,6 @@ What you should *never* do: - expect it to work when loadvm'ing - write to the FAT directory on the host system while accessing it with the guest system -.. _nbd: - NBD access ~~~~~~~~~~