From nobody Thu Nov 13 23:25:57 2025 Delivered-To: importer@patchew.org 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; 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=1583515927; cv=none; d=zohomail.com; s=zohoarc; b=XCRc2EXYLMYrkCfsBg0eu0we5smutYeVelWSLclCPcRAIiep+9XTBg25Lm6jD+TAPjYa90QNsN967OzKixgmBJ+OdXb7fMjMd7qf5iNUvnE+fdUXOtQZVmxmMFf4FdpN75FdDqzcEGPdYMFg4ZRw9vOqkrAJ4+e0Y6PT5fCw/qY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583515927; h=Content-Transfer-Encoding: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=/M3Q1G0HKQfPtdI//TVmv2AXSWRuvnLUfsWsWozX0D8=; b=eyGAX42WgZ7Yav1b7PrJkntDPtmNjEMPJXBNqXy4qFGPcJ+xFOJ+n5kr3ADNXUfEb4CAL5FY6zREaIA1w0S2JvmhlGkuNwY0pGohZhUf1okfLvNcfHa4AMXV39rgyo4ufvOByoK6eb+CW4z7qaJkhDofyz62cBzC6YIcE8MzrDA= 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 1583515927143982.4962650738436; Fri, 6 Mar 2020 09:32:07 -0800 (PST) Received: from localhost ([::1]:40074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGpS-0005O8-1l for importer@patchew.org; Fri, 06 Mar 2020 12:32:06 -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) 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) 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-Google-Smtp-Source: ADFU+vtlRjyus0oCpLOlKh+eLSWNzXhLOPdPTC8SEDPk4wIrTpII0/jC0xQJ8o68Zo4PU4Y4BbkbWw== X-Received: by 2002:adf:f70f:: with SMTP id r15mr5041239wrp.269.1583515072719; 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) 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_BUILDD= IR)/$1/searchindex.js $(M endef =20 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/inde= x.html.in qemu-version.h $(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \ "GEN","$@") =20 -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)/scrip= ts/hxtool - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@= ") - docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi @cp -p $< $@ =20 --=20 2.20.1 From nobody Thu Nov 13 23:25:57 2025 Delivered-To: importer@patchew.org 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; 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=1583516173; cv=none; d=zohomail.com; s=zohoarc; b=OHSxQNnTS1iNQX3GNFBOKCycXM1yVfF9nC9L2C1f3MnRLT7tsFlWixLnaVNtFd3oxY95ywqs740bDuYQ/jJr2elQO/HTqsQ8B8N5Bd/5iHnqY4ikyfIyxk+so7TgYJ9yKOWXwFMtv61X6oEL2CTqT42BvRoNotoErCPnm+m3H2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583516173; h=Content-Transfer-Encoding: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=/AwZc7g9eMUorN93TpjXyaUPzRm4sHdMxZ1jOCWcens=; b=LLXYl7mfjuM4dHoAuTqVQVdh5arWsXOAOlMp471MAY/s4rKdT52Ttmurplwe02jZv7tKdirm1VXf+YwXl1arxQre1eO+RslgfYWo0zxK2dsq8mlTZDTKpanVtPwKMeuuJ7tC8xuLx386ltQ9+WSnjK9XK6+oKfoCeMlJLyns5IU= 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 1583516173556232.53352732471808; Fri, 6 Mar 2020 09:36:13 -0800 (PST) Received: from localhost ([::1]:40192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGtQ-0005Ys-HV for importer@patchew.org; Fri, 06 Mar 2020 12:36: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) 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) 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-Google-Smtp-Source: ADFU+vvU78fnkmg2hJXTYscDiAA1sC0o3Bj3JyAGgPG2I17vVykAl248P2gGwq0djkoqUN0+HpiP2A== X-Received: by 2002:adf:e803:: with SMTP id o3mr4895907wrm.110.1583515073691; 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- hmp-commands-info.hx | 8 ++++---- hmp-commands.hx | 8 ++++---- qemu-options.hx | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) 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. =20 =20 { 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. =20 DEFHEADING(Standard options:) =20 --=20 2.20.1 From nobody Thu Nov 13 23:25:57 2025 Delivered-To: importer@patchew.org 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; 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=1583516178; cv=none; d=zohomail.com; s=zohoarc; b=izvDa/z8PVhm/zjCNnSM13xZhx6xEFOHuVj0NPlhVuxnp5xCc5bLSt3h28ZAgkNZXi3/sNIm12FPJ2m/5D2gfx2aBHKfpa3XhtjWTqL+w6jDiO7Es7LNl9jRQknmqm7L9Btp9jFMpvuh+m6VeNR/AViFgsUz/YX90rsKUH5pzHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583516178; h=Content-Transfer-Encoding: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=dELmma94fIMJnBaoti3wb6dHPUqTaIQs2QH0CFvzC6Q=; b=PZAPSolof1iTx6Lu46wFEeIJXrKwRxNJv2K5G/TpKtjWKH4tCxS6Jt7sddS2NhX/n+pbZPEZSCok6f0PEpT7y8ntg0trA7wh47sykiZa25cJq+uWfqnUwy/Y8tNwdr3AyApMVT8UGjgsv0aVEnt5hOtiJElYRFib2HHTPomewNE= 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 1583516178509894.8233293384546; Fri, 6 Mar 2020 09:36:18 -0800 (PST) Received: from localhost ([::1]:40202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGtV-0005mj-ET for importer@patchew.org; Fri, 06 Mar 2020 12:36:17 -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) 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) 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-Google-Smtp-Source: ADFU+vtbK1YMze99OmKgoB0yGavushKHedDKo/OrIrvbwifEVvMmqqfIAwssYab1N26+OspRzXQAXQ== X-Received: by 2002:a7b:c2a2:: with SMTP id c2mr4885331wmk.19.1583515074709; 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- scripts/hxtool | 78 +------------------------------------------------- 1 file changed, 1 insertion(+), 77 deletions(-) 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=3D$(($flag^1)) + SRST*|ERST*) flag=3D$(($flag^1)) ;; *) test $flag -eq 1 && printf "%s\n" "$str" @@ -16,84 +16,8 @@ hxtoh() done } =20 -print_texi_heading() -{ - if test "$*" !=3D ""; then - title=3D"$*" - printf "@subsection %s\n" "${title%:}" - fi -} - -hxtotexi() -{ - flag=3D0 - rstflag=3D0 - line=3D1 - 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=3D1 - ;; - 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=3D0 - ;; - 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=3D1 - ;; - 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=3D0 - ;; - DEFHEADING*) - print_texi_heading "$(expr "$str" : "DEFHEADING(\(.*\))")" - ;; - ARCHHEADING*) - print_texi_heading "$(expr "$str" : "ARCHHEADING(\(.*\),.*)")" - ;; - *) - test $flag -eq 1 && printf '%s\n' "$str" - ;; - esac - line=3D$((line+1)) - done -} - case "$1" in "-h") hxtoh ;; -"-t") hxtotexi ;; *) exit 1 ;; esac =20 --=20 2.20.1 From nobody Thu Nov 13 23:25:57 2025 Delivered-To: importer@patchew.org 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; 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=1583516284; cv=none; d=zohomail.com; s=zohoarc; b=ORdorFDNMCgYYKvlJttYwvih+WQi7rhoGvDWSl8rw9RyhZV1HvDKdkQYJb5Dzi2nk9+VCt4Vvsz8T1Gi59x2vAk6WWgH3HNmTZWl/gLe9Ff5mySQOsGkOlqEfqswt9iUBtzac4kVRKFP6TID9tyzfPcz6feZQEtqxlM42VqDKxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583516284; h=Content-Transfer-Encoding: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=vrW9XF6BLQAnIhvTlU5HbFtHoyw3EceDEO0yqvg7TFQ=; b=B0BkgcQfVjLM1b3lOUcIcL8aWVhnutpUdYOximD+P6f0UId4xr6FMCiYqpxViCEDsUbXfSMPrOK0if9kKDLh49U1JmBNhNqUZiax+2/tNddSoC9yp2eIHN5lGfHhQY3nPf/f7uuzzG+uX0oi/xQoI2HsqQUcj04KXsiFGfRTwnE= 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 1583516284172430.5908232171247; Fri, 6 Mar 2020 09:38:04 -0800 (PST) Received: from localhost ([::1]:40256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGvD-0000nQ-4h for importer@patchew.org; Fri, 06 Mar 2020 12:38:03 -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) 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) 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-Google-Smtp-Source: ADFU+vvdSykBeY5TH0fq2JmoCyaJzn3xd6NycMX5Q1lRpGY3T11IZrRcBaIfjosW9MHJ62VQY+RP8g== X-Received: by 2002:a7b:ce18:: with SMTP id m24mr4998902wmc.123.1583515075734; 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- docs/sphinx/hxtool.py | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) 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: =20 __version__ =3D '1.0' =20 -# 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 =3D 1 - TEXI =3D 2 - RST =3D 3 + RST =3D 2 =20 def serror(file, lnum, errtext): """Raise an exception giving a user-friendly syntax error message""" @@ -110,31 +108,13 @@ class HxtoolDocDirective(Directive): =20 if directive =3D=3D 'HXCOMM': pass - elif directive =3D=3D 'STEXI': - if state =3D=3D HxState.RST: - serror(hxfile, lnum, 'expected ERST, found STEXI') - elif state =3D=3D HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found STEXI') - else: - state =3D HxState.TEXI - elif directive =3D=3D 'ETEXI': - if state =3D=3D HxState.RST: - serror(hxfile, lnum, 'expected ERST, found ETEXI') - elif state =3D=3D HxState.CTEXT: - serror(hxfile, lnum, 'expected STEXI, found ETEXI') - else: - state =3D HxState.CTEXT elif directive =3D=3D 'SRST': if state =3D=3D HxState.RST: serror(hxfile, lnum, 'expected ERST, found SRST') - elif state =3D=3D HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found SRST') else: state =3D HxState.RST elif directive =3D=3D 'ERST': - if state =3D=3D HxState.TEXI: - serror(hxfile, lnum, 'expected ETEXI, found ERST') - elif state =3D=3D HxState.CTEXT: + if state =3D=3D HxState.CTEXT: serror(hxfile, lnum, 'expected SRST, found ERST') else: state =3D HxState.CTEXT --=20 2.20.1 From nobody Thu Nov 13 23:25:57 2025 Delivered-To: importer@patchew.org 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; 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=1583516376; cv=none; d=zohomail.com; s=zohoarc; b=TgIlFLQw5f7eCyAm7FIcWNJa2SbClTyhhiKxWOfmUM4BgZXBWRwZZaU0lFfAWxamhef22XsZhQGqnU8/oo0DJT/NKu2k4CWS2/mcatQK/cyfPDn91+78m/GKKyGJ4Svcw35q3lCjxtPyv2dFi8kqHhMxcaW+mMh1CCBBuIqERAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583516376; h=Content-Transfer-Encoding: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=0JgH8pZ7q1+DouQJLOPehKM2GAK95/4SWSv6MZSVrXk=; b=hFBi/sdMdS8cue57pG9GKlGtIkVawGKej9a1Se6gN9WyBL4YSZLMGNVuUdHY2HKUs35/EqoSswhR6ZJnadcx1bEgyA2J3rixV9LN4yq26pbbIGnkxKUuyqkeA2wYFUSQhyG4CDgHOGr419akdyeq7/gGeZN1DKPhSlEo5wHZD68= 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 1583516376905962.9543975873402; Fri, 6 Mar 2020 09:39:36 -0800 (PST) Received: from localhost ([::1]:40300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGwh-0003nS-KG for importer@patchew.org; Fri, 06 Mar 2020 12:39:35 -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) 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) 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-Google-Smtp-Source: ADFU+vt6mu3aHd96kcp5A19LPaZopY99eSpFT9JzzALHwQLGg3+fIQF08g7FU4QiLdqpNnPAl2xg2g== X-Received: by 2002:a1c:9e51:: with SMTP id h78mr4810124wme.44.1583515076692; 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2ccd80065b6..5847f8d41d9 100644 --- a/Makefile +++ b/Makefile @@ -1046,7 +1046,8 @@ build-manual =3D $(call quiet-command,CONFDIR=3D"$(qe= mu_confdir)" $(SPHINX_BUILD) $( # We assume all RST files in the manual's directory are used in it manual-deps =3D $(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...[,extra= deps]) # 'extradeps' is optional, and specifies extra files (eg .hx files) that --=20 2.20.1 From nobody Thu Nov 13 23:25:57 2025 Delivered-To: importer@patchew.org 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; 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=1583516350; cv=none; d=zohomail.com; s=zohoarc; b=RsSw0IyuqZJ7gurVa3KISDTxrQcSVji/nO/zzH+EZgUwC6VXwdFA0Q/HLU3iSGL+F/4y/++uGczr8bN5nR1yamkwO3pb+Yhhjup3xH2MR3sV70RN1NDYNNTOPp9I+tx5xSj9gQKV+SV8pOPFjb1MTbn9ioXhXkyLSMcfHcG70uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583516350; h=Content-Transfer-Encoding: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=0hkWJtDoUx3C/GFYCxG8kr97qdyRwJLP+Zk6m43M10Q=; b=aWRHW4P5dtVxPoJuONQ0kVwNRDo6QqpCzRDHfwpxFi2BD0PjokvaCi3Qn85L4G0e+jrz4keR9mfL9k0ZkkI9w4LUlwN6nQRy3OJCZjjuCNpWhRfV7AvSFOPO7F1F2u/0BOVOoj4z+03gCXd96whJO4A3vXXd99SeRpx/Sf61JyA= 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 1583516350785716.2074574507201; Fri, 6 Mar 2020 09:39:10 -0800 (PST) Received: from localhost ([::1]:40288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGwH-0002qR-No for importer@patchew.org; Fri, 06 Mar 2020 12:39: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) 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) 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-Google-Smtp-Source: ADFU+vuRRnzQdvldYqq739sJxgwTrad6DlY//5pcCz3b78WSH9EAH3jlediFkIXaNK12mGQgQ4tbVw== X-Received: by 2002:a05:600c:d8:: with SMTP id u24mr5136148wmm.165.1583515077913; 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- docs/index.html.in | 10 +++++----- docs/index.rst | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) 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: =20 - interop/index - devel/index - specs/index system/index - tools/index user/index + tools/index + interop/index + specs/index + devel/index --=20 2.20.1 From nobody Thu Nov 13 23:25:57 2025 Delivered-To: importer@patchew.org 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; 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=1583516277; cv=none; d=zohomail.com; s=zohoarc; b=lK5MIWK5GdiMfz0gBvBdxDd2VRRcchBGglPAh1DqAyr7J9Bgjb6tTKFRdllCDki45SUxLP/XhS9CYWM42PHd2Vvyjm4T67UEEWCL4aJmo0LqmEtLbFPRy8DLZm8WIYkKOw7xDaQ7onec9NfHpSz2KquBceYsbbS7hKAPJ21f3Uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583516277; h=Content-Transfer-Encoding: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=AHdCZ6f524TmUpBjUFoFjPeX4noFjGjqB5SJT2Ug8KE=; b=aUxvcBwIVMV0hA1ZewKxr3yzmNCELnMKiyW+SGbpjdbOO375bOJta+SkAQy+iB8th7fQSd/dcS14PCvZc9iY+emwxp/NP8av+nu1XRyJWL0OGKPwjxVtyh4UPB/MJp+mQl4awILFiZ97LOBz91cd4TZOt3TouMUkjFEKoA/obEo= 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 1583516277301919.9942222456488; Fri, 6 Mar 2020 09:37:57 -0800 (PST) Received: from localhost ([::1]:40250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGv4-0000RT-06 for importer@patchew.org; Fri, 06 Mar 2020 12:37:54 -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) 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) 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-Google-Smtp-Source: ADFU+vvgmCciq++L4mDIssDTMI5iHQls2jRpxND6t7vLJtYnyHZO13b/saDQuAUz6zghzPsQ1t18uw== X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr4960232wma.87.1583515078968; 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- docs/qemu-option-trace.rst.inc | 4 ---- 1 file changed, 4 deletions(-) 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.te= xi - until all the users of the texi file have been converted to rst and - the texi file can be removed. =20 Specify tracing options. =20 --=20 2.20.1