From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612524; cv=none; d=zohomail.com; s=zohoarc; b=lSA5WxWcNJjzHs1i3UbZ9nvR+sWrDsvxuPgaImTI3PWd2M9PvrzN5NeQ1fJCTv1Wd8Hk90D/NJe5mrozimlbKiTeu7yBmtBMB/62WlzYCHTLlcgQOu8cGCA5r/9ngJ8EU9rRKSyOwiICjm9Bg5GVkUQZauGi7+BtGHPPIHRhFaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612524; 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=1/rEFzTbO1F+5OVHYpvfNFoRTFLdO5DzWh3hJKyAxNo=; b=CJSFtM1HmON/VHKgWeNXPRMGhJFjKpGc+nhoRJd5I5Ej8t2wJn4KCKhcZJaaQjxzR+OJdd9HZpTdozHQspsfqkK8XZjISPty3bKlUW8159DTEWel7EOE5171GQFVMnalWB4TpWEzqX0x63gL/9V798MRW+jsMDpUr2NVLcos9Mo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612524422538.784400925788; Sun, 18 Jul 2021 05:48:44 -0700 (PDT) Received: from localhost ([::1]:58322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56Dq-0006ae-Lp for importer@patchew.org; Sun, 18 Jul 2021 08:48:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bf-0003jP-Sh for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:29 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50712) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Be-0003Tv-4R for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:27 -0400 Received: by mail-wm1-x335.google.com with SMTP id l6so8642733wmq.0 for ; Sun, 18 Jul 2021 05:46:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:23 -0700 (PDT) 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=1/rEFzTbO1F+5OVHYpvfNFoRTFLdO5DzWh3hJKyAxNo=; b=MAGsy2eeMCruLVI+JEhPSn4yf5Q3ztxpg1GH91rwD9K/rfFb2wJMBonCSyriNcKO17 /6W5fyx2g+AR9HznnNfQUCuAubQMEGC4KDsdKf86myZ/L/aczrMidx9zq861GvAfN1Gj 6JXM33eqDlU8MvQ0PfP2Bx2ESrP1SUVW1jFZLaSSXGPhorgTBG0y0x6YNLwFgu1QcWJP hysrNWDL3G+9ho7+HnWyiaFyJX6uUCNm7CCpEczYHKbhBY7Pf4gHvVcEQG5hwVdckRVL xJ5RImkIefab87aDvQLbVEE+0SZQub+adfdCUXnZRUuw+5ERQ+VhQeQc+Pn7NMSVR56e J32g== 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=1/rEFzTbO1F+5OVHYpvfNFoRTFLdO5DzWh3hJKyAxNo=; b=TtyvEjeOXI1cJvt3AFpK3r/dZx7vPFS09HduGVstuyTTNvKI7tbf3p2nXjH3NMiEhk SpApfzKwH9GdxBIb123q2TRB0ZMYSPLXtA9ALLnhNAojuWDx1/ULgDibzKA6Ea1LPiel Zb8XK4JbAZxa/5aX2As0QmLuFH8TlRAqZL5AuXUfsFcckvnsBQwDnWQiZ+8oludU3FnQ mOtkQddjKIukTLcaPeGuWoIQHvdQ/1xH5JvvbQbKhvSiAKxO+BTkpOI6p/WGwqKcFEkz jTjbDBZQq/JaYGr++OScjn7+bU+dfrYcDgfraF9vMr5toGdyh5aJHhxt6lq87SYB+37p jfJA== X-Gm-Message-State: AOAM531XCK88iOJnDkJrK2VDEiOBPvG+swXXwAD4uJw88Bsru6l5Jfqm T7d04KelXozc1IoVXTSk+Gj8Qg9lsJZ2Cw== X-Google-Smtp-Source: ABdhPJxPcjh6DU8u/skBKk77vX+yzraWbvAJePwAdNQ7ofJiUTyBdnRAmI5jgRvedO1E7+FCaWuEFA== X-Received: by 2002:a7b:c318:: with SMTP id k24mr21644434wmj.144.1626612384340; Sun, 18 Jul 2021 05:46:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/12] target/arm: Fix offsets for TTBCR Date: Sun, 18 Jul 2021 13:46:10 +0100 Message-Id: <20210718124621.13395-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612525598100001 Content-Type: text/plain; charset="utf-8" From: Richard Henderson The functions vmsa_ttbcr_write and vmsa_ttbcr_raw_write expect the offset to be for the complete TCR structure, not the offset to the low 32-bits of a uint64_t. Using offsetoflow32 in this case breaks big-endian hosts. For TTBCR2, we do want the high 32-bits of a uint64_t. Use cp15.tcr_el[*].raw_tcr as the offsetofhigh32 argument to clarify this. Buglink: https://gitlab.com/qemu-project/qemu/-/issues/187 Signed-off-by: Richard Henderson Message-id: 20210709230621.938821-2-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 910ace42741..0c07ca98376 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4106,8 +4106,9 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] =3D { .access =3D PL1_RW, .accessfn =3D access_tvm_trvm, .type =3D ARM_CP_ALIAS, .writefn =3D vmsa_ttbcr_write, .raw_writefn =3D vmsa_ttbcr_raw_write, - .bank_fieldoffsets =3D { offsetoflow32(CPUARMState, cp15.tcr_el[3]), - offsetoflow32(CPUARMState, cp15.tcr_el[1])} }, + /* No offsetoflow32 -- pass the entire TCR to writefn/raw_writefn. */ + .bank_fieldoffsets =3D { offsetof(CPUARMState, cp15.tcr_el[3]), + offsetof(CPUARMState, cp15.tcr_el[1])} }, REGINFO_SENTINEL }; =20 @@ -4118,8 +4119,10 @@ static const ARMCPRegInfo ttbcr2_reginfo =3D { .name =3D "TTBCR2", .cp =3D 15, .opc1 =3D 0, .crn =3D 2, .crm =3D 0, .= opc2 =3D 3, .access =3D PL1_RW, .accessfn =3D access_tvm_trvm, .type =3D ARM_CP_ALIAS, - .bank_fieldoffsets =3D { offsetofhigh32(CPUARMState, cp15.tcr_el[3]), - offsetofhigh32(CPUARMState, cp15.tcr_el[1]) }, + .bank_fieldoffsets =3D { + offsetofhigh32(CPUARMState, cp15.tcr_el[3].raw_tcr), + offsetofhigh32(CPUARMState, cp15.tcr_el[1].raw_tcr), + }, }; =20 static void omap_ticonfig_write(CPUARMState *env, const ARMCPRegInfo *ri, --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612543; cv=none; d=zohomail.com; s=zohoarc; b=lZn+lFa4t1L9zGZQ3oEoGVNht6Dod/CEx28eEpqdnIzsxDN8epol/8ycJbVuFpLTH28AXTdouHsKaZQT60jgvZYpu9i+7Yk4t4ZwUjXTEhFUAnhHUbK5z6c4qQI+R+nbgB1Xiaa2vwEvHmZTUHI4099igwO0Az3Tm3xs93JCN7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612543; h=Content-Type: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=k+agdHsoXkyN24SO9Mrx4Wx8U5Esci/uwWZVnp/Afsc=; b=R7QXEzEiakEmBAd+b/RVuAeN6IYs/+006gRjv9KhMtvms+6GKng5O48yuaUzdTGtDq6eIz8IjlvTh/feDHXhcxiK9AJDABZ7e3+LBvAWmt5EeZOGPoyRqQ1fKc1aryY7rncsFeL/fYFLIp5njTW/7+Areja1/gLXU/F0E8NE+wo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612543184522.1957066378694; Sun, 18 Jul 2021 05:49:03 -0700 (PDT) Received: from localhost ([::1]:58472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56EA-0006gS-4s for importer@patchew.org; Sun, 18 Jul 2021 08:49:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bh-0003jh-Ib for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:31 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:44017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Be-0003UU-6r for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:29 -0400 Received: by mail-wm1-x32e.google.com with SMTP id q18-20020a1ce9120000b02901f259f3a250so8725298wmc.2 for ; Sun, 18 Jul 2021 05:46:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:24 -0700 (PDT) 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=k+agdHsoXkyN24SO9Mrx4Wx8U5Esci/uwWZVnp/Afsc=; b=Yk7Ya+uTuwtaWxXC6mp1w3nW+Shh2ieUbyKztgt2HxSEAV3oWPPV0zgFGF4nc8DJ80 H2yAiBXO60Zr/h8F7EBdH0iYj205emmThLw5NRudS3ciJnbkDmPCY00CuTZFyyBKEkCq LxRLyA12qdRwmeFqtsyf086a+K2f9lt1aTGo2/weKergYboj7oy9Jd4EivtDU4nIGRur 0G8DHqw0XpN2Xxk3ByQBGYXhyM9r0E16PS/Vg9/GjpJ7oyro/qFJb9h+sO0s3Y+Spogm auuTJZJWa7kA4md5OMkJcwoiBRhjnVObOIuASGTcZhNTc/ZtuexoG6tVmnDyThhVy2y0 gzww== 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=k+agdHsoXkyN24SO9Mrx4Wx8U5Esci/uwWZVnp/Afsc=; b=gjld2IqX1VtsELOBGyMVk6eP1yuiWBs9hi+Zxz/WTnWWa4O6uwQ7hcYxUlO2IFZLX8 csYJ+AABtvQPBK52uTGKfH0u201U29R487WfOMh9uKLSfOCHYdAIX1Qdhy9j7QT3NjTN IRieXdK4G+vuHcGo54CWo00uMTQgvOAiOnFy6WduMPaPtLXdDARXs2HuR5kzdodAQGXy yKcUGjAR8RUAuorTw/eoAh4EEnZ0KZ3F5W+972L0C2SGtGnLIdPn5wdalxkhtgLwg73Q BR/3MlK2DIbXNfka1qwf/5C1ghJ+bgwL0dEtw9mAdG00+4jsbliWvqvjLzdw354N7V6V +yeA== X-Gm-Message-State: AOAM532KkrPZeRkiq410SwXbm6Nq3DXn50Q7L1xr0VfQnwN/qNAxtVnR 6Cl9+zdpaLPw4tlsHmg65r+1dEKfZxRbOQ== X-Google-Smtp-Source: ABdhPJxQ8JtZcrzlMaFbr63HVhIXFv5U5hsMdaHCCTvobIFgPB5IrPWcRSVkUVgZd3sAc4ZwNd8qjw== X-Received: by 2002:a7b:c385:: with SMTP id s5mr20922888wmj.43.1626612385004; Sun, 18 Jul 2021 05:46:25 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/12] docs: Fix documentation Copyright date Date: Sun, 18 Jul 2021 13:46:11 +0100 Message-Id: <20210718124621.13395-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612543684100001 In commit 6d8980a38fa we updated the copyright string we present to the user in -version output, About dialogs, etc, but we forgot that the Sphinx manuals have a separate copyright string setting. Update that one too. Signed-off-by: Peter Maydell Acked-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210705095547.15790-2-peter.maydell@linaro.org --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 42729e22bbe..ff6e92c6e2e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -87,7 +87,7 @@ =20 # General information about the project. project =3D u'QEMU' -copyright =3D u'2020, The QEMU Project Developers' +copyright =3D u'2021, The QEMU Project Developers' author =3D u'The QEMU Project Developers' =20 # The version info for the project you're documenting, acts as replacement= for --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612683; cv=none; d=zohomail.com; s=zohoarc; b=mgyX6uljhHEPm4Abx0EuYO+Mxn6J0FRAayLFn7JwqmgBJynVF/JYflS5Al62NzHsEZd5jw1B2bdvWj0rT0q5NCgXXBMl+eUST6iTn3cnIvFtGbmGCALpFeZjxDR6vB2wQr02+NYKmUPf27jxbfllxCNbPYQ7nnK36L6nZZGb01k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612683; h=Content-Type: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=QOX6scBkPNt+Kv7Yrbt4acFURX9zLi1ymADxEH31q2M=; b=c4ik3FdqqPPRV1xd9qeDZEUhUm4K4LxtCzcSx36dZ9GVh4L7jC3a0pGuQGZ0D/Cyczv2IHh1ELyfU9cG3vDvw0CWMH/CMvtqhM0tHcMMaXBCSYxAoNSHE358MhS2imiHoRa+zbFd5ljDKcj23sd1OhZrlneZwLV7PlS5tdNDUVg= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612683057840.2241671786368; Sun, 18 Jul 2021 05:51:23 -0700 (PDT) Received: from localhost ([::1]:38688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56GQ-0003oL-2z for importer@patchew.org; Sun, 18 Jul 2021 08:51:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bi-0003jm-Of for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:31 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:50713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Be-0003Ua-Uf for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:30 -0400 Received: by mail-wm1-x336.google.com with SMTP id l6so8642752wmq.0 for ; Sun, 18 Jul 2021 05:46:26 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:25 -0700 (PDT) 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=QOX6scBkPNt+Kv7Yrbt4acFURX9zLi1ymADxEH31q2M=; b=ELLwmydXDlAcnquNKSk/KoLvnPI8w6+9fIsgpdxYtKBv5U4PAmfuZ+b1z3f32JXD3i 9NlN00Pa51L3+GxtudwnEd9FRVy8XwQGnIFSD43W6YLoNF4FL7QZQ8eMtqBigWZ+8uMU sCC2CEN5s1PMUWABIircgipZZLE1/sOoJa5a5H0VChYKdqf21WKiABo04UcPuiRTNMWO flNsJpbn2a36szUuCB0EZEAhn9v39RlhEi+Lm8NzLqRAmaPZKvwthCCsEV5LM1GU9bqp ceFixVtifKYDb0Uqx/JfcZsZVIkS0pueVqxxMXjFeMwQyhFr+4W9E2Dv6MsQ6vLisopg MmzQ== 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=QOX6scBkPNt+Kv7Yrbt4acFURX9zLi1ymADxEH31q2M=; b=Qk8gDC9tNYfKcfeDJuBM/iDIWEB+EtMoekXN/7QoaWlr5HcCLE5HdDh5gBVJE9YRgG KwJTXbGYXxlw8Zr3mM0wnfJL2KoqmVl5tPcASZgTgbKhW2wzaEdZWMsYO84WAyszGITo kWf2MTMWiMT98wCAiwDizC0liYx2qMQolP/KqX1yKF73cJpF5ngYVAyD6ZfteHWhHaxc zJcAcsIi+TGkAakSRf1wWJ6ot3eCnnw45tbHPrkSfSwHijiG2WTLiuzaW14oljvb6pK+ 4o+FQt4N548PwhYdTyieWXHxG17/ugpNIs9uWvtREy3B1Gl8h/WgnmPSv7HoNeELwpS9 fa6w== X-Gm-Message-State: AOAM530atH5k95woW+0QNHGgzBOM9WFIjoO0u9WekbEBld9nsxgLL3p6 f/B3H2OHXHVAsYy7yop4fQmix/lJpYP3VQ== X-Google-Smtp-Source: ABdhPJyWwPgU+ouGGRvaMKDMN7BzLPHnjAyLwc8gZU4TRODGUEqPHxp2oVo4vxinT7UFe/M2rGpE+w== X-Received: by 2002:a7b:c083:: with SMTP id r3mr21391812wmh.97.1626612385675; Sun, 18 Jul 2021 05:46:25 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/12] docs: Stop calling the top level subsections of our manual 'manuals' Date: Sun, 18 Jul 2021 13:46:12 +0100 Message-Id: <20210718124621.13395-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612684778100003 We merged our previous multiple-manual setup into a single Sphinx manual, but we left some text in the various index.rst lines that still calls the top level subsections separate 'manuals'. Update them to talk about "this section of the manual" instead, and remove now-obsolete comments about how the index.rst files are the "top level page for the 'foo' manual". Signed-off-by: Peter Maydell Acked-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210705095547.15790-3-peter.maydell@linaro.org --- docs/devel/index.rst | 5 +---- docs/interop/index.rst | 7 ++----- docs/specs/index.rst | 5 ++--- docs/system/index.rst | 5 +---- docs/tools/index.rst | 5 ++--- docs/user/index.rst | 5 +---- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 40a7e2ee6ff..9299d2a502d 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -1,10 +1,7 @@ -.. This is the top level page for the 'devel' manual. - - Developer Information =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -This manual documents various parts of the internals of QEMU. +This section of the manual documents various parts of the internals of QEM= U. You only need to read it if you are interested in reading or modifying QEMU's source code. =20 diff --git a/docs/interop/index.rst b/docs/interop/index.rst index 219a5e5fc50..8b34da6f551 100644 --- a/docs/interop/index.rst +++ b/docs/interop/index.rst @@ -1,11 +1,8 @@ -.. This is the top level page for the 'interop' manual. - - System Emulation Management and Interoperability =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -This manual contains documents and specifications that are useful -for making QEMU interoperate with other software. +This section of the manual contains documents and specifications that +are useful for making QEMU interoperate with other software. =20 Contents: =20 diff --git a/docs/specs/index.rst b/docs/specs/index.rst index 7b08314d334..4c0d2a37cb8 100644 --- a/docs/specs/index.rst +++ b/docs/specs/index.rst @@ -1,9 +1,8 @@ -.. This is the top level page for the 'specs' manual - - System Emulation Guest Hardware Specifications =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +This section of the manual contains specifications of +guest hardware that is specific to QEMU. =20 Contents: =20 diff --git a/docs/system/index.rst b/docs/system/index.rst index 6092eb2d91d..2a9bd759807 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -1,10 +1,7 @@ -.. This is the top level page for the 'system' manual. - - System Emulation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -This manual is the overall guide for users using QEMU +This section of the manual is the overall guide for users using QEMU for full system emulation (as opposed to user-mode emulation). This includes working with hypervisors such as KVM, Xen, Hax or Hypervisor.Framework. diff --git a/docs/tools/index.rst b/docs/tools/index.rst index d923834a739..ffb14b9690b 100644 --- a/docs/tools/index.rst +++ b/docs/tools/index.rst @@ -1,9 +1,8 @@ -.. This is the top level page for the 'tools' manual - - Tools =3D=3D=3D=3D=3D =20 +This section of the manual documents QEMU's "tools": its +command line utilities and other standalone programs. =20 Contents: =20 diff --git a/docs/user/index.rst b/docs/user/index.rst index a5b47459ec7..6ac2ac089fd 100644 --- a/docs/user/index.rst +++ b/docs/user/index.rst @@ -1,10 +1,7 @@ -.. This is the top level page for the 'user' manual. - - User Mode Emulation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -This manual is the overall guide for users using QEMU +This section of the manual is the overall guide for users using QEMU for user-mode emulation. In this mode, QEMU can launch processes compiled for one CPU on another CPU. =20 --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626613062; cv=none; d=zohomail.com; s=zohoarc; b=FPtF7EbcHmsMGgwb4jIVEu2tKUamFuJuIMnG3pO0H2JhMJ2HRv1n93xKitBUM0S+jNIkx+VtZXVNdDzXM7xpiD/h8A0MltWd+AGsohdxaND0z5VEt5dYT5cMNNa04ojKYD9Y5sDEI2D6zAfsnQK4tlmKYAH7NaWi+wIrkQhBaE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626613062; h=Content-Type: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=lhPK/MgzzWgIQuDKMvdlrdmQb+MRcqpffc7m8kQ3zIs=; b=H/Y289bqtZHRbZktKDesKVWVh6kP4srWcs5b2W53N9zGquY4L+h2h5zbahBuyQ9xa62YgNI0Kf0RnYLXABcbru+0SNsZPyir++H+7L7kb6xm4mUppHG1MkceETlgqfmpXZsSXDjkMzzzPVp3OotJqaXY40oWj2SK1o+/dcVcB1E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626613062409294.6760110216293; Sun, 18 Jul 2021 05:57:42 -0700 (PDT) Received: from localhost ([::1]:52746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56MX-00051O-FH for importer@patchew.org; Sun, 18 Jul 2021 08:57:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bj-0003kN-Jk for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:33 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:34463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bf-0003Us-Qt for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:31 -0400 Received: by mail-wm1-x32c.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso9141489wmc.1 for ; Sun, 18 Jul 2021 05:46:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:26 -0700 (PDT) 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=lhPK/MgzzWgIQuDKMvdlrdmQb+MRcqpffc7m8kQ3zIs=; b=mtA2lVt8pCgr1IPPcB+pfiqaGvq02D7lJM+hekFBDhooyA34TVyb2hYy67OzHANJSw /p4CRN3gVyDDY1rD90IhOoey34u4bvFB3pu4DKE0NWb3Bddr4RK4rEhJQk0cc/Hpbjlw 9NxRnKgmKEQuqWDrgmeVyJYKbOmxP4jbJf0gO9SbgxUhiZnZCMQReryw6Siiye5mmzlo jlDWP6BFqdXSf4xdCvjEQTWn8C31kGKIntprWM81jpKNqR0vWid+TCZ8IrIsi2QUww7Y yQgMJPxA1qKgBydgpPzhj/VS3Y/TSwmK7Ku0acl1UCmbmeV/jL6EZxNt+ZU+jq2ytaDF HZLg== 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=lhPK/MgzzWgIQuDKMvdlrdmQb+MRcqpffc7m8kQ3zIs=; b=tBhwQ4/KIVV1ieeJ41oz9tur0EujGBLyoyHQSv7CHIjP2uA7yxczZDfC05UchnXK8z Wixzw00g/qoPNXlrvPo88KYu5ZFsLF2h7eZTxTPIzGJTLdG5AOycaXT8FxkIFiaH9DbC tjx2PTOUxXFbEL06+lwfH2H1Oj5UtxGfiNo1tb7VLwKFbQKu6a/sXIZYEU8MsGaPgkpC 6vu4HsTiZMh3YvX5bBLv99LMXzwpWq4EC4PuRoW++j1vdJ0DygplwIO1D/STvctIRJZr OA9il1rMZ/yTz9kJTzrf6OkitCMZatrIdMri2OxgKiwx2dhE3G6BJTfFIWivxzZr1Q8V Z+zA== X-Gm-Message-State: AOAM531w13aS564ZD7DzUb5E+dxFvmNdjEJMTjS2gUf6ttApzaROIa8b G1K6oGRQw8Ix0SDStqyT11DkdzmY6jDmzg== X-Google-Smtp-Source: ABdhPJzqRGR7khnPR9FP6BMRUkb2zGyttWVyvc8erId3mkFCj0EJRWfUXxDuCC5zV2TM7gVDjjh1fQ== X-Received: by 2002:a7b:cd15:: with SMTP id f21mr21947830wmj.148.1626612386445; Sun, 18 Jul 2021 05:46:26 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/12] docs: Remove "Contents:" lines from top-level subsections Date: Sun, 18 Jul 2021 13:46:13 +0100 Message-Id: <20210718124621.13395-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626613064605100001 Since the top-level subsections aren't self-contained manuals any more, the "Contents:" lines at the top of each of their index pages look a bit odd; remove them. Signed-off-by: Peter Maydell Acked-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210705095547.15790-4-peter.maydell@linaro.org --- docs/devel/index.rst | 2 -- docs/interop/index.rst | 2 -- docs/specs/index.rst | 2 -- docs/system/index.rst | 2 -- docs/tools/index.rst | 2 -- docs/user/index.rst | 2 -- 6 files changed, 12 deletions(-) diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 9299d2a502d..153979caf4b 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -5,8 +5,6 @@ This section of the manual documents various parts of the i= nternals of QEMU. You only need to read it if you are interested in reading or modifying QEMU's source code. =20 -Contents: - .. toctree:: :maxdepth: 2 :includehidden: diff --git a/docs/interop/index.rst b/docs/interop/index.rst index 8b34da6f551..b1bab81e2ee 100644 --- a/docs/interop/index.rst +++ b/docs/interop/index.rst @@ -4,8 +4,6 @@ System Emulation Management and Interoperability This section of the manual contains documents and specifications that are useful for making QEMU interoperate with other software. =20 -Contents: - .. toctree:: :maxdepth: 2 =20 diff --git a/docs/specs/index.rst b/docs/specs/index.rst index 4c0d2a37cb8..b7b08ea30d7 100644 --- a/docs/specs/index.rst +++ b/docs/specs/index.rst @@ -4,8 +4,6 @@ System Emulation Guest Hardware Specifications This section of the manual contains specifications of guest hardware that is specific to QEMU. =20 -Contents: - .. toctree:: :maxdepth: 2 =20 diff --git a/docs/system/index.rst b/docs/system/index.rst index 2a9bd759807..058cabd36cc 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -6,8 +6,6 @@ for full system emulation (as opposed to user-mode emulatio= n). This includes working with hypervisors such as KVM, Xen, Hax or Hypervisor.Framework. =20 -Contents: - .. toctree:: :maxdepth: 3 =20 diff --git a/docs/tools/index.rst b/docs/tools/index.rst index ffb14b9690b..ef6041a490f 100644 --- a/docs/tools/index.rst +++ b/docs/tools/index.rst @@ -4,8 +4,6 @@ Tools This section of the manual documents QEMU's "tools": its command line utilities and other standalone programs. =20 -Contents: - .. toctree:: :maxdepth: 2 =20 diff --git a/docs/user/index.rst b/docs/user/index.rst index 6ac2ac089fd..9faa4badd78 100644 --- a/docs/user/index.rst +++ b/docs/user/index.rst @@ -5,8 +5,6 @@ This section of the manual is the overall guide for users u= sing QEMU for user-mode emulation. In this mode, QEMU can launch processes compiled for one CPU on another CPU. =20 -Contents: - .. toctree:: :maxdepth: 2 =20 --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612547; cv=none; d=zohomail.com; s=zohoarc; b=NXhE4fEMCBRa5WI0d0v28xTPYtBaw/zF0g/iCxAZUTPVFzVdubWC0hxFFylLDqInSQlxF9Nd3WQNY6PR8FEAT3Mv0hz1I9sAF6Zst2hCkYtBapqhRR8on6YmNlDt+smsTgrKlMKBg1w7Mvyti+YFId/pUF/CYCg6vjmvG16uXaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612547; h=Content-Type: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=4I9/jw2cx7Pk8otbfx+cBDcmVAJ5Zcywf2LBoJK+/Y8=; b=h8/Cvto/IWeZmn8A3xes68CcCVSL5rB2S6nInBo5AkXVkM+mvRjT3orTTRFETmKsH6EVMeV4DhbO4Gv1mjOzII4SrgrVVf9m+21OWC07+6r8kuf0FekJHG1yndOrRW79Jm7KENMA1FTv4S3MaKYbZ9LdaRgD27J87wORQNBPQNI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612547101780.5225254886064; Sun, 18 Jul 2021 05:49:07 -0700 (PDT) Received: from localhost ([::1]:58894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56EE-0006x8-3o for importer@patchew.org; Sun, 18 Jul 2021 08:49:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bj-0003jo-5P for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:31 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:44812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bh-0003V0-AB for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:30 -0400 Received: by mail-wm1-x32b.google.com with SMTP id f10-20020a05600c4e8ab029023e8d74d693so3700249wmq.3 for ; Sun, 18 Jul 2021 05:46:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:26 -0700 (PDT) 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=4I9/jw2cx7Pk8otbfx+cBDcmVAJ5Zcywf2LBoJK+/Y8=; b=mjJQvXj6p4xuPsgkDUvpoy+YPbFIeNHGt2j3Pl3b5eE3Hb90bFaqH3S02SCGw/TBYx oQOX+0L19+MjYA/nt4mXQYZef8ZexpNXvm4hpLJO3erbFsFP/v9V05/jzVApEyTZxrBd 2VHWZJzPFFMgTOtrOGiLdmLAHb4Ozhj9gzT6OpbFMiabV9vqbuC6PriTXoB8blgSdNCB DU2V3G52FfJYmdLlEuMKanQEj803WYB1uF3wgtKm8bqBZVQgm1zGqztiCdeGbn34zyA+ iOPOaJPreYlEMAVlCpe9zTSsDoaYitS3SZrEnU3qDhGJa9ORNpTbAxX7vRoLOP8d2duO lpFQ== 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=4I9/jw2cx7Pk8otbfx+cBDcmVAJ5Zcywf2LBoJK+/Y8=; b=JEuS8p05u4Lax0vuBo8+IXcG9+eynzJzLAxirflIq0bMf+Nl705Be+ECszQahVWXzR /X5JI2hS5d8rW2jE1cvnlUBVvTXoZSLoNbouTqf9uIvoRezNQdSzBHkWniu0L3wPYmqt R5CH+ZPntQOkW3s97eTePwPqbGHl4OJsn1gbOwRIBmeaKIS6uMGk8G7+Pk6B/x45+mRs Lc3mhmRRGmjeAyPoowDdrg+YYAzMtLqavesWFO1UUIA9TNzAhTwFiQjmrqoUjD1+4B5f 0EUc8IFf0EtcQH0rs8ezwD0FfcpmBzYUtUcgLxPvcRhMOB3GrD0idBYrtjeJ5WQuOA13 PUUw== X-Gm-Message-State: AOAM5309JhJzpvMX1wosmc7t9Ttkt8v9V4Z2d5xZlqM0gMrJGsbMdKHE ICHm4rWwogWjd7kO0ng3Q/4qLwZHk+hzZA== X-Google-Smtp-Source: ABdhPJzj2FpHF/TrhmFkBmXa2zUhTRGBUNDNy122kPknv51r/ICD9slsURsgcQyaynVOSYl1rp4jnA== X-Received: by 2002:a1c:790e:: with SMTP id l14mr26525537wme.119.1626612387082; Sun, 18 Jul 2021 05:46:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/12] docs: Move deprecation, build and license info out of system/ Date: Sun, 18 Jul 2021 13:46:14 +0100 Message-Id: <20210718124621.13395-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612547728100001 Now that we have a single Sphinx manual rather than multiple manuals, we can provide a better place for "common to all of QEMU" information like the deprecation notices, build platforms, license information, which we currently have in the system/ manual even though it applies to all of QEMU. Create a new directory about/ on the same level as system/, user/, etc, and move these documents there. Signed-off-by: Peter Maydell Acked-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210705095547.15790-5-peter.maydell@linaro.org --- docs/{system =3D> about}/build-platforms.rst | 0 docs/{system =3D> about}/deprecated.rst | 0 docs/about/index.rst | 10 ++++++++++ docs/{system =3D> about}/license.rst | 0 docs/{system =3D> about}/removed-features.rst | 0 docs/index.rst | 1 + docs/system/index.rst | 4 ---- 7 files changed, 11 insertions(+), 4 deletions(-) rename docs/{system =3D> about}/build-platforms.rst (100%) rename docs/{system =3D> about}/deprecated.rst (100%) create mode 100644 docs/about/index.rst rename docs/{system =3D> about}/license.rst (100%) rename docs/{system =3D> about}/removed-features.rst (100%) diff --git a/docs/system/build-platforms.rst b/docs/about/build-platforms.r= st similarity index 100% rename from docs/system/build-platforms.rst rename to docs/about/build-platforms.rst diff --git a/docs/system/deprecated.rst b/docs/about/deprecated.rst similarity index 100% rename from docs/system/deprecated.rst rename to docs/about/deprecated.rst diff --git a/docs/about/index.rst b/docs/about/index.rst new file mode 100644 index 00000000000..cd44456a6bf --- /dev/null +++ b/docs/about/index.rst @@ -0,0 +1,10 @@ +About QEMU +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +.. toctree:: + :maxdepth: 2 + + build-platforms + deprecated + removed-features + license diff --git a/docs/system/license.rst b/docs/about/license.rst similarity index 100% rename from docs/system/license.rst rename to docs/about/license.rst diff --git a/docs/system/removed-features.rst b/docs/about/removed-features= .rst similarity index 100% rename from docs/system/removed-features.rst rename to docs/about/removed-features.rst diff --git a/docs/index.rst b/docs/index.rst index 763e3d0426e..5f7eaaa632c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,6 +10,7 @@ Welcome to QEMU's documentation! :maxdepth: 2 :caption: Contents: =20 + about/index system/index user/index tools/index diff --git a/docs/system/index.rst b/docs/system/index.rst index 058cabd36cc..fda4b1b7054 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -35,7 +35,3 @@ or Hypervisor.Framework. targets security multi-process - deprecated - removed-features - build-platforms - license --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612681; cv=none; d=zohomail.com; s=zohoarc; b=MZmF0CnNrVSKvesZ0txhoIu2nuu7bVDPC/MJaXHPf6HyKEHBe9v4ASOWA+xr0dpQMp22Mgc3QlsD9k2ACVcY8IlGqQ7xegBgniUnHw+hYavz7zT4eNtYXps0kcm/m9XAYKr1RCudW3vi7V7s5C0QLM8+dCo7RqVylAMLJG31mnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612681; h=Content-Type: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=z7J/rUuKm8358YHoVd/lSDxAvFrc+FuCzCDTJjoBxRA=; b=mJzNawA23TOt4P9mTU/ebQHNDLiHuxbFWHMF2bQ1ZUIkUv17ce2zEuDXj6iQh+i8qXI3m5Wjr332kW0odqoq9JaOGWezYEigZcEEcXglbvqCU0IhIjmtZZSq2Uj9QSx502Al/4guXA5wOZ5cKJEG6jOpNZshnutlBA9dUE9XftY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612681436784.0106116652674; Sun, 18 Jul 2021 05:51:21 -0700 (PDT) Received: from localhost ([::1]:38602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56GO-0003l6-FK for importer@patchew.org; Sun, 18 Jul 2021 08:51:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bi-0003jn-SW for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:31 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:53764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bh-0003VH-AP for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:30 -0400 Received: by mail-wm1-x32c.google.com with SMTP id w13so8614890wmc.3 for ; Sun, 18 Jul 2021 05:46:28 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:27 -0700 (PDT) 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=z7J/rUuKm8358YHoVd/lSDxAvFrc+FuCzCDTJjoBxRA=; b=crHvPubY5bajnfvsBnOdrZUpX6pjDKM7n+9ubldtz6kWsSJYkegW28JAq/Gqj/UIK/ 4tvUBH8eC1phdchTmIY/o6JvwG42oAycQqAXD/WLBWGPr0fSO4KdA6hqVKfFhbPkoxf3 5k0sfmEhiDY/jcVlqP75aVRG1foqH2g15XV1DTbkZiW3e7eMXp7Yh6wzYE1YGBi7++AB v0cyVCXmAwg2zQlcC6TNyoWkkjl6SjstduKfVURk0hL5nOpFPaszGM5DH5hFupeaqq0K DT4XHFaTsbcES0cL0tGvUZKqnO9WgIcMAxtpKWYIIy5uuMbzCd50nJNXZeyCVtbgdms/ pogw== 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=z7J/rUuKm8358YHoVd/lSDxAvFrc+FuCzCDTJjoBxRA=; b=XbNcBpfCP8Ndz5y8asJiAdcbjcIjCsE8PqHN4fkHjdtt7ApecdjINefjCChKhDEaA3 69Qkkm+1GsPVXhDmA1iNnnc2xTLiZ3wEetrhNHkuV1bEBmcBOPTmpryWFaZk54dE6OAu jIuRuNdw1GCD/1HbEN85zirhpj2R/PTiA3lYnqjoOZRoiLv+lroWFXzEl1kz+D4y80bD SfKhjsbfJIDvDjYUYkDcPemC0RwIM5LRSb4hgS+vw1QUBR+wc6a+mcGaprKsGUpoQUUD ALvAWcgtSWG9gRoVTDdXf3aW+9wVvgn5NzLgBojoFdgN1vqjurKNVERli6QvkM2XqPqV f3uA== X-Gm-Message-State: AOAM530o0Bmofl7VmSzERtXMLioNHTqwBirnnVCaLXxr2GD595p2QQQz cUKs2ey6mxBA9Yrzy3IBCpEZ85ufnCMirw== X-Google-Smtp-Source: ABdhPJweyBEIJfaN9tpB9p3VN6bQ1NpR16pGKj2YsOlFTlgrg7pC8ej/nmCRrIBMh5usQ7GQjoEfqw== X-Received: by 2002:a1c:2782:: with SMTP id n124mr27973128wmn.114.1626612387814; Sun, 18 Jul 2021 05:46:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/12] docs: Add some actual About text to about/index.rst Date: Sun, 18 Jul 2021 13:46:15 +0100 Message-Id: <20210718124621.13395-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612682732100001 Add some text to About to act as a brief introduction to the QEMU manual and to make the about page a bit less of an abrupt start to it. Signed-off-by: Peter Maydell Acked-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210705095547.15790-6-peter.maydell@linaro.org --- docs/about/index.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/about/index.rst b/docs/about/index.rst index cd44456a6bf..689a9861dc3 100644 --- a/docs/about/index.rst +++ b/docs/about/index.rst @@ -1,6 +1,23 @@ About QEMU =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +QEMU is a generic and open source machine emulator and virtualizer. + +QEMU can be used in several different ways. The most common is for +"system emulation", where it provides a virtual model of an +entire machine (CPU, memory and emulated devices) to run a guest OS. +In this mode the CPU may be fully emulated, or it may work with +a hypervisor such as KVM, Xen, Hax or Hypervisor.Framework to +allow the guest to run directly on the host CPU. + +The second supported way to use QEMU is "user mode emulation", +where QEMU can launch processes compiled for one CPU on another CPU. +In this mode the CPU is always emulated. + +QEMU also provides a number of standalone commandline utilities, +such as the `qemu-img` disk image utility that allows you to create, +convert and modify disk images. + .. toctree:: :maxdepth: 2 =20 --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612803; cv=none; d=zohomail.com; s=zohoarc; b=CNfI5LWp+4Mjs7XvYbK3UH313UEJHiRIdBpI4aVW7ZxwZtIBnmuzNA/Wu5Fiekgn3p7rUl0qhOGzyKQGzrqEfufjPbKVA5KyOszDCyhdYp7y9HCXnzobUjGGQ0wc3hbhqIyVJ2bu6QQv+L10RIY5lsdAbZ6QaG8WLEtX/Z4rOb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612803; h=Content-Type: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=C6ty/bKNq9kcYcHoqFuthemChfcdB6FKy5dP98tkNXo=; b=BcPmTGRGcC/HxdZtyQJ9MwKPisjMOiUfSWuo55LbjxmUTFfl4Pb0zfS97cMSFsrcTG/DqSjI7MIqggMX3OZOI3iuRSyDYm6EBidyeTbz4LrzV4lDjEwaR6IYrD4OFFZsyLE636YyGzH2Q3bkT0mPKw2EX1ptH/XZ2KUlgZeZJZY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612803631836.2353363286371; Sun, 18 Jul 2021 05:53:23 -0700 (PDT) Received: from localhost ([::1]:44880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56IM-00084t-LN for importer@patchew.org; Sun, 18 Jul 2021 08:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bk-0003kS-HA for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:33 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bi-0003VR-E1 for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:32 -0400 Received: by mail-wm1-x336.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so11068708wmi.2 for ; Sun, 18 Jul 2021 05:46:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:28 -0700 (PDT) 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=C6ty/bKNq9kcYcHoqFuthemChfcdB6FKy5dP98tkNXo=; b=x1F9//sjml4X/zZ1ET/mIpm30w8b5WSv2bmYJ96SNROTFVepeUGmcGDtBZupxMcXMj E/Vat9hiks8vHs51UEKISF1qME8fNQUnYc3GhcwOjlxmtIpofqq/RgR51FM4upOlfaIb OtX2XZb/l8/J3u0qFUIPI/I6k3YiUoXedXKEq+YL5d7whKgD7ggP3MaokphyXNa0O4Pv hyzl6fiqJL6SD8sUGs6XvE79oW2jLzB+UJ6MWrIiM6zFFRgfaOVSvuraewB1vBmUmF6h S/yxXO8cOROiki8vXe68bgQg3MeZrYq9pnNuyWZoUPExiDUQ1i7F9913alYIhK8UETYZ gu6g== 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=C6ty/bKNq9kcYcHoqFuthemChfcdB6FKy5dP98tkNXo=; b=ChBsmlybxZYoHAcqiqlxSN3/3LkhUFVLagqKFNHmJ4Wn/xf+uABDEswYgUch6YgoVD cnU2McGKg08H7GVSi3SPzttVnMz/H7G9CXidc+Miou4MNlm55lUlLu9hDBxt7bmQFMIC fR/G6VGGDYJinn2EvEXpMYDKHA41+XokYhcFByHM8MngO+S8Y3+HvHFA8YDGVQRf7o2x WzEb+YRv6wMMVrCBbApzZdg4V/zQLfvnQ47P8FqZUQCj3PSF4dB4c+BaEb09Wa8nRDdp cu8w/VlVZS3W4f8ltHrNB3ht6iAO+9j/WJuiGZDcYAgaHDKv3dDath5ADU7XomOkvz3Z Jh+A== X-Gm-Message-State: AOAM532r9EtnwTheWME63wgXPR3hBw1JAkFX8t1nMrblCseYhiSEdRcU 010EHWcgUhRr+z/o1JktY6kPD1ycEFbI0A== X-Google-Smtp-Source: ABdhPJxviDAjc8yFgN01wa9gjEyD15wItzKX+rL+jutqryTc+Z8vh8IIMktykSgVVZdSb5dieB3d3w== X-Received: by 2002:a1c:4603:: with SMTP id t3mr27308755wma.178.1626612388494; Sun, 18 Jul 2021 05:46:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/12] docs: Add license note to the HTML page footer Date: Sun, 18 Jul 2021 13:46:16 +0100 Message-Id: <20210718124621.13395-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612805041100003 The standard Sphinx/RTD HTML page footer gives a copyright line (based on the 'copyright' variable set in conf.py) and a line "Built with Sphinx using a theme provided by Read the Docs" (which can be disabled via the html_show_sphinx variable, but we leave it enabled). As a free software project, we'd like to also mention the license QEMU and its manual are released under. Add a template footer.html which defines the 'extrafooter' block that the RtD theme provides for this purpose. The new line of text will go below the existing copyright and sphinx-acknowledgement lines. (Unfortunately the RTD footer template does not permit putting it after the copyright but before the sphinx-acknowledgement.) We use the templating functionality to make the new text also be a hyperlink to the about/license.html page of the manual. Unlike rst files, HTML template files are not reported to our depfile plugin, so we maintain a manual list in meson.build. New template files should be rare, so not being able to auto-generate the dependency info is not too awkward. Signed-off-by: Peter Maydell Acked-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210705095547.15790-7-peter.maydell@linaro.org --- docs/_templates/footer.html | 12 ++++++++++++ docs/meson.build | 3 ++- MAINTAINERS | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 docs/_templates/footer.html diff --git a/docs/_templates/footer.html b/docs/_templates/footer.html new file mode 100644 index 00000000000..4c15e17d2a8 --- /dev/null +++ b/docs/_templates/footer.html @@ -0,0 +1,12 @@ +{% extends "!footer.html" %} +{% block extrafooter %} + + +

+ +{% trans path=3Dpathto('about/license') %} +

QEMU and this manual are released under the +GNU General Public License, version 2.

+{% endtrans %} +{{ super() }} +{% endblock %} diff --git a/docs/meson.build b/docs/meson.build index 855e3916e90..300b1343291 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -44,6 +44,7 @@ if build_docs meson.source_root() / 'docs/sphinx/qapidoc.py', meson.source_root() / 'docs/sphinx/qmp_lexer.py', qapi_gen_depends ] + sphinx_template_files =3D [ meson.source_root() / 'docs/_templates/foote= r.html' ] =20 have_ga =3D have_tools and config_host.has_key('CONFIG_GUEST_AGENT') =20 @@ -76,7 +77,7 @@ if build_docs output: 'docs.stamp', input: files('conf.py'), depfile: 'docs.d', - depend_files: sphinx_extn_depends, + depend_files: [ sphinx_extn_depends, sphinx_template_files= ], command: [SPHINX_ARGS, '-Ddepfile=3D@DEPFILE@', '-Ddepfile_stamp=3D@OUTPUT0@', '-b', 'html', '-d', private_dir, diff --git a/MAINTAINERS b/MAINTAINERS index 9100f9a0439..814d103fe16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3451,6 +3451,7 @@ S: Maintained F: docs/conf.py F: docs/*/conf.py F: docs/sphinx/ +F: docs/_templates/ =20 Miscellaneous ------------- --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612530; cv=none; d=zohomail.com; s=zohoarc; b=hrj5eFDQkzwWOHLBXf0zypqDHhIkhEI+fOh9EFOoeWaRc1aRpbNkv5SsigAsXdDG2vIcKLNn2E4FoKZGlvygGUsDqwecrJ2JWXoGc3Gj8BiJF9IXVX+Msa28oiUOnax8tkZhVEeuzkd4r8a9axh3PH2ALY1zjioxveC25mlnFvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612530; h=Content-Type: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=PU0pR0OKW672khxpwhM6PMfFvQvI9Lta/Rj8udQdKIc=; b=g9D7sDgBw5X8SgEDCjT3QGrsEXmAE8nBR6MFdiSQhqoDK5Q7c+pzaDE7GMXYl7IHvhPulp9AOjLBh+o5F/nva+VWUzxDkBTlp/Av+u2jRdwTDbbrFAN0HR1n9NVnsWI1Gpr4I8yRgjbA7YMFQEXvTl4G4XJk5gRJ9aYWB8Zoano= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612530322821.833119199762; Sun, 18 Jul 2021 05:48:50 -0700 (PDT) Received: from localhost ([::1]:58448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56Dx-0006fg-5q for importer@patchew.org; Sun, 18 Jul 2021 08:48:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bk-0003kR-7N for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:33 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:45706) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bi-0003WB-Kh for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:31 -0400 Received: by mail-wm1-x32d.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso8723030wmj.4 for ; Sun, 18 Jul 2021 05:46:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:28 -0700 (PDT) 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=PU0pR0OKW672khxpwhM6PMfFvQvI9Lta/Rj8udQdKIc=; b=sfYuCXVX4FhdpOwe64kjwXh99edHMR5aYbeEJ0WhumWfy2r4Q1q/ED1K+zns5M4dsH Ft/jadRxQkdw/QGGjcaCRU3gi6X9R91WDZTwCSyF0Qr2/IyjyAom1KlEP37R/5SzEWaM +5FPtkldOhsT7/Y4/4Y/KyO8C1kD0O5qAfKpIcou4N6D9X+eYzcU9fjNgqxfsNhudzo4 klcPwsvHa9PgfKHz3ldSIwyllKS1j13m1qq9MTIlCL564sJVmsC4qbOYNuzRdH9kNuxc eFqhj+cgoHhXlMhVo7FIuoQX7dAK9Gsrz79gLdnHBpukfB3Cqzt6hjwKE+sHNmzEMj0S yFyA== 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=PU0pR0OKW672khxpwhM6PMfFvQvI9Lta/Rj8udQdKIc=; b=nNvF7HR3E78QuM4FVSmeb7QZGXmcpTDZUN2cpdyuyMpRdP2JmRUyQpem8wrRMZc0Op JOFy/DLQ/ju198tejlEerOOHm6+KTJs5vnZtQbd4ITfXUF8kVdkmLitL4LROAfoWZ7d/ 5cHyZijB0IRIFBK0gfFOmBk3fpwfPEtsfSwf5n2QYtUHzfNv98Stjv9MZlAbnjd5GnaB X51CUaBTKBs4VhB9Ff8t08BZVR13lw9fZgMaVH42Zi/uNZ94VMLNTpuxs3VDxwvGKJJP 0EjOFNxcbOfRqhREf5K43Ad+S1hmV8aG4uWAb9v99MAlZsQTwf75r5Ymm8ojpe4za/aE RNSA== X-Gm-Message-State: AOAM530tAbF8H5e6DoPzbuG7kKnDljq8BpSzJ0PmTwJQHsiiXTP0Gkgh H8IaewlYbaANssxt+qajvbszHSQvEwirmw== X-Google-Smtp-Source: ABdhPJznbwhQbBWZCYx35IaoCz1NqaHmtbrDeIC73AiBvxFETh/+rO21oWQxw1DvB4Jk5uaoD9a9Fg== X-Received: by 2002:a7b:cb53:: with SMTP id v19mr20672683wmj.127.1626612389407; Sun, 18 Jul 2021 05:46:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/12] docs: Add QEMU version information to HTML footer Date: Sun, 18 Jul 2021 13:46:17 +0100 Message-Id: <20210718124621.13395-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612531674100001 Add a line to the HTML document footer mentioning the QEMU version. The version information is already provided in very faint text below the QEMU logo in the sidebar, but that is rather inconspicious, so repeating it in the footer seems useful. Signed-off-by: Peter Maydell Acked-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210705095547.15790-8-peter.maydell@linaro.org --- docs/_templates/footer.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/_templates/footer.html b/docs/_templates/footer.html index 4c15e17d2a8..977053b5415 100644 --- a/docs/_templates/footer.html +++ b/docs/_templates/footer.html @@ -4,6 +4,8 @@

=20 +

This documentation is for QEMU version {{ version }}.

+ {% trans path=3Dpathto('about/license') %}

QEMU and this manual are released under the GNU General Public License, version 2.

--=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612958; cv=none; d=zohomail.com; s=zohoarc; b=jkcfX12UOHE1zlg7C2Xo5S1kbU8RzeIN+BzGIf86WTkIrVyUkKfek3sj2RRSuiuymvfmTnUEgmUcabAiYphy0ttP1EtIUxPZIVEdjz1hC0x1KPP2qlZkCRaY6+G4fSCgYMw5CMlBYKpIN22VdvKU4LwPXZZlPJi/E6f/uemUYIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612958; h=Content-Type: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=Tz5XVHLGKTsGTw2iya2aqq+WsyldbLkNCSIX8A001I4=; b=Z51QgUxDtCJU3nPi3ZtseGPZ45KYR2d61C8iyOkdY6iD8QJcZNMjkOo6dUCjo8CiKSkB1YexnPM2Exf11aKOwq5hJJrL7tuHTAf+IMWQrV0K1O0xHPkkpDE4thqJF0rqiUNAdZPLkwX4gBLt9mUZlRtSN4yxMW9aJLTXinlDoUQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162661295845194.92919690006693; Sun, 18 Jul 2021 05:55:58 -0700 (PDT) Received: from localhost ([::1]:49122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56Kr-0002XN-8H for importer@patchew.org; Sun, 18 Jul 2021 08:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bl-0003kY-Fk for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:35 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:40619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bj-0003WH-8P for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:33 -0400 Received: by mail-wm1-x32d.google.com with SMTP id f8-20020a1c1f080000b029022d4c6cfc37so9741736wmf.5 for ; Sun, 18 Jul 2021 05:46:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:29 -0700 (PDT) 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=Tz5XVHLGKTsGTw2iya2aqq+WsyldbLkNCSIX8A001I4=; b=Qziz0gzUtqU3GMerzoc+Vcf0yP9W9ZdbJWrJBEpgRPQ85dH/8nQtqyhmCdpL+cLISh am9av/fitrJmxh0ENYbOhdfw8r0Y9Re6nDOmqje47kAedZM3xb0CckJCBYIXgXDbshYc Q8eNBCYZU+YblrtnPU97TlxkA+hWZIovdatfXfXLBPOpXMVI8M0YmWtDW976OOf1JvZX FhEi1uOAJnyxK0tcZqLS6HNMPxiVWgXrV8wGWewe+IFciQeDjYue/iPYOfnqCtnGQKLP D9+hUEqcTbiz1AGI8xKHelnal28+rQ3JbeNJ7TEUhRnwDgkbMJwuQSGuQlIxR7b0NK89 vbTA== 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=Tz5XVHLGKTsGTw2iya2aqq+WsyldbLkNCSIX8A001I4=; b=UVu9lnvd+tZ9u8D408BztSLtWpmVur7yRV/LEU7LG41Mn78A2cKzaexg33gFgiUTHk PbbtYWSiJaZpARHhpwt2M+tNPAWj4N1REULQ4PgT8k7vt1haR8VTo31PIU5DH+yb78Yr M9ngLnrpQCyCZXGidIVib5TDPV+b8IgtT7X/xMEDLtVv2BnBNiaV7eJtQBv138gGLX9C RdZQBp+cKXTMJ9AgSV3mRv9/C0A0j0oXEXY9EEUdgUpiuof5a3ccCVPz17NwseFjrsbJ Yx2uezyIQ0G15tyv/Jv95HR0jeIktpTjGhd1UtkAIilUlLgkboJeu9HibPwu/w33QMbt Wy9A== X-Gm-Message-State: AOAM533qCidQPE8OIioiwcGkSHC79j67TiAH0BHTGg7tZTjm3dwqzXEW purXphHDxY5kmtnIHnJNQgcmvwGhIjCiuw== X-Google-Smtp-Source: ABdhPJwRv7GKr4BDBS0yi5iUxniTpqdLfNJKL4uBhHmRT5QgzMtro0VSwPpEh+UXxfjl5MTRMUL7bQ== X-Received: by 2002:a05:600c:19d3:: with SMTP id u19mr26187080wmq.115.1626612390055; Sun, 18 Jul 2021 05:46:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/12] docs: Add skeletal documentation of cubieboard Date: Sun, 18 Jul 2021 13:46:18 +0100 Message-Id: <20210718124621.13395-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612959604100001 Add skeletal documentation of the cubieboard machine. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20210713142226.19155-2-peter.maydell@linaro.org --- docs/system/arm/cubieboard.rst | 16 ++++++++++++++++ docs/system/target-arm.rst | 1 + MAINTAINERS | 1 + 3 files changed, 18 insertions(+) create mode 100644 docs/system/arm/cubieboard.rst diff --git a/docs/system/arm/cubieboard.rst b/docs/system/arm/cubieboard.rst new file mode 100644 index 00000000000..344ff8cef99 --- /dev/null +++ b/docs/system/arm/cubieboard.rst @@ -0,0 +1,16 @@ +Cubietech Cubieboard (``cubieboard``) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The ``cubieboard`` model emulates the Cubietech Cubieboard, +which is a Cortex-A8 based single-board computer using +the AllWinner A10 SoC. + +Emulated devices: + +- Timer +- UART +- RTC +- EMAC +- SDHCI +- USB controller +- SATA controller diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst index 705b8835e48..e2fcb64872d 100644 --- a/docs/system/target-arm.rst +++ b/docs/system/target-arm.rst @@ -85,6 +85,7 @@ undocumented; you can get a complete list by running arm/aspeed arm/sabrelite arm/digic + arm/cubieboard arm/musicpal arm/gumstix arm/nrf diff --git a/MAINTAINERS b/MAINTAINERS index 814d103fe16..1596b352b46 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -560,6 +560,7 @@ S: Odd Fixes F: hw/*/allwinner* F: include/hw/*/allwinner* F: hw/arm/cubieboard.c +F: docs/system/arm/cubieboard.rst =20 Allwinner-h3 M: Niek Linnenbank --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612959; cv=none; d=zohomail.com; s=zohoarc; b=g8eeDOCmBX+CASFvZGVcfrDH6OkzpmUe/cgJWP6+WZQOrlGiMPpjdGl+NYDhXeSTzn5ZJ6L6mo3Bpo6EVeR8QvBtMU5k6l7XD/4xZPXZ0XtsMhP0nzXThqOmnSYaCKiPh8OvgK7mt66G2V7UclYVgnIAhCiSXg3hoijuCzL2pKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612959; h=Content-Type: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=RXMddOMoQSEaXfNbqTIYzuEkUOjWwgdzOPERkMGl9nw=; b=lqy8fuGMKhCsJnk+fVHaP8EOlcw2xyTe8XRcWcorfIX3ESjib1YYfEElR+NgJEcfkhIZ+BqINAc5dpFFdFeyxKDSUCJeczksWw6JjZ3m60vHvyHKyL6hqiRJQTGCGtaym4BMEUODQartdojZwsUBdW3mhNWfrSymLZjTwJg0tVo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612959405455.0655053324642; Sun, 18 Jul 2021 05:55:59 -0700 (PDT) Received: from localhost ([::1]:49176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56Ks-0002ZL-9q for importer@patchew.org; Sun, 18 Jul 2021 08:55:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bm-0003kc-Nw for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:35 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bk-0003Wa-A5 for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:33 -0400 Received: by mail-wr1-x42e.google.com with SMTP id a13so18024966wrf.10 for ; Sun, 18 Jul 2021 05:46:31 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:30 -0700 (PDT) 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=RXMddOMoQSEaXfNbqTIYzuEkUOjWwgdzOPERkMGl9nw=; b=EAjJSpAUCzS97aBxG4zbdHhd2Jk0ThCRe+w088Z5v03HOqX80DMoj1pHqef2t/MJoC 9PYgcVLYZgX9Q3GZUA+RY36m0/0az9bJ1LJvc2oI8keTMjb5s57aS3gV4ML2IC06+szy 1mIKmh40GOtCPS1/jBYUL9Bqhy8tyxgGnm4z8VjyAZlTBeVpNRi6/J2VJxWcWimoOhR6 LhFxgnrht2eC+XvvNinfbfrPwsh0H+RV+FUco1bbfAAMefP6Qur2AKgaD8VZRXPNsy/Z QIrRTO8uYvtWeMtmSserrpSj+KuDiXubFh/z9y2d4FgOmkRFMO5PvEUXg2RJvvoyxUd1 q7Ng== 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=RXMddOMoQSEaXfNbqTIYzuEkUOjWwgdzOPERkMGl9nw=; b=ZiUAhbRx4gbvYNSeLu1+warWlm4LkBZcWidHI5t0RvNa+DPnWJMJARGXJj+T68JSik HVX7+pvAbrU64GsTrS7ag//gntpekfhTm6pPQERdiw9faOMRXsTIJw675hdPj8NjYacX sdhz61W8H2ExLD11OwChgHNPCvQtUT2M5pnPv3cZM0TfSMm36Xagsf9FYzGDLr0qIi/z N4Cx3ATjw2mEt86UuXQtjvPS6njqooKkVN67mNZNN7Z47LTAh7ASiCv1tSDIdVoR3PTE OXIy4Y8DdWZRhSVaQmOioyVuITS9/ssTJHbnWYLB9DGq8C2uQ3zFUlzeSNqPTB1UxxZ/ I4sQ== X-Gm-Message-State: AOAM533sLqvy/UOR1RBTq0FuhkfbL4kLyrCUho/JR5qi5Ot7poLJv2v/ yq2qtwPNZtAlNh0ZboJ10SlrIbhP5LmoxA== X-Google-Smtp-Source: ABdhPJxhvil8hxKvTg9U3mi5k21dkRS+dtB8UBvVFswiLrLwo3QqBtzdwC8C9u8nKMdh6Y6b9YHN1A== X-Received: by 2002:a5d:5141:: with SMTP id u1mr24488873wrt.193.1626612390679; Sun, 18 Jul 2021 05:46:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/12] docs: Add skeletal documentation of the emcraft-sf2 Date: Sun, 18 Jul 2021 13:46:19 +0100 Message-Id: <20210718124621.13395-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612961569100003 Add skeletal documentation of the emcraft-sf2 machine. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20210713142226.19155-3-peter.maydell@linaro.org --- docs/system/arm/emcraft-sf2.rst | 15 +++++++++++++++ docs/system/target-arm.rst | 1 + MAINTAINERS | 1 + 3 files changed, 17 insertions(+) create mode 100644 docs/system/arm/emcraft-sf2.rst diff --git a/docs/system/arm/emcraft-sf2.rst b/docs/system/arm/emcraft-sf2.= rst new file mode 100644 index 00000000000..377e2487206 --- /dev/null +++ b/docs/system/arm/emcraft-sf2.rst @@ -0,0 +1,15 @@ +Emcraft SmartFusion2 SOM kit (``emcraft-sf2``) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The ``emcraft-sf2`` board emulates the SmartFusion2 SOM kit from +Emcraft (M2S010). This is a System-on-Module from EmCraft systems, +based on the SmartFusion2 SoC FPGA from Microsemi Corporation. +The SoC is based on a Cortex-M4 processor. + +Emulated devices: + +- System timer +- System registers +- SPI controller +- UART +- EMAC diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst index e2fcb64872d..c52902acdad 100644 --- a/docs/system/target-arm.rst +++ b/docs/system/target-arm.rst @@ -86,6 +86,7 @@ undocumented; you can get a complete list by running arm/sabrelite arm/digic arm/cubieboard + arm/emcraft-sf2 arm/musicpal arm/gumstix arm/nrf diff --git a/MAINTAINERS b/MAINTAINERS index 1596b352b46..1504951823f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1024,6 +1024,7 @@ M: Peter Maydell L: qemu-arm@nongnu.org S: Maintained F: hw/arm/msf2-som.c +F: docs/system/arm/emcraft-sf2.rst =20 ASPEED BMCs M: C=C3=A9dric Le Goater --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626612802; cv=none; d=zohomail.com; s=zohoarc; b=XHlgXOm5ufWM1khS1KM5ZlXkVmha7dpAMaQVqDrTbJXqCFqw3JSXbhbirinRyLyBBTgvXupnUFhax8XYeFFU5WEQd3cjMwe2Gyre4rS+YBjA3BkwxSZonGwf/ThV2RN/tAcbIdVpUN5aKY0LWcl6Hb/+CWruTOZBX879H/rxw6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626612802; h=Content-Type: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=SI86JUBJzk2u9kiQ5LZPsmQhNkw8gHPm5jzTEnewX0w=; b=YStoBxuVHDremcG1P/cjU06GcsGD8rzeYBCGIQc1BeWatW0iZHZxzLfR6lOC1IZ2o+sQ5Fq0bvol0J9YOy5omY1oVcDmpOZQssfZn1cO8KywzMUml8V731Ew5aYW2FBoAHswBJruGDr3wBCPxkFJLMn8kKgeTiUhONQAwMh2XBc= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626612802986899.3448528428314; Sun, 18 Jul 2021 05:53:22 -0700 (PDT) Received: from localhost ([::1]:44824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56IL-00082f-VB for importer@patchew.org; Sun, 18 Jul 2021 08:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bm-0003kd-OG for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:35 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:39809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bk-0003Wn-KN for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:34 -0400 Received: by mail-wr1-x429.google.com with SMTP id f17so18056350wrt.6 for ; Sun, 18 Jul 2021 05:46:32 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:31 -0700 (PDT) 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=SI86JUBJzk2u9kiQ5LZPsmQhNkw8gHPm5jzTEnewX0w=; b=y9dXgJnEH6BIzyofyiXHTN0isjCsYkpZk32tNT4fKRXdJ1jkMD5lCOLWPmFc/Db2fC GPIgNOkCdsSsudJ5+KMrMJsVtFfczih4cQp89/CWqcZdX9xxIvpDfOqVisOPqqdJNgH1 MpdIiE+n10z2w3m/QfM+amNvLm5Xi/o4NA3DGteo9te97iGh/KYfAqUW1sFAW3n1AsIj 8UnnXTfAWZK6PbQ+TFHGSizsGFM0h39aM0xw61sdufgFcOvCwPtr/iNlPOODngFm3WkE +12pw9pEjgx6RMZbZ1jPzMxhZEzTWXE+g/Jx4+0lTenb3oh+BmdzrUSmulBAmSHvYRzV t46w== 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=SI86JUBJzk2u9kiQ5LZPsmQhNkw8gHPm5jzTEnewX0w=; b=HauUbmEfdHqNPi1QnICRXol0RVPWwr86HPFLP9JJfasIpg8jS0DHUb2p0rC/vF7m2t LOH9wFqeVfiZi9pWpH8cwm4bQNesRAcKbusAjBhKJdJsiHWOJUQqRG6p/PQOPG4bO/kV Xga3IU+wuVyPUcczoH+xBmJNLeix8Uuen+dELKj/hKJWlxPDCVzMD4XrEGvQtrXv4yQm lYMr6q1cK+ThzH9Llm7jkfefdVJvfZ7b2od2v1kKueBmE/m3FnDePfitClo9A0b+AfGe Zrl3TIfbFYWev2EVlH/HPITHG/cDjap2mvrY874+4chAP+9gRUQFC5d6FssHgot/rq9/ yFQg== X-Gm-Message-State: AOAM533eRr58LHr5Rj9XtkQAE43XUqyNzZdl/plr4SzK7b3dZspiFhf1 fXZ+okTt78AG14YunhfNEf/RZBZr7C6tkQ== X-Google-Smtp-Source: ABdhPJy3meB2VlLqAruBj7RPOXbWsduf/HdWRBEHBjvOyDpy6LZl2fuvbbcfanR5b6rLAhCTlFjwvg== X-Received: by 2002:a5d:528d:: with SMTP id c13mr24683443wrv.343.1626612391352; Sun, 18 Jul 2021 05:46:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/12] docs: Add skeletal documentation of highbank and midway Date: Sun, 18 Jul 2021 13:46:20 +0100 Message-Id: <20210718124621.13395-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626612804964100001 Add skeletal documentation for the highbank and midway machines. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20210713142226.19155-4-peter.maydell@linaro.org --- docs/system/arm/highbank.rst | 19 +++++++++++++++++++ docs/system/target-arm.rst | 1 + MAINTAINERS | 1 + 3 files changed, 21 insertions(+) create mode 100644 docs/system/arm/highbank.rst diff --git a/docs/system/arm/highbank.rst b/docs/system/arm/highbank.rst new file mode 100644 index 00000000000..bb4965b367f --- /dev/null +++ b/docs/system/arm/highbank.rst @@ -0,0 +1,19 @@ +Calxeda Highbank and Midway (``highbank``, ``midway``) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D + +``highbank`` is a model of the Calxeda Highbank (ECX-1000) system, +which has four Cortex-A9 cores. + +``midway`` is a model of the Calxeda Midway (ECX-2000) system, +which has four Cortex-A15 cores. + +Emulated devices: + +- L2x0 cache controller +- SP804 dual timer +- PL011 UART +- PL061 GPIOs +- PL031 RTC +- PL022 synchronous serial port controller +- AHCI +- XGMAC ethernet controllers diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst index c52902acdad..c0c2585c0ad 100644 --- a/docs/system/target-arm.rst +++ b/docs/system/target-arm.rst @@ -87,6 +87,7 @@ undocumented; you can get a complete list by running arm/digic arm/cubieboard arm/emcraft-sf2 + arm/highbank arm/musicpal arm/gumstix arm/nrf diff --git a/MAINTAINERS b/MAINTAINERS index 1504951823f..4256ad1adbb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -643,6 +643,7 @@ L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/highbank.c F: hw/net/xgmac.c +F: docs/system/arm/highbank.rst =20 Canon DIGIC M: Antony Pavlov --=20 2.20.1 From nobody Mon May 13 07:28:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1626613154; cv=none; d=zohomail.com; s=zohoarc; b=nI2DxbBQsSfQnGN/4fhLe7BUmRJVUWiqYjlhg3Yzmu+cz/KBCtyKDydzyZfwAls1Ezl8RGsUdiy1j4Rwh3MoiNBOJNDBJ3HgBdebCZ9BzTGJciNBIRTBXauA11cKbkF8ut4yyyYrp6ZvrqYZAPAbt24eP3IKjUCb6CPmiaUHMgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626613154; h=Content-Type: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=QvY0gKKZL10jBfuPwPcboRpWsIz2uDoO8+xuVhr3OFg=; b=VOrLoiKT9cvZaRbczRHTEDmp+Lx3KObLlTG142k9doKc3HROabnUvZ+V3L++VWZDRD7s9tSN4d3cHmh1MXmzXQAsZuagfdwGQRGh1XJ+aHB7qYpGFXuZGozyVWAcNcn80bfVZKZUOfddaVg37khTYNXGgRsvv6C8TmYTJLOLgHQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162661315457091.51679771687157; Sun, 18 Jul 2021 05:59:14 -0700 (PDT) Received: from localhost ([::1]:54882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m56O1-0006TJ-Bz for importer@patchew.org; Sun, 18 Jul 2021 08:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m56Bn-0003lN-H3 for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:37 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:46919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m56Bl-0003XY-9v for qemu-devel@nongnu.org; Sun, 18 Jul 2021 08:46:35 -0400 Received: by mail-wr1-x431.google.com with SMTP id d12so18003755wre.13 for ; Sun, 18 Jul 2021 05:46:32 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l23sm4053391wme.22.2021.07.18.05.46.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 05:46:31 -0700 (PDT) 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=QvY0gKKZL10jBfuPwPcboRpWsIz2uDoO8+xuVhr3OFg=; b=MHwydVp12Vd5PIPS4pwg/PGYXGBOZYPh8sJFnUsh7yY+c3rp38j+2fTpuncA+rz4M6 3MZXairKFVDBexGJrQhzYiW6gNkRntpUY4mJXbn2WnVryPiDF6LCDQbCYr291wU20495 YqTGQMYzcQJF3Vl91AyQjb9h1BdtWD6sNzGQI2xDfmm5FPyDCaGcGg2cnZdsLoybJoum 8q5hEU0n84x4FddpIYLCsaYLxk8B4a65txrSCOcZ+Iut3aNCMqHaM+H4X/hrLxA5n65M uSKguh8tQVk5oiThojel61PdVXlW/mfg3x12B8paZYFJxkHuQIEYqao2arbJB2ltNdcw GgIw== 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=QvY0gKKZL10jBfuPwPcboRpWsIz2uDoO8+xuVhr3OFg=; b=tQaOKFdxgTS/hj5bnqNEEpxdLYojt6x1BMbGpovSxbKvCIrkWO8jaRNwJraQfOcaS+ pibyPKvZ4no/D6AS3oeTqYYbcC8hMmPzaFO3Jkjpy3cASb+7BTcOnsyXwE2VPJovLUbr YcO6zgkXsJPW6XwamXBE8uDkT8tH1hxjb2Fl/CT6MtG3YENjGD4goIQ7Z3LPckmAtKJH 4igzoW3fQkzu6WG7aNZ41EDLYNWitQ7N6cUIyPCBCcmHahM86tia8SjwrkpAX2cLaQUQ 59dy4x+tOgEG+pvPPZGkmwngufQKPwtXkMBpR6eixZDrIxXsd9iQBJq6dCGtCj/bny9O g8Jg== X-Gm-Message-State: AOAM533KNvnz1pFC0Q8+uw6KXbbamtV0O0hrmjvTyLSf2ja73iE6l1H7 vEjK7rTBNbV1Jifiitxv4Qct+Zp4MnVxqw== X-Google-Smtp-Source: ABdhPJxTLk3gWpxTacnsed9qwc2RltEs2pXZcrB1N3fh0ZCQRAEEOXTnYZ/KVrS1RGa6SeFNUb2vew== X-Received: by 2002:a5d:6dac:: with SMTP id u12mr24124196wrs.153.1626612391981; Sun, 18 Jul 2021 05:46:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/12] target/arm: Remove duplicate 'plus1' function from Neon and SVE decode Date: Sun, 18 Jul 2021 13:46:21 +0100 Message-Id: <20210718124621.13395-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210718124621.13395-1-peter.maydell@linaro.org> References: <20210718124621.13395-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1626613156171100001 The Neon and SVE decoders use private 'plus1' functions to implement "add one" for the !function decoder syntax. We have a generic "plus_1" function in translate.h, so use that instead. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20210715095341.701-1-peter.maydell@linaro.org --- target/arm/neon-ls.decode | 4 ++-- target/arm/neon-shared.decode | 2 +- target/arm/sve.decode | 2 +- target/arm/translate-neon.c | 5 ----- target/arm/translate-sve.c | 5 ----- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/target/arm/neon-ls.decode b/target/arm/neon-ls.decode index 0a2a0e15db5..c5f364cbc00 100644 --- a/target/arm/neon-ls.decode +++ b/target/arm/neon-ls.decode @@ -41,8 +41,8 @@ VLD_all_lanes 1111 0100 1 . 1 0 rn:4 .... 11 n:2 size:2 = t:1 a:1 rm:4 \ vd=3D%vd_dp =20 # Neon load/store single structure to one lane -%imm1_5_p1 5:1 !function=3Dplus1 -%imm1_6_p1 6:1 !function=3Dplus1 +%imm1_5_p1 5:1 !function=3Dplus_1 +%imm1_6_p1 6:1 !function=3Dplus_1 =20 VLDST_single 1111 0100 1 . l:1 0 rn:4 .... 00 n:2 reg_idx:3 align:1 rm:4= \ vd=3D%vd_dp size=3D0 stride=3D1 diff --git a/target/arm/neon-shared.decode b/target/arm/neon-shared.decode index df80e6ebf66..8e6bd0b61f0 100644 --- a/target/arm/neon-shared.decode +++ b/target/arm/neon-shared.decode @@ -38,7 +38,7 @@ # which is 0 for fp16 and 1 for fp32 into a MO_* constant. # (Note that this is the reverse of the sense of the 1-bit size # field in the 3same_fp Neon insns.) -%vcadd_size 20:1 !function=3Dplus1 +%vcadd_size 20:1 !function=3Dplus_1 =20 VCMLA 1111 110 rot:2 . 1 . .... .... 1000 . q:1 . 0 .... \ vm=3D%vm_dp vn=3D%vn_dp vd=3D%vd_dp size=3D%vcadd_size diff --git a/target/arm/sve.decode b/target/arm/sve.decode index a62c169f1a8..c60b9f0fec5 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -22,7 +22,7 @@ ########################################################################### # Named fields. These are primarily for disjoint fields. =20 -%imm4_16_p1 16:4 !function=3Dplus1 +%imm4_16_p1 16:4 !function=3Dplus_1 %imm6_22_5 22:1 5:5 %imm7_22_16 22:2 16:5 %imm8_16_10 16:5 10:3 diff --git a/target/arm/translate-neon.c b/target/arm/translate-neon.c index a45616cb631..c53ab20fa48 100644 --- a/target/arm/translate-neon.c +++ b/target/arm/translate-neon.c @@ -28,11 +28,6 @@ #include "translate.h" #include "translate-a32.h" =20 -static inline int plus1(DisasContext *s, int x) -{ - return x + 1; -} - static inline int neon_3same_fp_size(DisasContext *s, int x) { /* Convert 0=3D=3Dfp32, 1=3D=3Dfp16 into a MO_* value */ diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 35d838aa068..bc91a641711 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -70,11 +70,6 @@ static int tszimm_shl(DisasContext *s, int x) return x - (8 << tszimm_esz(s, x)); } =20 -static inline int plus1(DisasContext *s, int x) -{ - return x + 1; -} - /* The SH bit is in bit 8. Extract the low 8 and shift. */ static inline int expand_imm_sh8s(DisasContext *s, int x) { --=20 2.20.1