From nobody Thu Jan 26 19:28:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P2rNR4xbnz3bTnX; Thu, 26 Jan 2023 19:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2rNR4Pvxz4LMY; Thu, 26 Jan 2023 19:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Qdokjd61FWTbIWTPV0iAegyNlIxPjb8pVBABbsH3Qs=; b=SXPOth8X4mHj49L+6syaG3GrYkbWUfAoNVAupcEyOWdabsn9o4+FKb2Fp+Ply1YtXkAgf6 iJX5Q7gA1dZll/aYuYl7OskvyMOOp5dHQ/yssyfxCMWq45LV3M/k+RiMNPB/B0i3mLEFr3 kajlS2GDVJfUyMZMCj+x0G39DqS44HQGxXHxURZotLV6PCi0Jl4E8gqKV3nAq5sSPZH/SR fu5HGjv98RPVGeErclG0Yqoe0BjzBFqTdUEB+Thgb/lWwjlS1aPzbVkEmAmiIkGl9Pk7xr YciISPzPt7yypr8VGPUdXBEcOm290BmnCUFB34BuVhTZIxEsBmqbfHICiXcrSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Qdokjd61FWTbIWTPV0iAegyNlIxPjb8pVBABbsH3Qs=; b=lAQN4bHUj95QPNKo+kUrzAiKnHhvokxdW0DO9FMEsh6/AuFGIz1Vb7bjBmGOu9E3MasyyG zwIW5MqNLvm6AIhhJvTAb0Zc1W/OhAcXtPIzvbQc3uNBaQ3k6yzROOAnYYCy0xab9cfU1F 9hA7f6KPb9H6WEN13HoDlRoyxF6LR58BLT9jSTNH1cyN5+ltf7Weo8P8HhHf+0IQ9HX83h Dm2g7YZ+TZ7wdPME8zI06QPLlxbFaRdO634JPO2EjoBQooB8z9VAn5CYIWLu9bhdhWQZbM 54sRxAVBa9cpb6fdvBOaexKsIHx0WhNfBudXrMpWHNlCJoPR+kfp95Zgw0ps2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674761319; a=rsa-sha256; cv=none; b=e/h9NTXj+R3nJkgfpT/zlJcdBL4Aqla26z+0gHk+MuzeSRDP7Nu9LIkOOgJpwcJA4yKwN4 fV6uePBpdgXn0fWtoKMeECih4WFXKnh6D8lf/UMgmC9JZBIaqTbVLtsXKn9ezMfoXyCR3C kccg1cqkKkzCGAKseXzKpGy7qTD2BCzrHcJyfjxirJnfPyALL724JmTwjc4EVKB+/nigcN OzxhmWfwvIQPg76E9jqvxWFeBJNwVmryERk7U0guHfTuaMa5ec9ocQC58YObrTCHcJAAgH F8bBT4erBmMpkag89gpGL/rO6WBBAIoTwjg4Rb3yxhovw3GHYFWZ0eV3LFUejg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P2rNR3VWPzhC6; Thu, 26 Jan 2023 19:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30QJSdPe078767; Thu, 26 Jan 2023 19:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJSdY7078766; Thu, 26 Jan 2023 19:28:39 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:28:39 GMT Message-Id: <202301261928.30QJSdY7078766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c7ff222d2060 - stable/13 - vmm amdvi: Move ctrl under #ifdef AMDVI_DEBUG_CMD. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c7ff222d20607264516b3a31f102f965fd8159b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c7ff222d20607264516b3a31f102f965fd8159b4 commit c7ff222d20607264516b3a31f102f965fd8159b4 Author: John Baldwin AuthorDate: 2022-04-08 00:01:29 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:26:30 +0000 vmm amdvi: Move ctrl under #ifdef AMDVI_DEBUG_CMD. (cherry picked from commit a7d876f7010068d93f1d9b4bb62d1370c9a0798f) --- sys/amd64/vmm/amd/amdvi_hw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/vmm/amd/amdvi_hw.c b/sys/amd64/vmm/amd/amdvi_hw.c index 57386b6bea88..86df0ad76bf5 100644 --- a/sys/amd64/vmm/amd/amdvi_hw.c +++ b/sys/amd64/vmm/amd/amdvi_hw.c @@ -444,13 +444,14 @@ amdvi_inv_domain(struct amdvi_softc *softc, uint16_t domain_id) static bool amdvi_cmp_wait(struct amdvi_softc *softc) { - struct amdvi_ctrl *ctrl; +#ifdef AMDVI_DEBUG_CMD + struct amdvi_ctrl *ctrl = softc->ctrl; +#endif const uint64_t VERIFY = 0xA5A5; volatile uint64_t *read; int i; bool status; - ctrl = softc->ctrl; read = &softc->cmp_data; *read = 0; amdvi_cmd_cmp(softc, VERIFY);