From nobody Tue Jan 07 02:19:40 2025 X-Original-To: dev-commits-src-all@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 4YRvrY0pV5z5kcrB; Tue, 07 Jan 2025 02:19:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRvrX6pkzz4Lkx; Tue, 7 Jan 2025 02:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736216381; 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=TRMEMxWnJPeKOzKvnso/2Isipt6b27T0IdU7H4NV/2M=; b=DtCk15yXxMuIM5Fcy8P2HBLFT6DXBrKt723e3Ke9KkzU6v0YRF6X/X7C9LoCNYk+3rlLhx InRblJQCPqeCJwBOG4F/EQJAL9P/rprkFsMYzOovqpsAamcTg55tHz2/LBXdv/KTLAS86+ bpZooz5bLJEezwjuwFEkHFoMB3GiXPSCdflSsPlcAcCAcRm1We8RMBdGCyeHb+yeu0p8h9 3qarfQ9ZmWOCAneX+5pkiXc+b58GGdumM/7a8tf4Iez6jA009QcP/yDNEq5Us6oCvoGcA3 hzCnLviRPMfo0vRaCVNztv2tW9xDSS8H/cx/bAxRuKfBp4yic2eOaEXheIGtRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736216381; 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=TRMEMxWnJPeKOzKvnso/2Isipt6b27T0IdU7H4NV/2M=; b=Xwwp3pU9lE8rTF68gsuibCCSJoncQgmbrUS9wsT+ERGnxlfkEYwNEh/Jsasxriw3gpinZ2 Ylf2X7WDZnimuS4KyQeA35zXfQgNHPrdec6lGZG3eCR75S2JhSHdlO6Qm9yYvRbrWk+s8S eKAjW8/gbTMb38U8qYoMHVjJ4We1mwKP2selCDziV5MPt1cNgvBVO42yQxLZTA1/HNQkkJ /SHsoLoytyCBsyDei3gPbxEOAvu3hFqBHU+HbPdQXRRyqOrB5zk8kCJqtC3i04QhBMJDwS iZ2AAZbAerjZ67V4XBJUl5JH9PR6ChHXDYcinworTAwp2rCfZbJMFvHIPzE8iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736216381; a=rsa-sha256; cv=none; b=C3p5JLjLOc+B7tueMY6y13jJeFsMjKMaHxYkD5cPRVV0nQSHeHfJsSEHg+ASqUHVgRfhDi BRhi7+yr64nJQjK93S8eQ0ISs0E9czWcmg1YjaRTjAPcd1wTqj1hlVmaDvfBDb2nbkZLs0 V9iLQ8/UGDr/+lVatqyRrZI9nwut3ePignbRk0wub6ZTL2IuaCbbN+bW1MJRngo/D8vJlj yg/f79S2LUt1tyOs8wuLaFlhz18fmxafb7eA642MTF+bNtWIhR8RvGYWAxdvg9X+DX5BZf FmSSWwJz3k04BDSMwuXCvrFBz5Zh04DC04kMOWJwJ1KGWVJjRlT8WgiKjKe0JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YRvrX6Clczq7m; Tue, 07 Jan 2025 02:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5072Je55029231; Tue, 7 Jan 2025 02:19:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5072JeLe029228; Tue, 7 Jan 2025 02:19:40 GMT (envelope-from git) Date: Tue, 7 Jan 2025 02:19:40 GMT Message-Id: <202501070219.5072JeLe029228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c945c9ddca8d - main - amd64/vmm: Rename vm_get_vmspace() to vm_vmspace() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c945c9ddca8d6db162334127a43ef8a0be1d3db1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c945c9ddca8d6db162334127a43ef8a0be1d3db1 commit c945c9ddca8d6db162334127a43ef8a0be1d3db1 Author: Mark Johnston AuthorDate: 2025-01-07 02:16:04 +0000 Commit: Mark Johnston CommitDate: 2025-01-07 02:16:04 +0000 amd64/vmm: Rename vm_get_vmspace() to vm_vmspace() For consistency with other vm accessors. No functional change intended. Reviewed by: corvink Differential Revision: https://reviews.freebsd.org/D48268 --- sys/amd64/include/vmm.h | 2 +- sys/amd64/vmm/vmm.c | 3 +-- sys/amd64/vmm/vmm_dev_machdep.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index dd8e76962caf..6501baa455da 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -401,7 +401,7 @@ vcpu_should_yield(struct vcpu *vcpu) void *vcpu_stats(struct vcpu *vcpu); void vcpu_notify_event(struct vcpu *vcpu, bool lapic_intr); -struct vmspace *vm_get_vmspace(struct vm *vm); +struct vmspace *vm_vmspace(struct vm *vm); struct vatpic *vm_atpic(struct vm *vm); struct vatpit *vm_atpit(struct vm *vm); struct vpmtmr *vm_pmtmr(struct vm *vm); diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 0e3ab2845d58..d05d979a531a 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -2677,9 +2677,8 @@ vcpu_notify_event(struct vcpu *vcpu, bool lapic_intr) } struct vmspace * -vm_get_vmspace(struct vm *vm) +vm_vmspace(struct vm *vm) { - return (vm->vmspace); } diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index 2d0ceadaedfe..d8d2b460404c 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -441,7 +441,7 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, break; case VM_GET_GPA_PMAP: gpapte = (struct vm_gpa_pte *)data; - pmap_get_mapping(vmspace_pmap(vm_get_vmspace(vm)), + pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)), gpapte->gpa, gpapte->pte, &gpapte->ptenum); error = 0; break;