From nobody Wed Oct 4 16:53:58 2023 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 4S11470vdpz4wGyr; Wed, 4 Oct 2023 16:53:59 +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 4S11470H9Cz3CWZ; Wed, 4 Oct 2023 16:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438439; 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=1egFqjeS5PMcc3+V8ZQiW/fclSYWSJBycnTPaDPvakk=; b=w0Z2l30B+QDFVcxm8EC2C+8XLAobSc8+DUr4fi3GuJ+2UkqIORRirSIbpdXitNSh4pB5Zk AHuCPgqdUC8bHjgVk9jemxJVF2udQR1OYetZnbWePbpOSPqaAFWQLoYAYyTBgSn35EpaIi srNgaXzIZ3XBS/PXLKjL6LFOEZw/dQ+a4nbus9bmXCHebHMBGYkCP1SRLmE5W8NewlwzRm 1zZeMvXfoelgSmEPlfLdAlF69agsPAeyAAiWAMuTDAOhR1ph9SWV1e9H4P2+MF7M33zoc/ JwHxJmTpeRmJBd9iwteE/DbyoPpWQzBoMogLpeIQsvbWb/onboPmCj1so0pnuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438439; a=rsa-sha256; cv=none; b=lRU4WiZwEWTDDZamMYbItJfPGGRMCm+xZIRSZy0o3q5D5sMKMaCtu2QEq/1l/XsPQV+KMc +ubYH2wiouemZ2csifMPLicIMwBM/L33yEIlmi46SUZ2rrl5gYVAGp5hcfVdrJm3XvAYg1 z2sFPVZDy8wIv5mgkdttrACi2rW3W+uJwtGAOKOkHK79pL/AKuZZPeFPdq/WuXNag1Vv1V c1guMxYLZsUY1KWQYuil5NR8VO/lZjJzOSQtV6NkoFhFx2Y/8IqkGsEkFqk7uUu9NZdUzy eYIPPMrxWZ1gEsrShJq312ze5Zha1yafhngO1lboxfCeS5vFnmFimWK6L9voJQ== 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=1696438439; 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=1egFqjeS5PMcc3+V8ZQiW/fclSYWSJBycnTPaDPvakk=; b=b85DanvVzqPvKhNe6Z8HZyV60B7pJm4PJyl5Vk5asldRVL/0hTZXO9SiIq0C4/SMXNxwJT i9YqrOCacDcCjOuX4nZpH6FVtqXdy/b4nyk4WBwe77w16Svr9P/kzrwZ5F7Qs/YKgD/jKf 0jGJPGCcz7VtN81qpYUIPcBdp3bbKJ2JVBrq5IUxt51t1pugKVuPNpfEHsrjE/1SV7y/ua b69LWTZ+1z7xSSzzTaXJCM4vIUGja5Ei7u0bKaZJVvkXfYygVFr1F1Tze0/Ay4ektWxlug oKsOFoUc6eafhF077f1dHiYZVy6r8MZlQRNGptLp+W3/+FC/CKwu0O/b5qAf2w== 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 4S114665kZzlly; Wed, 4 Oct 2023 16:53:58 +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 394GrwDP037583; Wed, 4 Oct 2023 16:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394GrwjL037581; Wed, 4 Oct 2023 16:53:58 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:53:58 GMT Message-Id: <202310041653.394GrwjL037581@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: a1642451ce25 - main - bhyve: Move kernemu to amd64/ 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1642451ce25bb0e2d01765a8dedda69c5029d48 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a1642451ce25bb0e2d01765a8dedda69c5029d48 commit a1642451ce25bb0e2d01765a8dedda69c5029d48 Author: Mark Johnston AuthorDate: 2023-10-04 16:22:41 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:16 +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 --- 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 7672c577da66..df40c7a7cc2a 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__ @@ -1457,7 +1459,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);