From nobody Tue Jan 07 02:19:39 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 4YRvrX0Pk5z5kd52; Tue, 07 Jan 2025 02:19:40 +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 4YRvrW6LdKz4LVj; Tue, 7 Jan 2025 02:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736216379; 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=c87MUDN/GD3yhzsoyWR3emXB3POxyYnIgSOGq/jRvpc=; b=ZYAghpoHQmCQNANVbilvaIsdNdwNyEvQjxbC7wek6iip7CvSgb57GUppg4Q9VY5Ygkh1aF CM3C556sJEP3C4P50SWvPWeS9enPJakj1Xcsr+UegLJwkWTXynjZC02w8xgpJ3ci7R+H8y 4fMfDvWhfXeUnqAJN7dqUvFy0sNHRQ79Wns2572q71eQ2HicIEAfSAQSIdCam8OIWb220Y anqMmrFkQylXM0DbX0eaGf6L4cM5Lg08ueYYsAvhEW5zB0DBiR/nEGmhIr31Yvwfir0eDD soh9xkqaItRsQdAUOyco2EXp+QtD9Jv3d58a0S31RvRHq1Udk5cFD/Cvgyk7EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736216379; 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=c87MUDN/GD3yhzsoyWR3emXB3POxyYnIgSOGq/jRvpc=; b=xzGPcku01ptGlhYdTMkVUUhZsU1tJo50vGNtjDXfO1O95BGpaOz81w1bCJn98TQLutNcR/ EkhUHq3cov2w0OXyh2S49QweLADXZ07/+Eov9fwi7d3cfzh3GlSbAOukF+8/9I9eEN6d2Z m8FXbVPzQXnmcmbbR3qNKnSUJ71UzmqPDrKXjXGMknqxLbG6Mt0AMUevV6VTh42myZ9hbx BiwoYa0Ii7KGFna2ht6+n9Vzng9WGnYeJ0b02koj9UqOTwnuX/HNM05seEK7geNhxhH7a4 OElLpavbe8tnCHxto+908j+PhUPcYeHWn5v0nkTCsR0w3e8XXqU86zhfCBZJpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736216379; a=rsa-sha256; cv=none; b=JxGOSWH5liNpJNt8GSK6HxeATOVyzCRqY5obbpFSoSLf2NkkYD6arU4pTDbazm7Q22QRKS rYMc0aBkfVeOU4PEVbrxAjSLxhV7zu/UPB/Qq/PhU13W51DHU7V1fe5E67jUVZU1hcGskC smhuavAMNv51tOGK/+dim4T5YTJlt7YOwRAzaRQbgcejyXfUE6Ft45fNyL8ZPvjEjSQspr J9cxHFZqKr33ifh2HZIiHymk0Pd9tOoGfwT+RFWEHLdLCMX+Bwa6keV+MYL6OBt79EXact 6cPQq2yZuz5fOFuUf1A1ZifgtlQkz/H6SuU+h1pjFSPms4HJVB98AtQRgSoyOg== 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 4YRvrW5sVDzrKp; Tue, 07 Jan 2025 02:19:39 +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 5072Jdb9029188; Tue, 7 Jan 2025 02:19:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5072JddV029185; Tue, 7 Jan 2025 02:19:39 GMT (envelope-from git) Date: Tue, 7 Jan 2025 02:19:39 GMT Message-Id: <202501070219.5072JddV029185@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: b09fe08ede8f - main - amd64/vmm: Remove vmm_mem_init() 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: b09fe08ede8f90ab40f09eac49700698dd4d02b3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b09fe08ede8f90ab40f09eac49700698dd4d02b3 commit b09fe08ede8f90ab40f09eac49700698dd4d02b3 Author: Mark Johnston AuthorDate: 2025-01-07 02:15:51 +0000 Commit: Mark Johnston CommitDate: 2025-01-07 02:15:51 +0000 amd64/vmm: Remove vmm_mem_init() It is a no-op and doesn't exist on other platforms. As part of some work to deduplicate vmm code, just remove it. No functional change intended. Reviewed by: corvink Differential Revision: https://reviews.freebsd.org/D48267 --- sys/amd64/vmm/vmm.c | 6 ------ sys/amd64/vmm/vmm_mem.c | 7 ------- sys/amd64/vmm/vmm_mem.h | 1 - 3 files changed, 14 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index d1f57a717fdf..0e3ab2845d58 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -427,8 +427,6 @@ vm_exitinfo_cpuset(struct vcpu *vcpu) static int vmm_init(void) { - int error; - if (!vmm_is_hw_supported()) return (ENXIO); @@ -449,10 +447,6 @@ vmm_init(void) if (vmm_ipinum < 0) vmm_ipinum = IPI_AST; - error = vmm_mem_init(); - if (error) - return (error); - vmm_suspend_p = vmmops_modsuspend; vmm_resume_p = vmmops_modresume; diff --git a/sys/amd64/vmm/vmm_mem.c b/sys/amd64/vmm/vmm_mem.c index 0e953b6af534..e96c9e4bdc66 100644 --- a/sys/amd64/vmm/vmm_mem.c +++ b/sys/amd64/vmm/vmm_mem.c @@ -45,13 +45,6 @@ #include "vmm_mem.h" -int -vmm_mem_init(void) -{ - - return (0); -} - vm_object_t vmm_mmio_alloc(struct vmspace *vmspace, vm_paddr_t gpa, size_t len, vm_paddr_t hpa) diff --git a/sys/amd64/vmm/vmm_mem.h b/sys/amd64/vmm/vmm_mem.h index b237e08ccc05..41b9bf07c4fc 100644 --- a/sys/amd64/vmm/vmm_mem.h +++ b/sys/amd64/vmm/vmm_mem.h @@ -32,7 +32,6 @@ struct vmspace; struct vm_object; -int vmm_mem_init(void); struct vm_object *vmm_mmio_alloc(struct vmspace *, vm_paddr_t gpa, size_t len, vm_paddr_t hpa); void vmm_mmio_free(struct vmspace *, vm_paddr_t gpa, size_t size);