From nobody Wed Oct 04 16:54:02 2023 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 4S114B4ZXFz4wGhY; Wed, 4 Oct 2023 16:54: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 4S114B2QJCz3Ch9; Wed, 4 Oct 2023 16:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438442; 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=JmGeLN1JWdNURZKZXvzN7XdZN/YGrN8MlMyMoO29hck=; b=FJS/zteUXd9fNHQpBZLZfAoN8Qf/dj5tOl6W7n4tExeWKas+dQIatBMlDULrbGLydOIBuD q7+CtHDvv9Ye9NH6HRVz+wHLe5a/cY7hjsIhPJbAvQ5AAfBbMQRlxfpFnJmi8J8ViDe2xc EACBTpXgMhhzeo8iMNCyawRNm7D6jPeR5oodSlp5s0DPz0wy+7Ol2Xr8MjJZ73Cm6lX1Gk 6WtAjb0YRdn8SBkxfIDyNDlgVGzHfd41bV53z4AAmW2+VCCHhDuv3kfQ/5xB0e6rgTZNZy Rs6mkfux0reZLSTi0vUbqz/ti5rB+WJZFnoRGW9WsEZFjBSQbWICu+5wtcByig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438442; a=rsa-sha256; cv=none; b=Y9zyFZCxLQXxIfh9N3hgYQh+vxTpfBDtHRmgBUCP4LiqR1jsMPCYEbOVDMFhaR/RSG8lY4 3YA7lTyOGf46Je5nwfPZmVA6uU2g1q48r5FzmHVQSsVuYR6U1/1y0LoPbK5I2ll+0qRks2 mXfxeFbFtEYrV7Fq2+Or/jJjU2Ao/bH7vLfUMvXMYBHzd5mrSX4BQoMOTdl9CSL5Hbjgnh Ux5CdtDs3ITqIndKwAqXgtmUvRFqAunjNbIOWULOeexc2SY2jCWEeJ+kK0S+xMVk4kpbWw gywFaAJ+INghPtnZx4Ye12atbas9Aapw3lK50xsiKwHqgpTh8tWaVEtt3JYsaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438442; 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=JmGeLN1JWdNURZKZXvzN7XdZN/YGrN8MlMyMoO29hck=; b=aDGiAY4lGekdsBYElWBhwSnMKV95lwNv+muOyqKpEl53yDnKHXEylIxIUk6O9W+ZjCoLK4 Qe97k76KAfcdr0g0CWefJA9ezzqNfwuczh0DAgcdtHY52gdtRWpQksd/37RnWpPWLHWWwr IA58NaBiullnrZrYRsbFbsD8HiZkG159pWXEpppdqJAXo3Crh1kImWOzJncEw4LY7Fj9RX vGZnDfvHrXS+QOs0IQCHgJDA12ufm2fJlw2HHHFfo135DKkQ5XRyOUGMu7U9zH0OsMYN1v c5hote8DtIHQR+wFX/mA0anNIsStVZwlPKAa/P0J3Nu/qYRgdD9n+NtTOeGLXg== 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 4S114B1WWxzlm0; Wed, 4 Oct 2023 16:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394Gs2Pr037748; Wed, 4 Oct 2023 16:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394Gs23j037745; Wed, 4 Oct 2023 16:54:02 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:54:02 GMT Message-Id: <202310041654.394Gs23j037745@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: 548b11228f7a - main - bhyve: Move MSR emulation into amd64/ 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 548b11228f7a83785dcf6c4c8b0bbfed0284d794 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=548b11228f7a83785dcf6c4c8b0bbfed0284d794 commit 548b11228f7a83785dcf6c4c8b0bbfed0284d794 Author: Mark Johnston AuthorDate: 2023-10-04 16:23:22 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:16 +0000 bhyve: Move MSR emulation into amd64/ No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40733 --- usr.sbin/bhyve/Makefile | 3 +-- usr.sbin/bhyve/amd64/Makefile.inc | 3 ++- usr.sbin/bhyve/{ => amd64}/xmsr.c | 0 usr.sbin/bhyve/{ => amd64}/xmsr.h | 0 usr.sbin/bhyve/bhyverun.c | 6 +++++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 5f13d457d914..30ecf56ae748 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -76,8 +76,7 @@ SRCS= \ vga.c \ virtio.c \ vmexit.c \ - vmgenc.c \ - xmsr.c + vmgenc.c .if ${MK_BHYVE_SNAPSHOT} != "no" SRCS+= snapshot.c diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc index 6843cec4919f..d655708210ce 100644 --- a/usr.sbin/bhyve/amd64/Makefile.inc +++ b/usr.sbin/bhyve/amd64/Makefile.inc @@ -7,7 +7,8 @@ SRCS+= \ post.c \ ps2kbd.c \ ps2mouse.c \ - task_switch.c + task_switch.c \ + xmsr.c .PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm SRCS+= vmm_instruction_emul.c diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/amd64/xmsr.c similarity index 100% rename from usr.sbin/bhyve/xmsr.c rename to usr.sbin/bhyve/amd64/xmsr.c diff --git a/usr.sbin/bhyve/xmsr.h b/usr.sbin/bhyve/amd64/xmsr.h similarity index 100% rename from usr.sbin/bhyve/xmsr.h rename to usr.sbin/bhyve/amd64/xmsr.h diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 1cf7fc5bcc24..727a47892e41 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -106,7 +106,9 @@ #include "rtc.h" #include "vmgenc.h" #include "vmexit.h" -#include "xmsr.h" +#ifdef __amd64__ +#include "amd64/xmsr.h" +#endif #define MB (1024UL * 1024) #define GB (1024UL * MB) @@ -1015,11 +1017,13 @@ main(int argc, char *argv[]) exit(4); } +#ifdef __amd64__ error = init_msr(); if (error) { fprintf(stderr, "init_msr error %d", error); exit(4); } +#endif init_mem(guest_ncpus); init_inout();