From nobody Wed Oct 11 13:25:05 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 4S5D5s3vZZz4xNm5; Wed, 11 Oct 2023 13:25:05 +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 4S5D5s3QtCz3GBF; Wed, 11 Oct 2023 13:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697030705; 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=v7SZFfwQ2eBH3q/Mk9/JZ+2oRPN3kLtS4NaFb9hwejs=; b=jnqWvYvZeTubLzNjWKrmgX9QEXWLRImFRbHBRBLVi2sX5fh4PdZVrn4tiNSglRTQjwyz3K dChR2UY7TuTwi4U25VlvshhGmXR06zHKqud1VP2fE/04ttPNgN7wyR69QzYmNkkwWPO0IB UD+EkL6GKWXneVVUXruk57rk0q5qg+dyZGon4go/fscRQtmLMidTFPybSYEWsyAA5GB9dx AC7vkBNNM6wtNIINrM75uE+8ntMoThHnPXjQmNO3KZ2fcByeGgBL103xOp/STPTQQti8ja RvZJOzCzGuqTcy9ITSIk0n/oZKgq1DJCjKNSXZX7Mm2Blb8KZLTtJ/aT2iLoMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697030705; a=rsa-sha256; cv=none; b=LpIEBQsIybNFHrCViydEaPqMg9DX/4ngdszWn1RKzRaVG8lsXfx9fnol2EfBesnbndFItS DHyzLoIb/v564SGUaUKoBQZYBTsbqiyp7up57SWzr2epALRaoIw5fIi2qJGSV7CRHpbLsR 1PYMDudO/HtZIrLsbOA1gRkUTadDSisk+Tl3URWKQFiimvxvXUEGuyaGnpPGzhrjK4Klt3 /Dv4kVxVEBsu9MffwsNkCt7cnIc30KdJy5ElqiJ20cutWepP2I0v6NOgO3TZKxmtITfRaR qPbB89eraxWxFzBnpomS7RdOIOnZHa4TzVUDjYYo13qebOih1WBSQkI29rk7og== 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=1697030705; 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=v7SZFfwQ2eBH3q/Mk9/JZ+2oRPN3kLtS4NaFb9hwejs=; b=sIe9i0cRPCKIKXjtW6hMNSkHKOOIQnS0Yqx5Ep96IP7z/ieZiC72PHwgQEX6VoVkX4CXam aeZTx6IY870bjb5qwAFwTYGzw1Qc9oa5yCikun4Hgk26Gug2nodwxjA+4u4K77vLKBF4d0 tOcahUZhQqkfDgf3jrEfuruzACbup/ra/G4FcrMD/o5mH9FtuuLDRBveceU/7Fod6OUkFi 6ODv9K1pwyCZO2L8U4PFa25YyIwxKODwEEN4yuYLl/cGRIZkgeWj6ap/W6VGEHWOp/d/Bb ypk50v9PAyrqDeyP92KV7JhnifhqcFGka4XsBWIg/2GF+fmTlKT52wcXciJT9g== 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 4S5D5s2GQ6z7PJ; Wed, 11 Oct 2023 13:25:05 +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 39BDP5KH089955; Wed, 11 Oct 2023 13:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDP5ZZ089952; Wed, 11 Oct 2023 13:25:05 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:25:05 GMT Message-Id: <202310111325.39BDP5ZZ089952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 013da5d9c415 - stable/14 - bhyve: Move kernemu to 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 013da5d9c4156a2a6128d184f2e5464e0146cbae Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=013da5d9c4156a2a6128d184f2e5464e0146cbae commit 013da5d9c4156a2a6128d184f2e5464e0146cbae Author: Mark Johnston AuthorDate: 2023-10-04 16:22:41 +0000 Commit: Mark Johnston CommitDate: 2023-10-11 13:21:54 +0000 bhyve: Move kernemu to amd64/ This code handles instruction emulation for accesses to various amd64-specific MMIO regions. No functional change intended. Reviewed by: corvink, jhb, emaste MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40554 (cherry picked from commit a1642451ce25bb0e2d01765a8dedda69c5029d48) --- usr.sbin/bhyve/Makefile | 3 --- usr.sbin/bhyve/amd64/Makefile.inc | 4 +++- usr.sbin/bhyve/{ => amd64}/kernemu_dev.c | 0 usr.sbin/bhyve/{ => amd64}/kernemu_dev.h | 0 usr.sbin/bhyve/bhyverun.c | 6 +++++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 499c0d1bb89d..c2ccd60790ae 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -33,7 +33,6 @@ SRCS= \ inout.c \ ioapic.c \ iov.c \ - kernemu_dev.c \ mem.c \ mevent.c \ net_backends.c \ @@ -85,8 +84,6 @@ SRCS+= snapshot.c .include "${MACHINE_CPUARCH}/Makefile.inc" -CFLAGS.kernemu_dev.c+= -I${SRCTOP}/sys/amd64 - CFLAGS+=-I${.CURDIR} \ -I${.CURDIR}/../../contrib/lib9p \ -I${SRCTOP}/sys diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc index e0cb84e32b85..6843cec4919f 100644 --- a/usr.sbin/bhyve/amd64/Makefile.inc +++ b/usr.sbin/bhyve/amd64/Makefile.inc @@ -2,14 +2,16 @@ SRCS+= \ atkbdc.c \ e820.c \ fwctl.c \ + kernemu_dev.c \ mptbl.c \ post.c \ ps2kbd.c \ ps2mouse.c \ task_switch.c - .PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm SRCS+= vmm_instruction_emul.c +CFLAGS.kernemu_dev.c+= -I${SRCTOP}/sys/amd64 + SUBDIR+= kbdlayout diff --git a/usr.sbin/bhyve/kernemu_dev.c b/usr.sbin/bhyve/amd64/kernemu_dev.c similarity index 100% rename from usr.sbin/bhyve/kernemu_dev.c rename to usr.sbin/bhyve/amd64/kernemu_dev.c diff --git a/usr.sbin/bhyve/kernemu_dev.h b/usr.sbin/bhyve/amd64/kernemu_dev.h similarity index 100% rename from usr.sbin/bhyve/kernemu_dev.h rename to usr.sbin/bhyve/amd64/kernemu_dev.h diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index a61ebcda0003..7088f11f63eb 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -95,7 +95,9 @@ #endif #include "gdb.h" #include "ioapic.h" -#include "kernemu_dev.h" +#ifdef __amd64__ +#include "amd64/kernemu_dev.h" +#endif #include "mem.h" #include "mevent.h" #ifdef __amd64__ @@ -1453,7 +1455,9 @@ main(int argc, char *argv[]) init_mem(guest_ncpus); init_inout(); +#ifdef __amd64__ kernemu_dev_init(); +#endif init_bootrom(ctx); #ifdef __amd64__ atkbdc_init(ctx);