From nobody Mon Apr 29 06:47:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1604958402; cv=none; d=zohomail.com; s=zohoarc; b=nKm1UDoCDQKWsSYh/JBOyQv4GkPZyRDvfnUjz3Aqw/7vdsZM769WH5QALjty/Hi7dbztAmABZXAhyzRJhYImESFnXjZsyaFCwLC6SPlzfpYYUUhEh7pi+O66Dgmd2nJ1t0RJPxSY8fGl13guF2LvEgKC4nLPSQ0jQR4OYeqwrWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604958402; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XSlTwROngisV9GGszX9Z7cojgUz4hcgCRiSSYiH/DTA=; b=EYY0LcCVuRJ6NMt2n9OQetkf4HomjD2xLVupg3cb6GqlXw8b7l2S18SEHSZT+vyPd/hv684/nj79i3BrTi88vJc4BqrMi7nR4/eLDoJ8rHoArYd9giw0l2KyTkFAOf1pGPwLOLYCFG5Fkknl4i227uCNdaQ6OFgZ4fZ19l3LBNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604958402126844.6117005519014; Mon, 9 Nov 2020 13:46:42 -0800 (PST) Received: from localhost ([::1]:53420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcEzo-0001RF-Ou for importer@patchew.org; Mon, 09 Nov 2020 16:46:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcExi-00085C-F7 for qemu-devel@nongnu.org; Mon, 09 Nov 2020 16:44:30 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcExe-0007fB-Fb for qemu-devel@nongnu.org; Mon, 09 Nov 2020 16:44:30 -0500 Received: by mail-wm1-x32d.google.com with SMTP id c16so982962wmd.2 for ; Mon, 09 Nov 2020 13:44:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e3sm14913252wrn.32.2020.11.09.13.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 13:44:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XSlTwROngisV9GGszX9Z7cojgUz4hcgCRiSSYiH/DTA=; b=M20kL2kq+DpIVCP7nWjz40dfJRHZuR4G3a8AWnriKYTfDc9ot1FB3awLXeKZHPjWLx HMZ1XdhIYP/gJnJc6LNotwzWR2XiQoS9nG2MLFo31PrQv3erMe8xllVUg9PjSiUCy/fK T/ZbBr8IZARZytAMVikWko7/dMla8e9F4LrlIO2CugDsbHzqjOzI42xu0GIPCZPx8xmS R5WgqWn2c5pqBB4Z+sfM8zgrlBwPVAHPQx3f6RseTL224IJ3xMiSQfGeeuXQpP0oIbOl Pp8DqGQfkRQ6r3T2AKXUt7qJOXVxngE1ZVx1cl47CbyBHUFPTEYtYgbRbItsgajNUXo/ YEFQ== 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=XSlTwROngisV9GGszX9Z7cojgUz4hcgCRiSSYiH/DTA=; b=Yk+4tXIqcSPhTQdRxxbttE8rrhDiICg062yJGM1vJZgGZyKipW4hopSfmotQCCv3MZ pDePN83NR/5VT7WPFQlnYC6znoqMFllstoXjMewY0Ci3zeQgoki7CniMFrmOMSD1jOjn Z4qYzK4RxDuLnY9ZNoG5WJwWzorWza7bGhHftVeL+KJRkDsW51WxWk2C2q5HEZu/aHw+ WtYZBKnxiC352K+fuWuut1DWOnIEW1/CMEMI8ZBOebe/v1l531O0DOZbgEW5aihDRnUq PFGQ9uqEQG1OpKxd1YygEDd62dvRvkfH+ahTHY/c9A6UED8iiNIKMAo6L42qgTxecJOG Pyvg== X-Gm-Message-State: AOAM530K/NjwIg0PTHud7DTSS8pFlvra+L6/8M2vObEJ4MvBsWrHAYVs M/SCQGA6HwMylCOxLovR/XrFmCKqmG/gkw== X-Google-Smtp-Source: ABdhPJyRb644MV2maV8+xV2bexIXxFo8Rsjr8Y3Fo9JWjRg5SQwmMvvgiSloyILu8J1JaBYeZnbxNg== X-Received: by 2002:a1c:dd41:: with SMTP id u62mr1198353wmg.78.1604958263841; Mon, 09 Nov 2020 13:44:23 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [RFC 1/2] docs: Mark rst files in the top level directory as orphan Date: Mon, 9 Nov 2020 21:44:19 +0000 Message-Id: <20201109214420.32131-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201109214420.32131-1-peter.maydell@linaro.org> References: <20201109214420.32131-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Markus Armbruster , Maxim Cournoyer Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We have a handful of rst files currently in the top level docs directory. These need to be moved into their proper places in the new manual framework, possibly involving splitting them into multiple pieces. In the meantime, to avoid warnings about these documents being orphaned if you build a single Sphinx manual rooted in docs/, mark each of them as being deliberate orphans. Signed-off-by: Peter Maydell --- docs/cpu-hotplug.rst | 2 ++ docs/microvm.rst | 2 ++ docs/pr-manager.rst | 2 ++ docs/virtio-net-failover.rst | 2 ++ docs/virtio-pmem.rst | 1 + 5 files changed, 9 insertions(+) diff --git a/docs/cpu-hotplug.rst b/docs/cpu-hotplug.rst index d0b06403f19..d5fe2c7db1a 100644 --- a/docs/cpu-hotplug.rst +++ b/docs/cpu-hotplug.rst @@ -1,3 +1,5 @@ +:orphan: + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Virtual CPU hotplug =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/docs/microvm.rst b/docs/microvm.rst index fcf41fc1f6f..8de8cea1864 100644 --- a/docs/microvm.rst +++ b/docs/microvm.rst @@ -1,3 +1,5 @@ +:orphan: + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D microvm Machine Type =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/docs/pr-manager.rst b/docs/pr-manager.rst index 9b1de198b1b..87a2f237f52 100644 --- a/docs/pr-manager.rst +++ b/docs/pr-manager.rst @@ -1,3 +1,5 @@ +:orphan: + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Persistent reservation managers =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/docs/virtio-net-failover.rst b/docs/virtio-net-failover.rst index 6002dc5d96e..9d50d457e72 100644 --- a/docs/virtio-net-failover.rst +++ b/docs/virtio-net-failover.rst @@ -1,3 +1,5 @@ +:orphan: + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D QEMU virtio-net standby (net_failover) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/docs/virtio-pmem.rst b/docs/virtio-pmem.rst index 4bf5d004432..aab35489851 100644 --- a/docs/virtio-pmem.rst +++ b/docs/virtio-pmem.rst @@ -1,3 +1,4 @@ +:orphan: =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D QEMU virtio pmem --=20 2.20.1 From nobody Mon Apr 29 06:47:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1604958557; cv=none; d=zohomail.com; s=zohoarc; b=hd8LrXcHD+jwjNAx6PiHw52cWLg8uquTX2OlN5ghoA14zai0F5dqxYwCwQp5QOFYgJKKvXS+P68p2B+MesMQ92XV5UL9PP/CdUMalLaJV8OS1jOBlhdCP3gh0wjo8XAg8darCINFd6Qy6kRlu15UFQVoymg/VBYtB8BUp4UW8MM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604958557; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fzmc3z1XyVtlC8j6UQOGeBsOfMBy+uPWsnbCZPZdRu4=; b=TgjQHtFr/AuxtGJesvOtBUHEX3Flozp5/CXgeibGGPZZ4PER34m7jZm6FJ/5X07drUODacPwY2YAv9v7oaLNAxHFXQ8ZKTx6aaOC2QqXf0NXQIE3rYsyJ/EIyWhnRslth/rU38ioZ0MFzzQzs0K70jMmMs9vn4TPbldwYx60DN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604958557800990.3758042930561; Mon, 9 Nov 2020 13:49:17 -0800 (PST) Received: from localhost ([::1]:59038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcF2K-0003oa-N3 for importer@patchew.org; Mon, 09 Nov 2020 16:49:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcExj-00086R-7Q for qemu-devel@nongnu.org; Mon, 09 Nov 2020 16:44:31 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcExg-0007fI-B2 for qemu-devel@nongnu.org; Mon, 09 Nov 2020 16:44:30 -0500 Received: by mail-wr1-x431.google.com with SMTP id r17so6532272wrw.1 for ; Mon, 09 Nov 2020 13:44:26 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e3sm14913252wrn.32.2020.11.09.13.44.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 13:44:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fzmc3z1XyVtlC8j6UQOGeBsOfMBy+uPWsnbCZPZdRu4=; b=R5ogGA7glW5hi5hmL0c7mM3XvBYXB3a0GREAYC60MPU36VWlkK00RtrhYPIjDqdUrt rbBzZVa0VWX4dz9YeyW9y1v5yg4NREDLG215jmJ6wlmSJvlcRFK1acOThuG5sWWOG/yj 4Du1+BduCLujC/JqSJmocMn8sPh44X7nQ53VhosIHWrMKQ6j5ImNgdQ2x8lVzSasB+0I fAOwAp4j8Vnxt03H5Q6oIn/YpKLljB4osNzZjscFE1BhK+s/BCsKllpZ8caxzJs1dH4z k+iuIWygCyNkfIsmT0gg7u7nnl8HtWsurGuJ6BhPl/orfbIWbcCsTJ02Ihi2Jj1ITu9C QrVw== 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=fzmc3z1XyVtlC8j6UQOGeBsOfMBy+uPWsnbCZPZdRu4=; b=CKJry1HEAm9aYhJemMzk5ErnbO0mpWTLnUEABZMlS8vjw6L3Gaj4tw3bsUZAqLiNBa GIq00Xw1E9URv6H0gJsphPX9Z5YOP5kmzH4tAQ9xdC5q9mOQlDlJnQBA1GYBLGzEjf9u tt2sZND7QygpyZzxyNBIEC7ZykNbN6RO6xOULLN5ya9s6zXm7n0UMQHcrHFKOVFNq0tq levhPn1b7+bkOhPmiZQuVenMq98Vgh0f481tEwTyqfPsEx1QXaeYjnBXfPTnSq/qnaOn 9Q3ofxvRl0T8bGxgnJy8pXp08SCAd94r9Sstu8kzQKFduoMZPAIeCZveaA8q2wvKdAhQ f2nA== X-Gm-Message-State: AOAM531//3IaQCb5hMosqa05KRW0ORdZIwPpeyPwQJU/ezeW+Bx03OfY iYdiUhdykAIHyB2+5VC/HilQrh1gFY2K9w== X-Google-Smtp-Source: ABdhPJw+UNMk8BWeivCVUUW0rxTU94Q6gMGWabPsy4zF5xgLezBonZcIvG8R53vptbEWTP4M4jJMdA== X-Received: by 2002:a5d:448b:: with SMTP id j11mr19629698wrq.236.1604958265296; Mon, 09 Nov 2020 13:44:25 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [RFC 2/2] docs: Build and install all the docs in a single manual Date: Mon, 9 Nov 2020 21:44:20 +0000 Message-Id: <20201109214420.32131-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201109214420.32131-1-peter.maydell@linaro.org> References: <20201109214420.32131-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Markus Armbruster , Maxim Cournoyer Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" When we first converted our documentation to Sphinx, we split it into multiple manuals (system, interop, tools, etc), which are all built separately. The primary driver for this was wanting to be able to avoid shipping the 'devel' manual to end-users. However, this is working against the grain of the way Sphinx wants to be used and causes some annoyances: * Cross-references between documents become much harder or possibly impossible * There is no single index to the whole documentation * Within one manual there's no links or table-of-contents info that lets you easily navigate to the others * The devel manual doesn't get published on the QEMU website (it would be nice to able to refer to it there) Merely hiding our developer documentation from end users seems like it's not enough benefit for these costs. Combine all the documentation into a single manual (the same way that the readthedocs site builds it) and install the whole thing. The previous manual divisions remain as the new top level sections in the manual. * The per-manual conf.py files are no longer needed * The man_pages[] specifications previously in each per-manual conf.py move to the top level conf.py * docs/meson.build logic is simplified as we now only need to run Sphinx once for the HTML and then once for the manpages5B * The old index.html.in that produced the top-level page with links to each manual is no longer needed Unfortunately this means that we now have to build the HTML documentation into docs/manual in the build tree rather than directly into docs/; otherwise it is too awkward to ensure we install only the built manual and not also the dependency info, stamp file, etc. The manual still ends up in the same place in the final installed directory, but anybody who was consulting documentation from within the build tree will have to adjust where they're looking. Signed-off-by: Peter Maydell --- docs/conf.py | 37 ++++++++++++++++++++++++- docs/devel/conf.py | 15 ----------- docs/index.html.in | 17 ------------ docs/interop/conf.py | 26 ------------------ docs/meson.build | 64 +++++++++++++++++--------------------------- docs/specs/conf.py | 16 ----------- docs/system/conf.py | 28 ------------------- docs/tools/conf.py | 33 ----------------------- docs/user/conf.py | 15 ----------- 9 files changed, 61 insertions(+), 190 deletions(-) delete mode 100644 docs/devel/conf.py delete mode 100644 docs/index.html.in delete mode 100644 docs/interop/conf.py delete mode 100644 docs/specs/conf.py delete mode 100644 docs/system/conf.py delete mode 100644 docs/tools/conf.py delete mode 100644 docs/user/conf.py diff --git a/docs/conf.py b/docs/conf.py index e584f683938..3bc9b35872a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -223,7 +223,42 @@ latex_documents =3D [ =20 # -- Options for manual page output --------------------------------------- # Individual manual/conf.py can override this to create man pages -man_pages =3D [] +man_pages =3D [ + ('interop/qemu-ga', 'qemu-ga', + 'QEMU Guest Agent', + ['Michael Roth '], 8), + ('interop/qemu-ga-ref', 'qemu-ga-ref', + 'QEMU Guest Agent Protocol Reference', + [], 7), + ('interop/qemu-qmp-ref', 'qemu-qmp-ref', + 'QEMU QMP Reference Manual', + [], 7), + ('system/qemu-manpage', 'qemu', + 'QEMU User Documentation', + ['Fabrice Bellard'], 1), + ('system/qemu-block-drivers', 'qemu-block-drivers', + 'QEMU block drivers reference', + ['Fabrice Bellard and the QEMU Project developers'], 7), + ('system/qemu-cpu-models', 'qemu-cpu-models', + 'QEMU CPU Models', + ['The QEMU Project developers'], 7), + ('tools/qemu-img', 'qemu-img', + 'QEMU disk image utility', + ['Fabrice Bellard'], 1), + ('tools/qemu-nbd', 'qemu-nbd', + 'QEMU Disk Network Block Device Server', + ['Anthony Liguori '], 8), + ('tools/qemu-trace-stap', 'qemu-trace-stap', + 'QEMU SystemTap trace tool', + [], 1), + ('tools/virtfs-proxy-helper', 'virtfs-proxy-helper', + 'QEMU 9p virtfs proxy filesystem helper', + ['M. Mohan Kumar'], 1), + ('tools/virtiofsd', 'virtiofsd', + 'QEMU virtio-fs shared file system daemon', + ['Stefan Hajnoczi ', + 'Masayoshi Mizuma '], 1), +] =20 # -- Options for Texinfo output ------------------------------------------- =20 diff --git a/docs/devel/conf.py b/docs/devel/conf.py deleted file mode 100644 index 7441f87e7f5..00000000000 --- a/docs/devel/conf.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# -# QEMU documentation build configuration file for the 'devel' manual. -# -# This includes the top level conf file and then makes any necessary tweak= s. -import sys -import os - -qemu_docdir =3D os.path.abspath("..") -parent_config =3D os.path.join(qemu_docdir, "conf.py") -exec(compile(open(parent_config, "rb").read(), parent_config, 'exec')) - -# This slightly misuses the 'description', but is the best way to get -# the manual title to appear in the sidebar. -html_theme_options['description'] =3D u'Developer''s Guide' diff --git a/docs/index.html.in b/docs/index.html.in deleted file mode 100644 index 33db4396ac8..00000000000 --- a/docs/index.html.in +++ /dev/null @@ -1,17 +0,0 @@ - - - - - QEMU @VERSION@ Documentation - - -

QEMU @VERSION@ Documentation

- - - diff --git a/docs/interop/conf.py b/docs/interop/conf.py deleted file mode 100644 index 2634ca3410a..00000000000 --- a/docs/interop/conf.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# -# QEMU documentation build configuration file for the 'interop' manual. -# -# This includes the top level conf file and then makes any necessary tweak= s. -import sys -import os - -qemu_docdir =3D os.path.abspath("..") -parent_config =3D os.path.join(qemu_docdir, "conf.py") -exec(compile(open(parent_config, "rb").read(), parent_config, 'exec')) - -# This slightly misuses the 'description', but is the best way to get -# the manual title to appear in the sidebar. -html_theme_options['description'] =3D u'System Emulation Management and In= teroperability Guide' - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages =3D [ - ('qemu-ga', 'qemu-ga', u'QEMU Guest Agent', - ['Michael Roth '], 8), - ('qemu-ga-ref', 'qemu-ga-ref', 'QEMU Guest Agent Protocol Reference', - [], 7), - ('qemu-qmp-ref', 'qemu-qmp-ref', 'QEMU QMP Reference Manual', - [], 7), -] diff --git a/docs/meson.build b/docs/meson.build index bf8204a08fa..b2aa885a351 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -46,70 +46,56 @@ if build_docs meson.source_root() / 'docs/sphinx/qmp_lexer.py', qapi_gen_depends ] =20 - configure_file(output: 'index.html', - input: files('index.html.in'), - configuration: {'VERSION': meson.project_version()}, - install_dir: qemu_docdir) - manuals =3D [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ] man_pages =3D { - 'interop' : { 'qemu-ga.8': (have_tools ? 'man8' : ''), 'qemu-ga-ref.7': 'man7', 'qemu-qmp-ref.7': 'man7', - }, - 'tools': { 'qemu-img.1': (have_tools ? 'man1' : ''), 'qemu-nbd.8': (have_tools ? 'man8' : ''), 'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP'= ) ? 'man1' : ''), 'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''), 'virtiofsd.1': (have_virtiofsd ? 'man1' : ''), - }, - 'system': { 'qemu.1': 'man1', 'qemu-block-drivers.7': 'man7', 'qemu-cpu-models.7': 'man7' - }, } =20 sphinxdocs =3D [] sphinxmans =3D [] - foreach manual : manuals - private_dir =3D meson.current_build_dir() / (manual + '.p') - output_dir =3D meson.current_build_dir() / manual - input_dir =3D meson.current_source_dir() / manual =20 - this_manual =3D custom_target(manual + ' manual', + private_dir =3D meson.current_build_dir() / 'manual.p' + output_dir =3D meson.current_build_dir() / 'manual' + input_dir =3D meson.current_source_dir() + + this_manual =3D custom_target('QEMU manual', build_by_default: build_docs, - output: [manual + '.stamp'], - input: [files('conf.py'), files(manual / 'conf.py')], - depfile: manual + '.d', + output: 'docs.stamp', + input: files('conf.py'), + depfile: 'docs.d', depend_files: sphinx_extn_depends, command: [SPHINX_ARGS, '-Ddepfile=3D@DEPFILE@', '-Ddepfile_stamp=3D@OUTPUT0@', '-b', 'html', '-d', private_dir, input_dir, output_dir]) - sphinxdocs +=3D this_manual - if build_docs and manual !=3D 'devel' - install_subdir(output_dir, install_dir: qemu_docdir) - endif + sphinxdocs +=3D this_manual + install_subdir(output_dir, install_dir: qemu_docdir, strip_directory: tr= ue) =20 - these_man_pages =3D [] - install_dirs =3D [] - foreach page, section : man_pages.get(manual, {}) - these_man_pages +=3D page - install_dirs +=3D section =3D=3D '' ? false : get_option('mandir') /= section - endforeach - if these_man_pages.length() > 0 - sphinxmans +=3D custom_target(manual + ' man pages', - build_by_default: build_docs, - output: these_man_pages, - input: this_manual, - install: build_docs, - install_dir: install_dirs, - command: [SPHINX_ARGS, '-b', 'man', '-d', private= _dir, - input_dir, meson.current_build_dir()]) - endif + these_man_pages =3D [] + install_dirs =3D [] + foreach page, section : man_pages + these_man_pages +=3D page + install_dirs +=3D section =3D=3D '' ? false : get_option('mandir') / s= ection endforeach + + sphinxmans +=3D custom_target('QEMU man pages', + build_by_default: build_docs, + output: these_man_pages, + input: this_manual, + install: build_docs, + install_dir: install_dirs, + command: [SPHINX_ARGS, '-b', 'man', '-d', pr= ivate_dir, + input_dir, meson.current_build_dir= ()]) + alias_target('sphinxdocs', sphinxdocs) alias_target('html', sphinxdocs) alias_target('man', sphinxmans) diff --git a/docs/specs/conf.py b/docs/specs/conf.py deleted file mode 100644 index 4d56f3ae13c..00000000000 --- a/docs/specs/conf.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# -# QEMU documentation build configuration file for the 'specs' manual. -# -# This includes the top level conf file and then makes any necessary tweak= s. -import sys -import os - -qemu_docdir =3D os.path.abspath("..") -parent_config =3D os.path.join(qemu_docdir, "conf.py") -exec(compile(open(parent_config, "rb").read(), parent_config, 'exec')) - -# This slightly misuses the 'description', but is the best way to get -# the manual title to appear in the sidebar. -html_theme_options['description'] =3D \ - u'System Emulation Guest Hardware Specifications' diff --git a/docs/system/conf.py b/docs/system/conf.py deleted file mode 100644 index 6251849fefc..00000000000 --- a/docs/system/conf.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# -# QEMU documentation build configuration file for the 'system' manual. -# -# This includes the top level conf file and then makes any necessary tweak= s. -import sys -import os - -qemu_docdir =3D os.path.abspath("..") -parent_config =3D os.path.join(qemu_docdir, "conf.py") -exec(compile(open(parent_config, "rb").read(), parent_config, 'exec')) - -# This slightly misuses the 'description', but is the best way to get -# the manual title to appear in the sidebar. -html_theme_options['description'] =3D u'System Emulation User''s Guide' - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages =3D [ - ('qemu-manpage', 'qemu', u'QEMU User Documentation', - ['Fabrice Bellard'], 1), - ('qemu-block-drivers', 'qemu-block-drivers', - u'QEMU block drivers reference', - ['Fabrice Bellard and the QEMU Project developers'], 7), - ('qemu-cpu-models', 'qemu-cpu-models', - u'QEMU CPU Models', - ['The QEMU Project developers'], 7) -] diff --git a/docs/tools/conf.py b/docs/tools/conf.py deleted file mode 100644 index 9052d17d6d4..00000000000 --- a/docs/tools/conf.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# -# QEMU documentation build configuration file for the 'tools' manual. -# -# This includes the top level conf file and then makes any necessary tweak= s. -import sys -import os - -qemu_docdir =3D os.path.abspath("..") -parent_config =3D os.path.join(qemu_docdir, "conf.py") -exec(compile(open(parent_config, "rb").read(), parent_config, 'exec')) - -# This slightly misuses the 'description', but is the best way to get -# the manual title to appear in the sidebar. -html_theme_options['description'] =3D \ - u'Tools Guide' - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages =3D [ - ('qemu-img', 'qemu-img', u'QEMU disk image utility', - ['Fabrice Bellard'], 1), - ('qemu-nbd', 'qemu-nbd', u'QEMU Disk Network Block Device Server', - ['Anthony Liguori '], 8), - ('qemu-trace-stap', 'qemu-trace-stap', u'QEMU SystemTap trace tool', - [], 1), - ('virtfs-proxy-helper', 'virtfs-proxy-helper', - u'QEMU 9p virtfs proxy filesystem helper', - ['M. Mohan Kumar'], 1), - ('virtiofsd', 'virtiofsd', u'QEMU virtio-fs shared file system daemon', - ['Stefan Hajnoczi ', - 'Masayoshi Mizuma '], 1), -] diff --git a/docs/user/conf.py b/docs/user/conf.py deleted file mode 100644 index 4b09aedd454..00000000000 --- a/docs/user/conf.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# -# QEMU documentation build configuration file for the 'user' manual. -# -# This includes the top level conf file and then makes any necessary tweak= s. -import sys -import os - -qemu_docdir =3D os.path.abspath("..") -parent_config =3D os.path.join(qemu_docdir, "conf.py") -exec(compile(open(parent_config, "rb").read(), parent_config, 'exec')) - -# This slightly misuses the 'description', but is the best way to get -# the manual title to appear in the sidebar. -html_theme_options['description'] =3D u'User Mode Emulation User''s Guide' --=20 2.20.1