From patchwork Fri Mar 6 17:17:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184288 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7676485ile; Fri, 6 Mar 2020 09:30:46 -0800 (PST) X-Google-Smtp-Source: ADFU+vtW1uFOvWGOv8uGx11qtq8hZzGFROHUYT34/x6BHbVNsEmlMtVld7TNklKWx+VYTotjT0AH X-Received: by 2002:ae9:e514:: with SMTP id w20mr3966317qkf.500.1583515845894; Fri, 06 Mar 2020 09:30:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583515845; cv=none; d=google.com; s=arc-20160816; b=g9Vh34ahCfI5P5o0dyrVXUi9APEZWtgbOnWwkpfwms8fRYhH7VkHu/caJQ4/ZtcqyI oSg4vh+9YEhMpZXCTR/v6x7kntA7L9cobeAec93ize+pS9M6Xno87pMKGOAxqeXAXFos 3VtAIglkz5YrZhXeT4s5dQfkv8pbX6MdaF80Os1NTGW0LQipVjEfEOzPcnrkNi/W6tQv RiPO2yPV/QNLJXoBU33lF+84Nn0E1ERfTaNDejNrdDMfBivXBpVPshnWgmZp5hgxQWqg 3EMPVUutEzz2IYpKZagcT1HUNDpOhn54bIubk/4BrshxpI+1u/Y6YTgPJ0Zr1wbCtaIo 4xgg== 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=/M3Q1G0HKQfPtdI//TVmv2AXSWRuvnLUfsWsWozX0D8=; b=e9cChbjiJY1wrD/0lwviWn8hzVnZGs22naFzXqml2oTrA3d33caho9bx15w6FFECf3 vdxOp4Fs9anCrV2bB1EVIm/1rSqCeI+ha5QBeHiQCEiQ/xeMEv7yBw8Bi+iwfEem/xJb y0eOqx++q3v/xCv3M+aw4aW3kBpsovux4DVnxJ2Y6FeDcDHh/HHz5b8jREB7fCioDqrk L5trRCYPEj+bD1SOPQ+qJjg3/d12PwKbrqLBcnC9448m3YPnJiJFlChc72H01EoFNZWp YLljqYqwW3cbRHWsfDqxsVk61+/2FoyBhkiNlRf3iJ8Cw5JCaMCUU5NGcuvdRbAHmVsV Taig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vMiVjIeA; 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 v2si1357538qvx.38.2020.03.06.09.30.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 09:30:45 -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=vMiVjIeA; 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]:40048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGo9-0003gf-7f for patch@linaro.org; Fri, 06 Mar 2020 12:30:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50687) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGbj-0000Tn-IO for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGbi-0007mZ-Ax for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:55 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAGbi-0007jX-42 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:54 -0500 Received: by mail-wr1-x433.google.com with SMTP id v11so3244516wrm.9 for ; Fri, 06 Mar 2020 09:17:54 -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=/M3Q1G0HKQfPtdI//TVmv2AXSWRuvnLUfsWsWozX0D8=; b=vMiVjIeAxCSysxI6JPX156+OLh+tgh/KmamOQ9kWVz99yx50EFmilqfi+Du8WgkJt7 dmwTwe2pHPpeMfH9O42kpkugO8n0i7f46KGO++0YSw7O6usRvWgWiGDXElzvThC4td+o ij2MmT9GHTDTcqVokYkzETUm74jQb9/CwFYF/hOBZ5M+25z4AU5+QLm76PZBJidLOMtP KkzIauGdbzUKRSs/wnKap2WSAnUYSeJ03BfemZLkY5JNbLKE0KXpRpYLzBYKb9B9ZLjI 3cdhAw8b7YmrKwssOwll0b3EeaKZeU9S1rFU5Sd0gICf+UkbEvwPwFhHl+VMmnGoCc7D 3G0g== 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=/M3Q1G0HKQfPtdI//TVmv2AXSWRuvnLUfsWsWozX0D8=; b=lbLYs36JrHzFnMdoSXsRpcJGR4gGLFuLMijv0noV5mC+VzLE5skSos2ax4Si8isSLA Oc3gSd4KK6ENZn7HjU93irKZV6gyK4d9Bwo2zzN/mXU29vdSxyVW4kZbss16PFnzTL53 hl6VkJxUGY46pBAjX9+KjnUIiCO5RgQG2ZQ1M30uM+2eg8VEKgSz6xkG/uLABevNaHxq O74iPNL0E4HEpRwNDUiRws/VuGv/m6Iee6pMiMJNd+f+HveeSv5IAJOFxZr7sBUAllcj zMGR2xre6rcFEyCOr8/w03yCtYd/WVPRyitwHcpNHF7EFg4e0z/ONN7QiPMJ1MLLQHGz oLcQ== X-Gm-Message-State: ANhLgQ2UcKPaGpmo/qAcxwBijzJD4v1zDzDGDnH6BnC7+GqMsMHmCWeB Y9zSDGmuMaE5lSMSNcYubPrIL12zyGiNAA== X-Received: by 2002:adf:f70f:: with SMTP id r15mr5041239wrp.269.1583515072719; Fri, 06 Mar 2020 09:17:52 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f8sm6948346wmf.20.2020.03.06.09.17.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 09:17:52 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/7] Makefile: Remove redundant Texinfo related code Date: Fri, 6 Mar 2020 17:17:43 +0000 Message-Id: <20200306171749.10756-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306171749.10756-1-peter.maydell@linaro.org> References: <20200306171749.10756-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::433 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" The recent conversion of qemu-doc.texi to rST forgot a few stray bits of makefile code that are now redundant. Remove them. Signed-off-by: Peter Maydell --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) -- 2.20.1 diff --git a/Makefile b/Makefile index 9d4b2241265..2ccd80065b6 100644 --- a/Makefile +++ b/Makefile @@ -761,7 +761,7 @@ rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(M endef distclean: clean - rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi + rm -f config-host.mak config-host.h* config-host.ld $(DOCS) rm -f tests/tcg/config-*.mak rm -f config-all-devices.mak config-all-disas.mak config.status rm -f $(SUBDIR_DEVICES_MAK) @@ -1088,15 +1088,6 @@ $(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version.h $(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \ "GEN","$@") -qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") - -qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") - -qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") - docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi @cp -p $< $@ From patchwork Fri Mar 6 17:17:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184289 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7680992ile; Fri, 6 Mar 2020 09:35:12 -0800 (PST) X-Google-Smtp-Source: ADFU+vv1bNhnd4JgHRret6m62NdXEHET0FIcCo/nXdMPsweAJ0VD51e4HdIGAtP3q0/NE1hXGSiH X-Received: by 2002:a37:9a8b:: with SMTP id c133mr3922000qke.132.1583516112778; Fri, 06 Mar 2020 09:35:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583516112; cv=none; d=google.com; s=arc-20160816; b=JGz7g2AptCDx+/VMXwtZ6VjxYyVOvi4TNUdNlt5QtFminhpTAYZ3rL/2yUsvVlO/t4 GXtln4W5nZZrQ57nEt8r/a56OpEZiIwY0mluMVYRL7GgKLBAxz94kvZgM3RQ1MXPTHlh gweKGIf+Fep8ylI6GHjXmO2YQZUYZukkuR7W2yAb57ZMcHXQM/1zHu/lerUE38abzXFk imWOmTW2P/QvDhHiL+qIDiR/2eq4/TSOacHTS73BqIHUAAQ+gbTNK3s+ScEYO5dZjARz 6iQ5Qt4qQrsG29G5VQgJkKKWUkTaBMnQ1FyEuFxHnOsfiEKoT9S3iO657THBnvFsQBP+ VL1w== 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=/AwZc7g9eMUorN93TpjXyaUPzRm4sHdMxZ1jOCWcens=; b=g1VNVvPk/QflSqpP7EX6uNAh6fFpVfIl+ZY4UyTe0wdLds07RXjg5sGroUBBCIupwH y+5j7RFVPjAMF3ZQD1F4LvhP99eLGbNg9+3gdrIBGhBu1KuJOzChimD7E5admUAxhobm 1MAHHNOPfv6CRpUuIzvjpvxNmZ2Q6Uzt+XHz8PIoXFMVcVg5I+Vxj6n9AG8TThExG0JZ /TEqlKuxMxTPnnj5jvohHA4KRA0hdsFEGuScT31Lax0/HK9EdzwcJrI/csF8dh00NL1a maxWnKn9SvAetKTqb0ORo+NLKgAYiTG/98d3QoGidDG1yNZUjIs7dgiTrPfAdA758CJz qAdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yvJ06ed7; 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 n10si1489540qvk.147.2020.03.06.09.35.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 09:35:12 -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=yvJ06ed7; 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]:40168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGsS-0003rs-5n for patch@linaro.org; Fri, 06 Mar 2020 12:35:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50722) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGbk-0000W4-Ln for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGbj-0007qY-E4 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:56 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:33381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAGbj-0007mk-2K for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:55 -0500 Received: by mail-wr1-x443.google.com with SMTP id x7so3284715wrr.0 for ; Fri, 06 Mar 2020 09:17:54 -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=/AwZc7g9eMUorN93TpjXyaUPzRm4sHdMxZ1jOCWcens=; b=yvJ06ed7UwfWL46WM7Z9OpMc4c0c592rAVH6EI8Qc50Xp6Tdds9VZN/pVX5xMErKCW KGt7lq3Zeg0d0h3k3dIgkb2bLzYfx1BTkpAazYMiSkAHBjChFvLVd4SCV5pWbPEX3lOP 9yw5+Y2Ut1U4vD5OT76WMfRQcNfKT2gAolnqdiUI0P7ahne+0VUjkywWIcDEdS+ITE5W jzlZSPeMpEJ0kjo7RS0mNHFrz7ul4HKX7wGAHS4DtP8mqu/NxkV+cC8EgQ7yRv+eCLN0 +wuze6bTBX83Wi77cu4vdUhSvXjLF51xhq/kIBCpmWR1fgiPLO7kbxMNV1om0LWYoeXV 6SFw== 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=/AwZc7g9eMUorN93TpjXyaUPzRm4sHdMxZ1jOCWcens=; b=CsMHSPwNaa1Gfsi1BJhJoMuCs9qPo3CJwRJ19m/ubwPXrMAqN8eps3Y0MguCGBcvp9 RDq0jCOevffUY8KtVuAA9s56wlUcufZB0+aFHgZRU+/HCLo2s5Z5odIbvLX9BhC2fdyO bpUyaz5JUhHZu4xh6yMxxFd8igAC3ChRXJOy2aBpArZd+Mor1/VY1mNW3Mj6VqibYqd0 osCZDszSA1jDMU9HS/zeHuBseqBNKev6uDVlN/WfPcCK70EvtAwMrW4Krhr6OD16mo3b tFo6MT+vpjwV3de6O8iPK8NFmVPfZeC05OPhKAev0yi17xSv4gWB3qYcjQlbMOFjoOjY tfLw== X-Gm-Message-State: ANhLgQ2pH+hJplFB6xUZvVRXjQ/EsfgNReFwLvaukzgKpHXFv9+RXRDG Nd77K2CbJ5N0iqqyZmCtpMy4m4iZD2gKvw== X-Received: by 2002:adf:e803:: with SMTP id o3mr4895907wrm.110.1583515073691; Fri, 06 Mar 2020 09:17:53 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f8sm6948346wmf.20.2020.03.06.09.17.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 09:17:53 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/7] Update comments in .hx files that mention Texinfo Date: Fri, 6 Mar 2020 17:17:44 +0000 Message-Id: <20200306171749.10756-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306171749.10756-1-peter.maydell@linaro.org> References: <20200306171749.10756-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::443 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" Update the header comments in .hx files that mention STEXI/ETEXI markup; this is now SRST/ERST as all these files have been converted to rST. Signed-off-by: Peter Maydell --- hmp-commands-info.hx | 8 ++++---- hmp-commands.hx | 8 ++++---- qemu-options.hx | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) -- 2.20.1 diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 499d6d54b01..ca5198438de 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -1,9 +1,9 @@ -HXCOMM Use DEFHEADING() to define headings in both help text and texi -HXCOMM Text between STEXI and ETEXI are copied to texi version and -HXCOMM discarded from C version +HXCOMM Use DEFHEADING() to define headings in both help text and rST. +HXCOMM Text between SRST and ERST is copied to the rST version and +HXCOMM discarded from C version. HXCOMM DEF(command, args, callback, arg_string, help) is used to construct HXCOMM monitor info commands -HXCOMM HXCOMM can be used for comments, discarded from both texi and C +HXCOMM HXCOMM can be used for comments, discarded from both rST and C. HXCOMM HXCOMM In this file, generally SRST fragments should have two extra HXCOMM spaces of indent, so that the documentation list item for "info foo" diff --git a/hmp-commands.hx b/hmp-commands.hx index eb3d1605fd6..d33ff367da3 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1,9 +1,9 @@ -HXCOMM Use DEFHEADING() to define headings in both help text and texi -HXCOMM Text between STEXI and ETEXI are copied to texi version and -HXCOMM discarded from C version +HXCOMM Use DEFHEADING() to define headings in both help text and rST. +HXCOMM Text between SRST and ERST is copied to the rST version and +HXCOMM discarded from C version. HXCOMM DEF(command, args, callback, arg_string, help) is used to construct HXCOMM monitor commands -HXCOMM HXCOMM can be used for comments, discarded from both texi and C +HXCOMM HXCOMM can be used for comments, discarded from both rST and C. { diff --git a/qemu-options.hx b/qemu-options.hx index f9fefd43be9..1d8f852d896 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1,10 +1,10 @@ -HXCOMM Use DEFHEADING() to define headings in both help text and texi -HXCOMM Text between STEXI and ETEXI are copied to texi version and -HXCOMM discarded from C version +HXCOMM Use DEFHEADING() to define headings in both help text and rST. +HXCOMM Text between SRST and ERST is copied to the rST version and +HXCOMM discarded from C version. HXCOMM DEF(option, HAS_ARG/0, opt_enum, opt_help, arch_mask) is used to HXCOMM construct option structures, enums and help message for specified HXCOMM architectures. -HXCOMM HXCOMM can be used for comments, discarded from both texi and C +HXCOMM HXCOMM can be used for comments, discarded from both rST and C. DEFHEADING(Standard options:) From patchwork Fri Mar 6 17:17:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184290 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7681105ile; Fri, 6 Mar 2020 09:35:19 -0800 (PST) X-Google-Smtp-Source: ADFU+vs9L5oyOfFK1sBHqOnttOjuMvyC75wSD4QW74V80+DHUyr9HDQPBk7tr1Bg2jGr6Z2Yv1io X-Received: by 2002:a37:b084:: with SMTP id z126mr4075344qke.497.1583516118943; Fri, 06 Mar 2020 09:35:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583516118; cv=none; d=google.com; s=arc-20160816; b=Ff+w7/T5N6pXsSFoGvmUJ15+xIun2nht5MCzTTZKwwdEYwAYao3yMPygxNqu2FgnhK DWXq1YOITKmwMejBQncqvKGgVuGkjbXvrvLznSfob9xFE8Pws1r88YJ8ytf4xEdoYueS bd1niUGtZ0HVFphttlMc9DkmMMMFcDV9i7xwpoVzEzDZkoLBIsI/We8zELPITrU8eRKL DK63/tX+IIlAlAmny+PH1d4q5c8pSFPEmGwA0tVTxms4xtNrkAi6/Qmz95TZOH/Fo1rs EjBSxVdKB4DVFzNniRuHophsSC7hKhQldkdbq+H2TAABCxrBAFC0EoZshvuNxd/1BcLU jn3A== 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=dELmma94fIMJnBaoti3wb6dHPUqTaIQs2QH0CFvzC6Q=; b=U4+Ho49Jifne6Y16JN4eerMl+t/wLOWtFYPC9gKnHcTtZB127ZNo4CCS0YIVztaYXQ G1UreL0lLXnek3zS6eqWPbVKiblFKJia8isqUhnGzFFCwsBxc6HnPbf14AsKsh/Eemir eGHvpELSYf5zioCgQOK5d6cKDNxrR3k60nEWYPjExVku+9rUx4eVl/cnWShq8WYcrmZy qXaT5Le/jYYPCye9++Dk069JvDVg7Qq1BpZjqWQ5NDA52pgSDzNvu3A/nG0dymOmWl4P SYBDR8c5KgF0SgXucFdjhE0Roezt2u2tmXss603nYqm7wGPjntGIDi+Xbk3H339/shAB 69iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ia7oHFmx; 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 h9si1393881qtr.61.2020.03.06.09.35.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 09:35:18 -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=Ia7oHFmx; 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]:40174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGsY-00045f-El for patch@linaro.org; Fri, 06 Mar 2020 12:35:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50745) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGbl-0000YH-Hl for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGbk-0007tQ-Aq for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:57 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37652) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAGbk-0007qg-3h for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:56 -0500 Received: by mail-wm1-x342.google.com with SMTP id a141so3186934wme.2 for ; Fri, 06 Mar 2020 09:17:56 -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=dELmma94fIMJnBaoti3wb6dHPUqTaIQs2QH0CFvzC6Q=; b=Ia7oHFmxq/KVNlHoiYLmJqILSun6LVFikeMRB4EnsbPZRegEZ2Ym/uOE6QygabsW1l T8tuGsxqYX2zVswSQob3vY3ii/uaXJAQnmdr6s1psJhbyOS8ffwc1cGyYvJ1Dlspk+l5 qcwyMkGw8vQ8UVzmbNwrS4aEAfXAQwn1MbJLqrapSoXb0GVj8D4SbHoePmjXLU8RHFXd yUBQt0TS+3Duq8o9XNFJD5GGZqwINRsscE7l8QR+3b1BdMnLLrg3HsJUKbWJgYM5SgWW en+orkEIaMBmCoyv5GL7p2n9hzAeNCbI/JoQBs+HASyd9oNej6sZXBakc9AdOLcznRJV PDTg== 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=dELmma94fIMJnBaoti3wb6dHPUqTaIQs2QH0CFvzC6Q=; b=CwrNvPqcJ053JTI8Y8JCGNj8xvZ82zn4xN2gKsO69Znmmw5H5UqtTLqfofUb7KGxz4 K9riV0NIBOcAyWOw8WxIPeJFvpATIDQnS+wEGiCwgKYHirxN0knKfrVnKZiTtvkBRrEI +jHNN96RCq3QSU8BK/COLyvs1gNvIKM5pYrz0GhIhf2Fu0K1VxqiLPsAe+bLTD8oQEaP 06QDghoYuJdmDJTu3zbQxfj/kunXi6tgrBC0+AI6TK8rAEDePA7mI5r0OGJXzmFv5O27 mnnMlUr/sPMs0L55jlob0N6PYmDiURbtlgEayS0GI09tSkmyG+f9a5BW1vnQPj2KYQGy P9tg== X-Gm-Message-State: ANhLgQ27uIJVDgZti4vkTRbPbteiCQ2ZyDWV6RSq8yUisqiwFYBMH590 PtB2BEvht1bQaVU+BACxy8JTp219ZHBBdg== X-Received: by 2002:a7b:c2a2:: with SMTP id c2mr4885331wmk.19.1583515074709; Fri, 06 Mar 2020 09:17:54 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f8sm6948346wmf.20.2020.03.06.09.17.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 09:17:54 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 3/7] hxtool: Remove Texinfo generation support Date: Fri, 6 Mar 2020 17:17:45 +0000 Message-Id: <20200306171749.10756-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306171749.10756-1-peter.maydell@linaro.org> References: <20200306171749.10756-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::342 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" All the STEXI/ETEXI blocks and the Makfile rules that use them have now been removed from the codebase. We can remove the code from the hxtool script which handles the STEXI/ETEXI directives and the '-t' option. Signed-off-by: Peter Maydell --- scripts/hxtool | 78 +------------------------------------------------- 1 file changed, 1 insertion(+), 77 deletions(-) -- 2.20.1 diff --git a/scripts/hxtool b/scripts/hxtool index 0003e7b673d..7b1452f3cf1 100644 --- a/scripts/hxtool +++ b/scripts/hxtool @@ -7,7 +7,7 @@ hxtoh() case $str in HXCOMM*) ;; - STEXI*|ETEXI*|SRST*|ERST*) flag=$(($flag^1)) + SRST*|ERST*) flag=$(($flag^1)) ;; *) test $flag -eq 1 && printf "%s\n" "$str" @@ -16,84 +16,8 @@ hxtoh() done } -print_texi_heading() -{ - if test "$*" != ""; then - title="$*" - printf "@subsection %s\n" "${title%:}" - fi -} - -hxtotexi() -{ - flag=0 - rstflag=0 - line=1 - while read -r str; do - case "$str" in - HXCOMM*) - ;; - STEXI*) - if test $rstflag -eq 1 ; then - printf "line %d: syntax error: expected ERST, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - if test $flag -eq 1 ; then - printf "line %d: syntax error: expected ETEXI, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - flag=1 - ;; - ETEXI*) - if test $rstflag -eq 1 ; then - printf "line %d: syntax error: expected ERST, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - if test $flag -ne 1 ; then - printf "line %d: syntax error: expected STEXI, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - flag=0 - ;; - SRST*) - if test $rstflag -eq 1 ; then - printf "line %d: syntax error: expected ERST, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - if test $flag -eq 1 ; then - printf "line %d: syntax error: expected ETEXI, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - rstflag=1 - ;; - ERST*) - if test $flag -eq 1 ; then - printf "line %d: syntax error: expected ETEXI, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - if test $rstflag -ne 1 ; then - printf "line %d: syntax error: expected SRST, found '%s'\n" "$line" "$str" >&2 - exit 1 - fi - rstflag=0 - ;; - DEFHEADING*) - print_texi_heading "$(expr "$str" : "DEFHEADING(\(.*\))")" - ;; - ARCHHEADING*) - print_texi_heading "$(expr "$str" : "ARCHHEADING(\(.*\),.*)")" - ;; - *) - test $flag -eq 1 && printf '%s\n' "$str" - ;; - esac - line=$((line+1)) - done -} - case "$1" in "-h") hxtoh ;; -"-t") hxtotexi ;; *) exit 1 ;; esac From patchwork Fri Mar 6 17:17:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184294 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7684269ile; Fri, 6 Mar 2020 09:38:37 -0800 (PST) X-Google-Smtp-Source: ADFU+vv54jEUKq52HQqWseZKjsQZO5MiCCWjQjFTnaXr0LlGhJlwMnS4Bg+uOv52dv0w+DcmuhOe X-Received: by 2002:a05:6214:928:: with SMTP id dk8mr3853357qvb.170.1583516317491; Fri, 06 Mar 2020 09:38:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583516317; cv=none; d=google.com; s=arc-20160816; b=LvPYGmBfcn2D2foVMQpK9WfKCOA7zPKWCktQYPpYWMq+J2IlHd15UlINn82WvZPDZ6 7atlZrYfkxMS+QbtSocrnFMIJqUJ2msIJdUWaUsGD4IWjH8G+dwZJToC5IEK+HM8cXTg 2p7XXcbkWE16chtufKpbd/T4BdG+3fL5KU0T2GYue5ibvLdPWWtF3uqKmZ4HfNJcR0eF FLCmDMu560ZBa8fuIBf7mXQCKfm4KN93N7TcyTAhLTowbIKf1xHEczi41KqA+1I9WqX3 0pyArx4sV7DP8EDvH5q0k7Edkvvqfg09MhYw9e8miojyJMA8uk+srKjao/r6layFxp51 k4wg== 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=vrW9XF6BLQAnIhvTlU5HbFtHoyw3EceDEO0yqvg7TFQ=; b=096qkRVJxblLUE+jz1V92g3Ex6JX5Kkyq/e7WzMFdMx9k4Lsxeym5yHI/p+XmjTqGw b+AxT1dGi/hWkutpbiSN77rVa8ifLwlcImM8Om6tIb6ULxJYlZqgorHDzl3r/eL5bkRm 04hnn3+VPLSOjLQKUB+gChsv5rjXxtFoCzXcCT9ITnn+PKE9+Km/AATp1eqKFmY9+wmd gEDmlVv/f9q4qPcGRNzFDmZGEP+J42asH9KwC5jKdnllSTe92/MzCGVn5u3fHeYrMscY 1sPMQUfOW/IP292a+D/GOoJtBy8C1BGjyi1GevRqO1jgMNQzhVqCBZFPsvUGeKuyZRx+ 9ofg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="S380BV/+"; 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 s22si1636761qkg.167.2020.03.06.09.38.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 09:38:37 -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="S380BV/+"; 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]:40276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGvl-0002QN-1s for patch@linaro.org; Fri, 06 Mar 2020 12:38:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50774) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGbm-0000aN-Em for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGbl-0007vT-6t for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:58 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:36179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAGbl-0007tZ-00 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:57 -0500 Received: by mail-wm1-x32e.google.com with SMTP id i14so3194984wmb.1 for ; Fri, 06 Mar 2020 09:17:56 -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=vrW9XF6BLQAnIhvTlU5HbFtHoyw3EceDEO0yqvg7TFQ=; b=S380BV/+pCVYsEPPtZ1nkWRHqHspAj4EN2Xa4dVV17/hKQf5CDTniObVMlkhp229lY EDm0ixeL8YzfjuFnH8JsUgH98eoHYP5u6joh27Mzun6Pzuy4YP5I5revvJxL4X7QapV1 vgqgls9Ua2lPS7PRC2abb7F6UARCO0/7wQXKTYwEusFW+Mu/5KvDFga6CP4vMRHG4NEB qBP0U7zfo5lAekdgXxD53TezQR8SiwGsCflTTcbCuVvYzUAhIRzrJpKjEjO7M12UAKm+ mpWXXrxwFGvnuIsNtssqLJoNe88r6eUSpoaFVT0u2r7QvpCsEFGr1VTmWCgCtlWYcnGw bwhw== 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=vrW9XF6BLQAnIhvTlU5HbFtHoyw3EceDEO0yqvg7TFQ=; b=XqOB7puLl4dZlWQUDNX7FG6AwrwyR0PjQhoN11r8C8IkQTWIiV7c6N1Z8wNFUYURQH o4OWv8zhmEzPAuKDlVzKDjBCuH74JyORZafrBSUCj836memQN7aCD+knrzaLftatx7+z bs2Ge4iTEhIm7ZRUpcboT996odCR8Y20MzCe8BpGBQIkg1NXcs5dOhoH9xeSibqc849l pWamQrB7zXA0x3vsPWY8LfQ43MkUC3Hg9GBAg2axOr1ratON/+ja1PUnmvXXRuPp3i6L 37MhABGgrJG80Ev1fRK1swfVPSZo1gOOxzJ5KgvtkBTFwuywCKGA17TzypUPtz2cnABh 5IhQ== X-Gm-Message-State: ANhLgQ0HWl42ZF+ySLcxaRPkWsmDEiOeGn4Abp7Wa8R1aPGHje8XqCD0 exvYQp2ukYakQxFmNiHtOc4v8oE133vOzA== X-Received: by 2002:a7b:ce18:: with SMTP id m24mr4998902wmc.123.1583515075734; Fri, 06 Mar 2020 09:17:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f8sm6948346wmf.20.2020.03.06.09.17.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 09:17:55 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 4/7] docs/sphinx/hxtool.py: Remove STEXI/ETEXI support Date: Fri, 6 Mar 2020 17:17:46 +0000 Message-Id: <20200306171749.10756-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306171749.10756-1-peter.maydell@linaro.org> References: <20200306171749.10756-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::32e 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" Now that none of our input .hx files have STEXI/ETEXI blocks, we can remove the code in the Sphinx hxtool extension that supported parsing them. Signed-off-by: Peter Maydell --- docs/sphinx/hxtool.py | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) -- 2.20.1 diff --git a/docs/sphinx/hxtool.py b/docs/sphinx/hxtool.py index 7dd223fe362..fb0649a3d5b 100644 --- a/docs/sphinx/hxtool.py +++ b/docs/sphinx/hxtool.py @@ -37,13 +37,11 @@ else: __version__ = '1.0' -# We parse hx files with a state machine which may be in one of three -# states: reading the C code fragment, inside a texi fragment, -# or inside a rST fragment. +# We parse hx files with a state machine which may be in one of two +# states: reading the C code fragment, or inside a rST fragment. class HxState(Enum): CTEXT = 1 - TEXI = 2 - RST = 3 + RST = 2 def serror(file, lnum, errtext): """Raise an exception giving a user-friendly syntax error message""" @@ -110,31 +108,13 @@ class HxtoolDocDirective(Directive): if directive == 'HXCOMM': pass - elif directive == 'STEXI': - if state == HxState.RST: - serror(hxfile, lnum, 'expected ERST, found STEXI') - elif state == HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found STEXI') - else: - state = HxState.TEXI - elif directive == 'ETEXI': - if state == HxState.RST: - serror(hxfile, lnum, 'expected ERST, found ETEXI') - elif state == HxState.CTEXT: - serror(hxfile, lnum, 'expected STEXI, found ETEXI') - else: - state = HxState.CTEXT elif directive == 'SRST': if state == HxState.RST: serror(hxfile, lnum, 'expected ERST, found SRST') - elif state == HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found SRST') else: state = HxState.RST elif directive == 'ERST': - if state == HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found ERST') - elif state == HxState.CTEXT: + if state == HxState.CTEXT: serror(hxfile, lnum, 'expected SRST, found ERST') else: state = HxState.CTEXT From patchwork Fri Mar 6 17:17:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184295 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7684472ile; Fri, 6 Mar 2020 09:38:50 -0800 (PST) X-Google-Smtp-Source: ADFU+vtf5rLQHXhJhZCkAGWrWVQvbLURolbZtdSk10w4ycvt4HcTVh+uDFyp9xUCUYR6VV+iQW09 X-Received: by 2002:a05:620a:110c:: with SMTP id o12mr3973123qkk.87.1583516330466; Fri, 06 Mar 2020 09:38:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583516330; cv=none; d=google.com; s=arc-20160816; b=O1Ov7lveIB8vVlM8P6c8SxERiWGKrG7jIvmfNkOozVDBKc59dIIeYBGzvrElYpfdUR N97+G0BvdsVWZVALYFbuXbwtPkWBegg/fqsyK5RzYqiBm6UssIl09o7O1Uwc94tCFCTe JESoWL77g2UZa+d8bk0tZUkYobFwjzOvhY+3QkLjZbTEg4MCqeQpyZMftolQvyBmy+Uf hqH13EDic9zqrSuqD3U/GsKoCmXyEl3oZEP0WUgZObXwgTRNEbRH5yU1x4OkvFBwhGwl hxTGKYRnVPlHn1VgJPeTx5UChXoSDs4W+l02D4H79hVbxD547Apk0WLJ8bkP/sbFxsoc v55Q== 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=0JgH8pZ7q1+DouQJLOPehKM2GAK95/4SWSv6MZSVrXk=; b=pj3c43prNDmwxU0j4jfn8Mx5vkJKof3i6NpHSWrqRqXvDiXJNDrgRy/K6jWUf032t6 oqAwGLGI+/fDSSDGAUskWU3dsPaeUbBs4nfnXMvaGnaQjb1XvG2nh6YrGxzDECruijaX fmQIicCR6ve3jscN7bDLM0zcH6/D43FFC2RzseA/5qUO3TXZVu3TfzNRhG+5FcmggU/Z htfSkT06dHrOAAuGYwnwxj+Zizv4Hat2pEOTuQ/vk3iai0oqWGPoXdxAiiYnZn0f1AJk TcE48mxNytqD3w9MTdnJGvyn2pkPy+8zCUufRCYL7+h8lj8kvFqOykRcUSRAS4OFqkF/ nN8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mZuY0QtE; 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 i18si1723150qki.54.2020.03.06.09.38.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 09:38:50 -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=mZuY0QtE; 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]:40282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGvy-0002Zq-0X for patch@linaro.org; Fri, 06 Mar 2020 12:38:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGbo-0000d4-P3 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGbm-00080h-A1 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:00 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:36181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAGbm-0007we-3H for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:17:58 -0500 Received: by mail-wm1-x330.google.com with SMTP id i14so3195043wmb.1 for ; Fri, 06 Mar 2020 09:17:57 -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=0JgH8pZ7q1+DouQJLOPehKM2GAK95/4SWSv6MZSVrXk=; b=mZuY0QtEZh9y3+nkQokCCXg64VJR6qvzj84bSPLRMeB6aUxaHpQXPzUVoBd6f7j5iw 9lz9DJvan7ytrBmEIhJg2y2UFRj5PNA3ULcuAcee84ZATAqN1X6BGq2G4hmJdUnVa1wo Oy9KYgzLuqaB2+717SQWtYZdJze5TRccU6WBLHtzjo1khe8LYRrF6mahgscHMWEghU+8 LsVpaBO5bY2ESXo293RJ1BS87F9lt6XGe86aGY0dZ4C1U76MU26tnU097NGxUUFlWZZ0 6VcAHK5wBSSAMd3YLdw5NmXBGhsvLFfyPjYqpFoexxyzGltNj0jRSKjYeCJTo0bEWB/F HNRA== 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=0JgH8pZ7q1+DouQJLOPehKM2GAK95/4SWSv6MZSVrXk=; b=jpNBTEutU1JfxZ44AtqlGhwws+xYiK0VG+HKXJhkeStNsUvSI1MDsj4w4Gb8jd3UqE aX405TLO64hvXZNN/L7FvZ1hu9coC4N4CPO2rwIoScC4eSO1gLmsEDO0FuQdTFViVNLr VLvLChY4N7zph9yiIRfE9B2V52f6x17Eh6nTaWkvyhtnTnVl4e4QBm7WFM7IydR6d+PC 0UaIh0wI6fv1tVEX8zvkBIVi997d+XrrTNv3BZRMYXUVmONaCqcUKM5ux507ap4qIMKy 3oy7qFmQcE8exnjFdkwmKRH3eamhP0cXGdk1ZZh1mk7w3JESGS21YnSYfW57NQ14nJQb 7HAA== X-Gm-Message-State: ANhLgQ0S/GaYCMsznKWuzQl2lV1Ko9PpPg6bx5blKfusVK00yB5L86RJ WjjzWn/qBYeGMw54IF+C4rvQDNivHVG/2A== X-Received: by 2002:a1c:9e51:: with SMTP id h78mr4810124wme.44.1583515076692; Fri, 06 Mar 2020 09:17:56 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f8sm6948346wmf.20.2020.03.06.09.17.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 09:17:56 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 5/7] Makefile: Make all Sphinx documentation depend on the extensions Date: Fri, 6 Mar 2020 17:17:47 +0000 Message-Id: <20200306171749.10756-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306171749.10756-1-peter.maydell@linaro.org> References: <20200306171749.10756-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::330 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" Add the Python source files of our Sphinx extensions to the dependencies of the Sphinx manuals, so that if we edit the extension source code the manuals get rebuilt. Adding this dependency unconditionally means that we'll rebuild a manual even if it happens to not use the extension whose source file was changed, but this is simpler and less error prone, and it's unlikely that we'll be making frequent changes to the extensions. Signed-off-by: Peter Maydell --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/Makefile b/Makefile index 2ccd80065b6..5847f8d41d9 100644 --- a/Makefile +++ b/Makefile @@ -1046,7 +1046,8 @@ build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $( # We assume all RST files in the manual's directory are used in it manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) \ $(SRC_PATH)/docs/defs.rst.inc \ - $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py + $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py \ + $(SRC_PATH)/docs/sphinx/*.py # Macro to write out the rule and dependencies for building manpages # Usage: $(call define-manpage-rule,manualname,manpage1 manpage2...[,extradeps]) # 'extradeps' is optional, and specifies extra files (eg .hx files) that From patchwork Fri Mar 6 17:17:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184293 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7683837ile; Fri, 6 Mar 2020 09:38:10 -0800 (PST) X-Google-Smtp-Source: ADFU+vuGRpmLCDRsMN0NUMaadun1sycRiwunA7G835AMZIkr9kLlsIKDexS0fACKevGjcOts18Xn X-Received: by 2002:a05:6214:18f4:: with SMTP id ep20mr3870497qvb.76.1583516290452; Fri, 06 Mar 2020 09:38:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583516290; cv=none; d=google.com; s=arc-20160816; b=0Po+Eb885YyUmwH8l/b9HFnTYsQj/aS1gTd9CC8HY7s5ZqX35FEK+uV5EbXCfH/neu +zheBan25VIeiDEqQU0solcTQBHHdNHWs4fMQ2nbwlGC9vjcmiG7SjMFe2rJN0hwZYaM kGz1YR+oJAquc+THrxDDuEQQnEt3dUEEN21pfmTZXJhkCi0H0hvJPhO7VnKWEy7vKy01 og2kxN5/+6BPkTRFxyduKGbCZyS61cCF8VJMADwDhY0XOK8pmGLRAkaomLJ/gSQk8fTZ dVROeSxmf0wjY5tKPVH4toFgVbhe3TYDHpHV+FtyeQunkzZKkqzShadEB7fHddfackxf ZRng== 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=0hkWJtDoUx3C/GFYCxG8kr97qdyRwJLP+Zk6m43M10Q=; b=guT+HNy56cOD0/hRnAgkyO1R/uXggWJ5abjMqyJ2GFDb8ZUOPSyb+T+PKjOxn09et8 H5ftARdk3vbAVg9X4FaEBh/flpd6ngM/YP8/U4udbnezBDbUEQdxSmFCZu2UiGft5yMp b7Rijd2nkPIZTnYc8aZ0feczuSPYoggrQ7ZAb3syDIP+d2vjf+qh59J8Tk/3hAoTpvEC pOBDrbu+Rg3q4aRipW2dgVgzuo+eekL2GsjXrjUfSVII1fSWEdJb6/7s4kFDwtA9/0td 0PrBQul2NTHIuM4oPVX0cSm+cOgTE19vBskVtPVR9o3hGdy3TcLupbk3kB4f84htDaWP tCjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FQNeop+g; 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 e23si1708303qkm.130.2020.03.06.09.38.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 09:38:10 -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=FQNeop+g; 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]:40266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGvJ-0001HB-Tf for patch@linaro.org; Fri, 06 Mar 2020 12:38:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50848) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGbs-0000dK-FF for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGbr-00089S-Ct for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:04 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAGbo-00082U-Mu for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:01 -0500 Received: by mail-wm1-x343.google.com with SMTP id e26so3165473wme.5 for ; Fri, 06 Mar 2020 09:17:59 -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=0hkWJtDoUx3C/GFYCxG8kr97qdyRwJLP+Zk6m43M10Q=; b=FQNeop+gutXwrkXwNaeeEIFKZfRktfHITDE722SnPM2UnbNYrWE4QFPnzidTUeb868 GhRWrCLE7I9DadAdBMBYW30FCyr8cAMm9fJ9+btZC+6y+qrF3S+tUbq88XBhiCqUuYvg hEU/SD4BYIF70nEpfBetYr0b6LK2kN4Xt5eEyA92mBLbQBku89FUOc/yJrRp4rAF1EKu qyZYuzrpL0IHGX5T8dA3vlcJWWdKokP9uTwUAW+HrJMfVoBUmXiDB3rLcCN0Vram3yar z9GC+A+PfdypCcnrde3Ly0hD+qA0u/+22Fyddm6oJsn7ojLTG2QKpG5ZT+s+1WGckjuc vtYQ== 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=0hkWJtDoUx3C/GFYCxG8kr97qdyRwJLP+Zk6m43M10Q=; b=pFaiWhzwhLzZMW2MGo7MAxWhnhqdz741h4F79W2xDLiAT0vr3Nya7auBMaJVIgw6gK B+CzLo1BUgwgzllPLWGWcoagsJIMCPMCKxfChGxMN+mxEnsjxj2lkzEAMUVfaKBkcxeo yy4Nn98R6CeGBoKpHOzRZ948id6tMsUhNqrkeZTTDAugRMGQXU2BMh6fkYtAKJ//fOql hKF4iRAY8mxg9aRBUxl9b8zz/Myv/VvSZ+PAFjtA51cOKQvrjOpVQZkRlS0+YiklvehQ 2A0qeMhdCuCqWs2bwoSB4E0B/bI6yJLiGRBw6SwbFh7IdOa3Gj73LtwfZAKB+Bno66w3 GpSQ== X-Gm-Message-State: ANhLgQ2PiKxTsf+GqZLQcHlDgrbqciojCJdFhyF26YQsntLejL0mYGs8 5nxThV2IT6KI4USMmiv/3pWZuIUlVqW3Kg== X-Received: by 2002:a05:600c:d8:: with SMTP id u24mr5136148wmm.165.1583515077913; Fri, 06 Mar 2020 09:17:57 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f8sm6948346wmf.20.2020.03.06.09.17.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 09:17:57 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 6/7] docs/index.rst, docs/index.html.in: Reorder manuals Date: Fri, 6 Mar 2020 17:17:48 +0000 Message-Id: <20200306171749.10756-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306171749.10756-1-peter.maydell@linaro.org> References: <20200306171749.10756-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::343 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" Now that qemu-doc.html is no longer present, the ordering of manuals within the top-level index page looks a bit odd. Reshuffle so that the manuals the user is most likely to be interested in are at the top of the list, and the reference material is at the bottom. Similarly, we reorder the index.rst file used as the base of the "all manuals in one" documentation for readthedocs. The new order is: * system * user * tools * interop * specs * QMP reference (if present) * Guest agent protocol reference (if present) * devel (if present) Signed-off-by: Peter Maydell --- docs/index.html.in | 10 +++++----- docs/index.rst | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/docs/index.html.in b/docs/index.html.in index cc19aad2ec5..e9a160384cf 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -7,13 +7,13 @@

QEMU @@VERSION@@ Documentation

diff --git a/docs/index.rst b/docs/index.rst index 376dab28850..763e3d0426e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,9 +10,9 @@ Welcome to QEMU's documentation! :maxdepth: 2 :caption: Contents: - interop/index - devel/index - specs/index system/index - tools/index user/index + tools/index + interop/index + specs/index + devel/index From patchwork Fri Mar 6 17:17:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184292 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7682533ile; Fri, 6 Mar 2020 09:36:50 -0800 (PST) X-Google-Smtp-Source: ADFU+vsms+oILjjGMq0eMpmERZt+RPYgMRVqF7NjXtmnLr27VkU7Sc+qMIFIH3ahXUNEWzX1dNd2 X-Received: by 2002:ac8:13c1:: with SMTP id i1mr4042976qtj.115.1583516210527; Fri, 06 Mar 2020 09:36:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583516210; cv=none; d=google.com; s=arc-20160816; b=WrJMFdN676bptQH9vDHGSEohRbxFkdcQKizoHUBF9hx/pgOjOs+sMgnbUDZ04NNwSH ciGVXnB0x1TXUgO/an8OfOk2+vv/cwiUwtD0V0bXMi5YklmjpQBzMp/kU1yG/WD+Xu8c 9ZnFVAp+UPPF/7xuHt5bwwhm8rKPod/EzZjvXbV9h3PSGJZwhlv80+zohcjDO1UVmMIB valr3VVtWg3HUlmM4qZqOPbq0rYHAmdHVyNUh6e6+HM7fCW1jgEVhUaWf4KJmbauWUJW HXUnLTbAY65PawwJLLcK8lX3POz33p7tWJJPGOnNb+dk+R5cApIQLSxYic0iFcUyzMB4 n58g== 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=AHdCZ6f524TmUpBjUFoFjPeX4noFjGjqB5SJT2Ug8KE=; b=prYoOtkY6Nw5/3CsFUGR+V8uZbLabL05ksSHoljzspUwei7QP1lceDTtdsVK/WRp9q HgARsZtv48dGl0bqjV4eggbNRL+EdjhsBkfiw4XwNkmEL7ZmmFFZ24DUTFuMaaqcz4o4 8Ic9jj3xy/48GSSYS9jxo8j+lDfaqr74eyRNOkjOBljDcwDl5TG/6vY11gKwNfjRrftk bfFNx+/rgzMUt0zMeh479VFAcatJCHW3m8RH25x3W/EHIahC0qX5LxwtfOWIJrSXU53R Sur66gvGbrlZD7Bg0giAhtfAXOXld6XC0bhyr1q94BkdFnW39bnWEAbM7ylgrFW55S5J 0gTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mit8FxkH; 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 p18si1702596qki.235.2020.03.06.09.36.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 09:36:50 -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=mit8FxkH; 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]:40226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGu1-0007Io-Vu for patch@linaro.org; Fri, 06 Mar 2020 12:36:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50865) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGbw-0000eQ-1h for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGbs-0008ES-5J for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:05 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAGbr-000887-CM for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:18:04 -0500 Received: by mail-wm1-x32d.google.com with SMTP id i14so3195297wmb.1 for ; Fri, 06 Mar 2020 09:18:02 -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=AHdCZ6f524TmUpBjUFoFjPeX4noFjGjqB5SJT2Ug8KE=; b=mit8FxkHjUBzMGABXzUXDuH8/C+4cQE9KtQvG43DvAPodGs7bHWKUsQikZeOEw+voT 6QDkg97lOpBUn6nxLbgNNBLaNojZu6ZZwwcZt06/9kdNtnIhVHqwCXlLi+Vuahz8ttuI O4dzRLowSX+vZ06IA6IJjwq+yyB9CgdZya0DmnU/KGgJKREKD0ml4qcfb82DWD+QxfOS rcs5/RIw+b+lA7Yf53DFmzw1PYj5wLaauGSx0mgbJ1t2Bg+fpnWe3EM2RN4ajDISwysp UdtzEYgEE2TzHk2dFcdxuKGbcRfWkHSMSu255p00C1O3vnnvDWljJQroOUfJv1c2tNVx Aczw== 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=AHdCZ6f524TmUpBjUFoFjPeX4noFjGjqB5SJT2Ug8KE=; b=GkyeVqasxy0NeyLWi4br5+7U7+PWsGrBG7VtCmIlnD2Gccs0KhfzxwUZj4agGllXRr dQ+7clwmcDGUppi/maMGECKAZbAS1y58YVSI8xWBg2BEhE7QYozvz7YWQFX9mtEet/+5 uDJeE5P3spZaCCt4AKw2GFIOwyCyiKe+YbES8Wl9xQBiWyj+L4hyPFyKkgHa+Q1aHcsd aoYvSJYD9kNZFrP76mRY0u7SLeqvdRZn2kk4ORvbwa7biEiUTYSiozJnndNePZGjT0Rc esHd1Mw4fvMuGd7TbhldTTOeq3QQ3dLOa83sIiWnTKuy5bDqEU89Sxi2eFKkwm9mJ22A +7Rw== X-Gm-Message-State: ANhLgQ1s2fGtBEttLLB7FU9W7SSYHh7oDw1eqTWmh5+gAkOxQGZRksDx 4Vx1Nbj7ZuZJxMPEonccLJSqRpUJyeCSFg== X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr4960232wma.87.1583515078968; Fri, 06 Mar 2020 09:17:58 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f8sm6948346wmf.20.2020.03.06.09.17.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 09:17:58 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 7/7] docs/qemu-option-trace.rst.inc: Remove redundant comment Date: Fri, 6 Mar 2020 17:17:49 +0000 Message-Id: <20200306171749.10756-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306171749.10756-1-peter.maydell@linaro.org> References: <20200306171749.10756-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::32d 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" The Texinfo version of the tracing options documentation has now been deleted, so we can remove the now-redundant comment at the top of the rST version that was reminding us that the two should be kept in sync. Signed-off-by: Peter Maydell --- docs/qemu-option-trace.rst.inc | 4 ---- 1 file changed, 4 deletions(-) -- 2.20.1 diff --git a/docs/qemu-option-trace.rst.inc b/docs/qemu-option-trace.rst.inc index 23cfcb48537..7e09773a9c5 100644 --- a/docs/qemu-option-trace.rst.inc +++ b/docs/qemu-option-trace.rst.inc @@ -1,7 +1,3 @@ -.. - The contents of this file must be kept in sync with qemu-option-trace.texi - until all the users of the texi file have been converted to rst and - the texi file can be removed. Specify tracing options.