From patchwork Fri Mar 6 11:09:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184259 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7296731ile; Fri, 6 Mar 2020 03:13:46 -0800 (PST) X-Google-Smtp-Source: ADFU+vtL/L7hy3cN0+Jw51+rPJK7CwyhT4Cd8ssOvaVygvCC8KM3v/DOdFIEEeK1N2uh8wCN8g+3 X-Received: by 2002:ac8:5316:: with SMTP id t22mr2395796qtn.279.1583493226859; Fri, 06 Mar 2020 03:13:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583493226; cv=none; d=google.com; s=arc-20160816; b=x7nkGIc953M9o24PqYnf9LuKR+fWkZHssgbPGPXMDDeQgewcmU+2Bhfu9HaI2SIycU Pvjck70y42P8yHrD+IndUcENWZndcirJ3oB9w+sDQ75f0wEvsPv+nA+lVVg1aFzHVDIY WPoQycHj+hARxRHmrBrJbk5C3L/YjwetYMJiNEXQXmnEvg7cFVuVtc+aU/NzbfPWe4da qMBboC8knUZPiS1qa8yISnCru0bYY/X0yej5h83b9RXVSLLz6LuvgeznbgIciQBaSyCx tctju3YIwt5jyM9S2072rcezEDvU9yCRkHD/qPGWK6RvwOSP8obfa41r+fXJAZ4Dpwly nuBg== 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=lSS9b7qPiBKIY3bTnFe/9lzY1JcnBag0mvZBgxxrEXE=; b=mxc9KhgwvN+lNFHiveN7dsDH48lgl5AVhw5gz/W7V/ltVPwg+AZJm1fxLS3EhK5Wa+ HGYMJUD6FfPAfU+3wltGUVWJ+c5By4/2uz6T5qzMuJdn/sn2FoyjA7//iDfrR+mSTGDw NYh0XUdEh8AbSs+btX1bPKYhMQBRxpXxYgAuddCZ7eLrYgrsrAOhlhV8k+GOOe58agiY VDy4vzkbrZbfYHIBsunfkxo/U9aKIKLurLau79AzTAYRPjVBuPq4KnvOTUD3LFZaCKBC AMSXEP++deLp3JIpvRlFo8zF3+GLZMgOdEtxsQ5G7UrAXK/fDA/bmPszmgDY03Dmqemk SrDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VrCDslvS; 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 r20si863063qvk.196.2020.03.06.03.13.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 03:13:46 -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=VrCDslvS; 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]:34816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAAvK-0001jJ-8l for patch@linaro.org; Fri, 06 Mar 2020 06:13:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39217) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAAs1-0003Xd-MW for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAArz-0004vV-S3 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:21 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:50483) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAArz-0004rp-Gv for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:19 -0500 Received: by mail-wm1-x32f.google.com with SMTP id a5so1947891wmb.0 for ; Fri, 06 Mar 2020 03:10:19 -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=lSS9b7qPiBKIY3bTnFe/9lzY1JcnBag0mvZBgxxrEXE=; b=VrCDslvStIZc8WdPjPUPv+1kb3Y6HCTS8fogBfZ5AyqB9MxqaJgevl+eM0zll/i4ie fNWAylVEJi/dxsRZPkvMYJ5Cepo73iglw9Io28a67hD4NYP3MSiTEY97X4RHLB0CO0Zv kABOw8bBY8Da47i5Vi+ll+nXS/pmHOLYP/co8Bf6T49V0gAvojE/pyiBxwsloEnm9fp7 RGq7H/aWQVoW6usy0F0xixrO03Cd1JoK8XHFfMeSy65DcQnPrVjs+E/Y1ENTod9eMRrO 1CpafQo3yzSOziMTXbSczCcDDRHcEkOSoguNBS+0xpP1y77Mw/L6XKBtRB9P6J2+tCHe Iw0Q== 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=lSS9b7qPiBKIY3bTnFe/9lzY1JcnBag0mvZBgxxrEXE=; b=MspkhHIcloN0t+FHrcejt+iXdlZvKSFxoMicQmakJVv2vUvq5ArOe3geSEUj/bPETh 2mFxKml26pMclrdEsUFEI4ET+qngxFBKYlKXTzg4ARWvxpVhpGoU7yev5Ff/gfn/Jx7j PeSI69/LjdbjEB8f+1OFPnhDrhdhfd3I/6k0ZJsJ2BgFpgvIy2fBkMXQM/rhHIimJXWl q7lcNMsuIB7ZTzmMzIbGvL2UthgW+rPoOoJqAHV2cuzRuGKjF9iuczHsvn0y25BxoKyq qc5C+oCJcW1t72sCM+JlBoxfhseb1hKlnRtAbKfv5+7va6HTpi70rfCRwwro8jSX2/sv nbFg== X-Gm-Message-State: ANhLgQ2VP7ghCu2fVskY2IvbqUVbfBjKMB31v2G/IWqbqTsVi+GX4LqC uW6/RwDYy2qiqoeOQH6P8UFiSr4vbQKg7w== X-Received: by 2002:a7b:c8c9:: with SMTP id f9mr3388798wml.43.1583493018120; Fri, 06 Mar 2020 03:10:18 -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.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 03:10:17 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/33] qemu-doc: move included files to docs/system Date: Fri, 6 Mar 2020 11:09:37 +0000 Message-Id: <20200306110959.29461-12-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::32f 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" From: Paolo Bonzini Since qemu-doc.texi is mostly including files from docs/system, move the existing include files there for consistency. Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell Reviewed-by: Alex Bennée Tested-by: Alex Bennée Signed-off-by: Peter Maydell Message-id: 20200228153619.9906-12-peter.maydell@linaro.org Message-id: 20200226113034.6741-12-pbonzini@redhat.com [PMM: update MAINTAINERS line for qemu-option-trace.texi] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- Makefile | 8 ++++---- MAINTAINERS | 5 +++-- qemu-deprecated.texi => docs/system/deprecated.texi | 0 .../system/qemu-option-trace.texi | 0 docs/{ => system}/security.texi | 0 qemu-doc.texi | 4 ++-- qemu-options.hx | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) rename qemu-deprecated.texi => docs/system/deprecated.texi (100%) rename qemu-option-trace.texi => docs/system/qemu-option-trace.texi (100%) rename docs/{ => system}/security.texi (100%) -- 2.20.1 diff --git a/Makefile b/Makefile index 56382a45936..7e60a435426 100644 --- a/Makefile +++ b/Makefile @@ -1110,7 +1110,7 @@ docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi @cp -p $< $@ qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi -qemu.1: qemu-option-trace.texi +qemu.1: docs/system/qemu-option-trace.texi docs/system/qemu-cpu-models.7: docs/system/qemu-cpu-models.texi docs/system/cpu-models-x86.texi docs/system/cpu-models-mips.texi html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs @@ -1120,8 +1120,7 @@ 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-option-trace.texi \ - qemu-deprecated.texi qemu-monitor.texi \ + qemu-monitor.texi \ qemu-monitor-info.texi \ docs/system/quickstart.texi \ docs/system/invocation.texi \ @@ -1140,7 +1139,8 @@ qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \ docs/system/build-platforms.texi \ docs/system/license.texi \ docs/system/cpu-models-x86.texi docs/system/cpu-models-mips.texi \ - docs/security.texi + docs/system/deprecated.texi docs/system/qemu-option-trace.texi \ + docs/system/security.texi 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/MAINTAINERS b/MAINTAINERS index 615615c32f3..584264535c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2234,7 +2234,7 @@ M: Stefan Hajnoczi S: Maintained F: trace/ F: trace-events -F: qemu-option-trace.texi +F: docs/system/qemu-option-trace.texi F: scripts/tracetool.py F: scripts/tracetool/ F: scripts/qemu-trace-stap* @@ -2804,7 +2804,8 @@ F: contrib/gitdm/* Incompatible changes R: libvir-list@redhat.com -F: qemu-deprecated.texi +F: docs/system/deprecated.texi +F: docs/system/deprecated.rst Build System ------------ diff --git a/qemu-deprecated.texi b/docs/system/deprecated.texi similarity index 100% rename from qemu-deprecated.texi rename to docs/system/deprecated.texi diff --git a/qemu-option-trace.texi b/docs/system/qemu-option-trace.texi similarity index 100% rename from qemu-option-trace.texi rename to docs/system/qemu-option-trace.texi diff --git a/docs/security.texi b/docs/system/security.texi similarity index 100% rename from docs/security.texi rename to docs/system/security.texi diff --git a/qemu-doc.texi b/qemu-doc.texi index e4bff7edbee..d3e743719ab 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -189,9 +189,9 @@ various targets are mentioned in the following sections. @include docs/system/target-m68k.texi @include docs/system/target-xtensa.texi -@include docs/security.texi +@include docs/system/security.texi -@include qemu-deprecated.texi +@include docs/system/deprecated.texi @include docs/system/build-platforms.texi diff --git a/qemu-options.hx b/qemu-options.hx index 084a1c1f8c9..5a4ac8e2396 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4221,7 +4221,7 @@ HXCOMM This line is not accurate, as some sub-options are backend-specific but HXCOMM HX does not support conditional compilation of text. @item -trace [[enable=]@var{pattern}][,events=@var{file}][,file=@var{file}] @findex -trace -@include qemu-option-trace.texi +@include docs/system/qemu-option-trace.texi ETEXI DEF("plugin", HAS_ARG, QEMU_OPTION_plugin, "-plugin [file=][,arg=]\n"