From patchwork Mon Sep 5 16:39:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 602750 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3822078mae; Mon, 5 Sep 2022 09:41:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR7J1Y22qXqifuiVrVpL270H2XNRLMaFIA85AYiosgppMa1XNQvevNwXmPnN7kZLC6nGmLB3 X-Received: by 2002:a05:620a:28c1:b0:6bb:5deb:a888 with SMTP id l1-20020a05620a28c100b006bb5deba888mr33977963qkp.485.1662396064571; Mon, 05 Sep 2022 09:41:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662396064; cv=none; d=google.com; s=arc-20160816; b=oCASBdHlZP9OR9FCZUbR5S5kPn2XVpGdWnxvuSRUr+zpVSpkJYDEFOmGJrnZEWxC14 dhmmUhNOk9ICliuaVsvvP5jly2juOUJweY9PzdN3aTQdz6i2q1N6rYi1zZOfv6sSgQ4W 2DbaHlrSxxme462NIwXuDGQRLpqwnnU8A/1DD+DOg9GBMznRsKEwmUBYsoXqw4DhRlZL /Bopy9HBW2QspkAPdHfy/fZXNNlgwCiHWQHppVHltfrFBYLCteRgEW2SHB/x0MSKuwhz MK4AlsfYdcSrj+9ZpOfkpFZd3OfsfzgosenfJY+bY9GuoVOQoJiEjQZAMWA2ZN1As42a mFsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=fiYa+bP97eG+wQcfayoeQ3geZEccRlmA5MPJU77GJHc=; b=h+g+urjYEbWxx5GG86u21qYdPIVQ0gy+rnhPD2ifmYgizuJ3q1MPylqDJTPwaw9YGX otEJs+LTPusAMF/DeZV2wj2wbNDJJm4rtg9ED4NkKb5gP9QCcEesPEgQXm+nN1d1wu/w ILrhnOCIxrl8olljIDXzRnzzSSpKtu/PS+0zzh6tPVnEnaWZeB2UIZngoaSAaFHZi7Vw Ge2rm21erPG4jT1MPIzOhB7QkIyafxnE+Pvn7cPEtHHap9idVnkb51A68rwvOpyMBVWn B505Y1Q4qWIwksYQP5gcQ8Ui+CQx4YF5OdH2T+kwHrVgcoT4rYQqmMUSsdWlSbaSQZD0 J16w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KL+cTUKU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ed13-20020a05620a490d00b006bb63e17485si4675990qkb.571.2022.09.05.09.41.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Sep 2022 09:41:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KL+cTUKU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVF9k-0007Ks-73 for patch@linaro.org; Mon, 05 Sep 2022 12:41:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVF8W-0007J4-Ku for qemu-devel@nongnu.org; Mon, 05 Sep 2022 12:39:48 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:34781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVF8V-0003DP-0g for qemu-devel@nongnu.org; Mon, 05 Sep 2022 12:39:48 -0400 Received: by mail-ed1-x52d.google.com with SMTP id z21so1974372edi.1 for ; Mon, 05 Sep 2022 09:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=fiYa+bP97eG+wQcfayoeQ3geZEccRlmA5MPJU77GJHc=; b=KL+cTUKUQJq+5pHZJjwme8WfNGdZxQjZc/PTa3YVSnMgSDojm1Vwx1s+E2prQnciKe Xs0cTI3Ahi60EHz+0vf45jvQf4mJnagvjSYJtK3BkDUuGB0i0aKGn41Norlgw7Ih62gg jZuz7uWfrPg/ddWnn9PI49daf87kU/S+xGUEUUCmNUvCD5SIQsfcbcBwMGJzZgFniXyh Lvt1RoCX8iY7XScRtI2Qmp2WwJ9PE+LCSpenyhlISAJpL/tbaeV1NShVEyLhPR0gP015 PPzI3E5pqVftOnfT2oK+BbxAHJ+u4QiAJy2f2dU1Ys7tI7ucfA4keVfvWfi07h3lEAGO rkoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=fiYa+bP97eG+wQcfayoeQ3geZEccRlmA5MPJU77GJHc=; b=l3amsaW39WxvRwkBY5vH/SKeFPhcQt0M1JYk6KPiZ/G87xqeZm3LKMREdaCCt4SRs7 NqS7Wj3Qdi2TNFfytaxZGqjp5euEllXSQ069JDHIISmherRshT/kLTtfWCp/gFTQpcyl 339odcwa7ZvyIBBvLZvbn9jVRDG280hOKq9779jkQWC7E9W0ESLvp62q6gE6v3Gcp7LS PmgJvV5edtfoVRATe4b7mi0ppbxFks0Os6egGgfm7OOG9WbunJJzpMb5o+lU1cJKysi5 BeLyiLuCJuBgUmLWNE216wwtp1kUW7Jsl84saRlauzm6zW3IC3jVE9PMThHi7IfVcbbv xGPg== X-Gm-Message-State: ACgBeo3m6EXwmaa5CToUD3xHNcWBS3QIKNDK4ca+rKUxqu8Gz50rQkvI funDWLlk0nAxFbNQqWVAyUcARA== X-Received: by 2002:a50:baea:0:b0:448:182d:9bc2 with SMTP id x97-20020a50baea000000b00448182d9bc2mr37419693ede.341.1662395985193; Mon, 05 Sep 2022 09:39:45 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u9-20020a1709061da900b007477ee86946sm5192076ejh.87.2022.09.05.09.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 09:39:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 325C91FFB7; Mon, 5 Sep 2022 17:39:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [RFC PATCH] docs/system: clean up code escape for riscv virt platform Date: Mon, 5 Sep 2022 17:39:39 +0100 Message-Id: <20220905163939.1599368-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The example code is rendered slightly mangled due to missing code block. Properly escape the code block and add shell prompt and qemu to fit in with the other examples on the page. Signed-off-by: Alex Bennée Reviewed-by: Alistair Francis --- docs/system/riscv/virt.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/system/riscv/virt.rst b/docs/system/riscv/virt.rst index f8ecec95f3..4b16e41d7f 100644 --- a/docs/system/riscv/virt.rst +++ b/docs/system/riscv/virt.rst @@ -168,14 +168,19 @@ Enabling TPM A TPM device can be connected to the virt board by following the steps below. -First launch the TPM emulator +First launch the TPM emulator: - swtpm socket --tpm2 -t -d --tpmstate dir=/tmp/tpm \ +.. code-block:: bash + + $ swtpm socket --tpm2 -t -d --tpmstate dir=/tmp/tpm \ --ctrl type=unixio,path=swtpm-sock -Then launch QEMU with: +Then launch QEMU with some additional arguments to link a TPM device to the backend: + +.. code-block:: bash - ... + $ qemu-system-riscv64 \ + ... other args .... \ -chardev socket,id=chrtpm,path=swtpm-sock \ -tpmdev emulator,id=tpm0,chardev=chrtpm \ -device tpm-tis-device,tpmdev=tpm0