From patchwork Fri Mar 6 11:09:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184283 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7310686ile; Fri, 6 Mar 2020 03:29:17 -0800 (PST) X-Google-Smtp-Source: ADFU+vvi3cpYXAy4ayEXeSv/PgANPCzytc8qmNvbidu7Zeytm8ceRFpF1nliNKh5b+0Z1jgObVUP X-Received: by 2002:a37:4548:: with SMTP id s69mr2533706qka.60.1583494157140; Fri, 06 Mar 2020 03:29:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583494157; cv=none; d=google.com; s=arc-20160816; b=N4gk37O0DawarSxvk8mSB/3ADoT9h1lHSfQmrZjXH4cQpY919bxJxxwdimW2jS3PSR l8zj4wcY31OJvhFIIHmj6h4pC7mvGsXxkAYy/MuCjNz0pJZaNhkDUrdoSl+OOt95F+TW MrR3I2jrI/FUFWYqCJEL9WS2J69fQR16EIRMj6TTVp8Y1pBtbmHCPxRwz/CZg4CU4KeX mgIieE8OPGAIHZGWoGh2mthGQ3S9RV/4CiYPmKBRV2yI/sY7qyU6ItfIpC/6oxqezP+y v37aq+dOxa4iRYmS2t3xTPmol0w8KRmRrRHJ6CSfv2Gbt7ieix45xV+vXXXKWMh4Lsx6 n7rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:to:from :dkim-signature; bh=bpB7oaRkghBQMQU5VFov+2/nC+u5q6dHi7FMVSXg1VU=; b=Fm2zvgfXBcYNiXkd+JRyB78ogiSEWkRQsBLVJxfxT4C/FfFuJZVVGiMGxB8yqu+NWo D93X6TdcEkE0hTX5xjedFaGLmA6/6LDazIRIxvihkbVIHFmgrFL9pEG+ODYPrZmVomqY KxiIZDgkiye3J1O5ux3D8nqNyZ4hvt9RYBNOch7u0hh8C6BV74vRzWacClkdw4gxfbE9 Z+qajAqYtal7UlFoY8NhB9WFvHVx1phUy9x83EEv8pEIq3RaWNX37xkJ9SqLSaQ0anYD XRIPkQs+wRvEZPwyF6HxYC35Fkt3fEZlO4nTKJR800cq3aBMXmiORna6MFprcv26iVko Wwgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WbIk0Wd9; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d8si1148982qkc.129.2020.03.06.03.29.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 03:29:17 -0800 (PST) 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; dkim=pass header.i=@linaro.org header.s=google header.b=WbIk0Wd9; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jABAK-0003zb-M4 for patch@linaro.org; Fri, 06 Mar 2020 06:29:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40161) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAAsY-0004WU-Mv for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAAsX-0006HH-8s for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:54 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:52289) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAAsW-00068E-R3 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:53 -0500 Received: by mail-wm1-x336.google.com with SMTP id p9so1931321wmc.2 for ; Fri, 06 Mar 2020 03:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bpB7oaRkghBQMQU5VFov+2/nC+u5q6dHi7FMVSXg1VU=; b=WbIk0Wd9Bx9YuWLPr3zRwaRo+xZYwWFzPs+OOtsZXxVhXVganGC3CSmEp8c3xrM5Yy d2pCaHf6IxFjAGR4MA3scDzhuxAOcD+7gayVvjg8UiowWeln1F7ObaQukSoxcMPQNBQ5 1GdgoyAt6JbaKKpyF9golHswjGEAq/6cdfHSVA4gNPmC405/QpLgXBVl3Ud/NpiRbyAP hW/HSmNghZgX5TZHpaOqxapR/DUvDDboiOyzW3bnM4ymTxYAxoEnBSYquiPmmW3ObyGu MWk/oeIihAxVLcO45F5M0TqpIzv4vWx9oHRfckl0kBHH4aUEIsRzkqkNkMCMP+S9SzUl Eo2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bpB7oaRkghBQMQU5VFov+2/nC+u5q6dHi7FMVSXg1VU=; b=ImkxqhQE/3DGAg6tDovs4Ep2QjGz7CLRFTy9amkw10L3fi3aoVFmO8eUOdwa3nFGWs VO0zGaOHBY0cftNDAvVuZq3Ak0eO6UFnz0tZWAMWQ5Z05ksbGTmYoJXMJt4WSC4Sc+Lo ZbAlzRzanh0pVvYXsyBROliQQAbLriOtLbTG9WWBFJmi4DG7evU52pQHdA31HOIXCPnB mKdgsQVmyoFS1CIYxmcFiXLvn0nBCTVnDkVHRG1Na4k2vzJv/a+J396dW1GQckfguKn1 LRNxbbjSYlhCibVROB+UgnNO8OqtT0rstwJ9GbAe6wD7/auiihWZm8YC3I5OIdAhhxBZ irPA== X-Gm-Message-State: ANhLgQ2PC0htWRB26AlaBTAuAbb9So0vE+YLSjZVywJKTM90s2yvdjRI KC9GSIfDb6Xm35U3op2jeJIT05lsjhT0LQ== X-Received: by 2002:a1c:4e03:: with SMTP id g3mr3479774wmh.22.1583493049714; Fri, 06 Mar 2020 03:10:49 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y10sm12553029wma.26.2020.03.06.03.10.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 03:10:49 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 31/33] docs: Stop building qemu-doc Date: Fri, 6 Mar 2020 11:09:57 +0000 Message-Id: <20200306110959.29461-32-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306110959.29461-1-peter.maydell@linaro.org> References: <20200306110959.29461-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Stop building the old texinfo qemu-doc; all its contents are now available in the Sphinx-generated manuals and manpages. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Tested-by: Alex Bennée Message-id: 20200228153619.9906-32-peter.maydell@linaro.org --- docs/specs/ivshmem-spec.txt | 4 ++-- Makefile | 39 ++++--------------------------------- .gitignore | 3 --- docs/index.html.in | 1 - 4 files changed, 6 insertions(+), 41 deletions(-) -- 2.20.1 diff --git a/docs/specs/ivshmem-spec.txt b/docs/specs/ivshmem-spec.txt index 042f7eae225..1beb3a01ec3 100644 --- a/docs/specs/ivshmem-spec.txt +++ b/docs/specs/ivshmem-spec.txt @@ -38,8 +38,8 @@ There are two basic configurations: Interrupts are message-signaled (MSI-X). vectors=N configures the number of vectors to use. -For more details on ivshmem device properties, see The QEMU Emulator -User Documentation (qemu-doc.*). +For more details on ivshmem device properties, see the QEMU Emulator +user documentation. == The ivshmem PCI device's guest interface == diff --git a/Makefile b/Makefile index ef10b9a031d..9d4b2241265 100644 --- a/Makefile +++ b/Makefile @@ -344,7 +344,6 @@ MANUAL_BUILDDIR := docs endif ifdef BUILD_DOCS -DOCS=qemu-doc.html qemu-doc.txt DOCS+=$(MANUAL_BUILDDIR)/system/qemu.1 DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-img.1 DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-nbd.8 @@ -768,10 +767,6 @@ distclean: clean rm -f $(SUBDIR_DEVICES_MAK) rm -f po/*.mo tests/qemu-iotests/common.env rm -f roms/seabios/config.mak roms/vgabios/config.mak - rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps - rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys - rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp - rm -f qemu-doc.vr qemu-doc.txt rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f config.log rm -f linux-headers/asm @@ -851,8 +846,6 @@ install-sphinxdocs: sphinxdocs install-doc: $(DOCS) install-sphinxdocs $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" ifdef CONFIG_POSIX @@ -1110,34 +1103,10 @@ docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi @cp -p $< $@ -html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs -info: qemu-doc.info docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info -pdf: qemu-doc.pdf docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf -txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt - -qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \ - qemu-options.texi \ - qemu-monitor.texi \ - qemu-monitor-info.texi \ - docs/system/quickstart.texi \ - docs/system/invocation.texi \ - docs/system/keys.texi \ - docs/system/mux-chardev.texi \ - docs/system/monitor.texi \ - docs/system/cpu-models-x86.texi \ - docs/system/images.texi \ - docs/system/net.texi \ - docs/system/usb.texi \ - docs/system/ivshmem.texi \ - docs/system/linuxboot.texi \ - docs/system/vnc-security.texi \ - docs/system/tls.texi \ - docs/system/gdb.texi \ - docs/system/build-platforms.texi \ - docs/system/license.texi \ - docs/system/cpu-models-x86.texi docs/system/cpu-models-mips.texi \ - docs/system/deprecated.texi docs/system/qemu-option-trace.texi \ - docs/system/security.texi +html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs +info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info +pdf: docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf +txt: docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \ docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \ diff --git a/.gitignore b/.gitignore index bc0a035f9cc..0c5af83aa74 100644 --- a/.gitignore +++ b/.gitignore @@ -46,9 +46,6 @@ !/qapi/qapi-visit-core.c /qapi/qapi-visit.[ch] /qapi/qapi-doc.texi -/qemu-doc.html -/qemu-doc.info -/qemu-doc.txt /qemu-edid /qemu-img /qemu-nbd diff --git a/docs/index.html.in b/docs/index.html.in index a576ace8a27..cc19aad2ec5 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -7,7 +7,6 @@

QEMU @@VERSION@@ Documentation