From nobody Fri Apr 08 00:04:01 2022 X-Original-To: dev-commits-src-main@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 C850F1A88860; Fri, 8 Apr 2022 00:04:02 +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 4KZJPt0HKFz4lJC; Fri, 8 Apr 2022 00:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376242; 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=7OlUBqD2lg8FecM37Cxm6ec+6wJBUYnJmdk4V5sEtzs=; b=alv3IYD9vc8utxSd7MgimtInvPP4gmV46OTlz4xczM7yf9bH3wuf1RqC7UxdPAIvgg+kiQ 49skrXkWF+zpTaKN3EXzfvL3nR4cUdAop0D+Nae76O634ePu8PzTY+VgnFxLtebOww8QYY /tNowFO5t7Khu+BxGGPoKBTbC4mIpvXXCnzQvop5tBDCyQudfEzn34CUp8TjiWZGfA/a9X xAEjfdxmvq4Bpt72ABKbQvK8KUHF0A+D4RHhfUD9vuggnYPyebB8LXFqNtiheSHqEvXFEY UijQOZ2dv+xLdfq2WFho5nWXOLK7LycrPeHx+qx6PN/o9j6XeACeUtGBx8wcPg== 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 9A5511A346; Fri, 8 Apr 2022 00:04:01 +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 23804100087124; Fri, 8 Apr 2022 00:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238041di087123; Fri, 8 Apr 2022 00:04:01 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:04:01 GMT Message-Id: <202204080004.238041di087123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a7d876f70100 - main - vmm amdvi: Move ctrl under #ifdef AMDVI_DEBUG_CMD. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a7d876f7010068d93f1d9b4bb62d1370c9a0798f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376242; 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=7OlUBqD2lg8FecM37Cxm6ec+6wJBUYnJmdk4V5sEtzs=; b=JHlo6Njy+ZlbXjXed1wWfhNnpk4e6/H6LhAnRQa0n1Y3k+7hTr6yb4G5E7A8eUu4860S/Z YM0m/MP6CmZ+NuNzy1OJw7SSXtX01o6zg9BvVDczD3WEVFF7PkiAc/I5n/Uv81l9BTtsIT 3mAtBun2fJYJsqWA5sOOC0RYIjtQDpOSmKwDN7bxZ5FRlmrlsT8tfqjY33qhWsqZYXz2J0 1JeDd19dfUTjiyfmlKU8Hw2JjmveNIP3MCBZ33qbwPjXqqANs6/yn7PtfDyEPQsKPRzoWA XVHIYqcIWDdebg3p0fic5R5mzi8/Bk+/3cQX07LxRjl1dp+xwaerQFnQOerXQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376242; a=rsa-sha256; cv=none; b=WI7ECGfkoMuOoyTnnBDs1Oid3hH+EAJzEofV3Ke2JsOxubKUSlKw/4B8SyVUI07DgPVuXP Pv53/nDmu12OpnaCV+NDbaPK2LLVa90JAqg4dn+MMHPCHaHZ4tyJuzdV+SchLR2QgC7KCW F7G/GutFH5SV1qXENhErXjotVnKkOElvhxKDuz3SDqoy169HpCf2qa/GlbgY4bq7mNnlLd DwTMz66RK9J00qtbp5MRMfjWBxm/f4hN6RQ+7TDKOY/Ad4CI+JuxPdt4OxRCU+UoicshSx GrsFR11p2rPc5h6GLO9tvfDTObErf0uWyCpNv3g/RJQ/P6zGoeQ+TPI3idLpHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a7d876f7010068d93f1d9b4bb62d1370c9a0798f commit a7d876f7010068d93f1d9b4bb62d1370c9a0798f Author: John Baldwin AuthorDate: 2022-04-08 00:01:29 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:29 +0000 vmm amdvi: Move ctrl under #ifdef AMDVI_DEBUG_CMD. --- 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);