From nobody Wed Oct 11 13:25: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 4S5D5q1npzz4xNp6; Wed, 11 Oct 2023 13:25:03 +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 4S5D5q1GwNz3G67; Wed, 11 Oct 2023 13:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697030703; 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=6dSUnljQfxgd7viFBcYQxn//WYdcmzRThdM+y1mE028=; b=JydpZezGKUdf1E1CblZDuiIBQ2hv64xYkFxFE6Oc/QZmdHOT9NnFt0a626BiRa5JLEXKEv zPDILXLxvkfYxN7lKHXJ/o5JQP1YXciYq2XK9UCBB/AJOdgjnvlM1fKj/KbGWsrbOY6pLs furwOnbT37JmuQH5CvO/AUvLJUHkxAuuLu5CY5+T/5E5Mr+/ZCUIXXya9dXgpLy5IxSHxW sX0moS+fF8H/rQfkbY+2N0rDeuN69qpwwksB93lo0wlwo/u5ifDt+Xg7J89xchc1ZlaIVg QaJx04y8DFiHvVjYO+ErwN7OycQ9PVz449hdveFwrH4Zul/rH8PVEJhuNLbfLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697030703; a=rsa-sha256; cv=none; b=AAsNupHFoVKi/K4YqPdu2cFWkpuk5C5yjFNsnoSyyIJ5+FC76B5xDS8uhjeAVq6MJmmXFE 6cTxeJfMCI/IpioF4EpZZes/NhMNUOza8fUMoFPO1DCOP8CX0LgZvakPubinIdBsmQyj92 PuWSwjEA3BLdh7VPLxv0Q6pFSADVhoPz7iZ5QnRq6mO0Oils+SEBpRD5sfWPvx3Nu+f/0K zM1C8CkvG4l90W+qyGrEDKCN/V+dZP/56ZOi330DvbLQTQ8uXo8+GSN6XDSOBeKw+iXjO/ I+pzJeTEzHmzIEu5WxYBbMXLvzj8w4vG7564loD7aAimQyx0PQOvbWDl4BEORg== 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=1697030703; 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=6dSUnljQfxgd7viFBcYQxn//WYdcmzRThdM+y1mE028=; b=s8KrSHaH7hliTXpIivSowMOybzndCcFcoQbGXEPO77UpiMpbIPRChBVboG6jEkf2lXSuez lnO3qcsYJuFUAQ2LnTbpsIiGf5+DLTayAiefUrY6nFOQIJS5XWV5IYf1XIVoKDh/5WPgXR 3+k+bxvWAHf6hkc9XxizxnQ5McIgi/TazgfwMnDxdCjL1GjOaP5ZcuowLHW+Cag9wvu+n/ 9+/Y29g/R2thNPDhilJHIymZFHd/ijxezkLTkABh35k0Kv45faAxEGm4xQRa2sCYjASWrj O4lCpI5eszN+q8F2r/DIGWwQT5bij7oxp/EYvfL59LV6GRyRq644iciLl8RXhA== 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 4S5D5q0Ftsz7ct; Wed, 11 Oct 2023 13:25:03 +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 39BDP2JD089858; Wed, 11 Oct 2023 13:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDP225089855; Wed, 11 Oct 2023 13:25:02 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:25:02 GMT Message-Id: <202310111325.39BDP225089855@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: 71378e0ffa84 - stable/14 - bhyve: Move some more amd64-specific drivers to their own subdir 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: 71378e0ffa84b5777aeda7da15dfca2c56125bf2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71378e0ffa84b5777aeda7da15dfca2c56125bf2 commit 71378e0ffa84b5777aeda7da15dfca2c56125bf2 Author: Mark Johnston AuthorDate: 2023-10-04 16:20:57 +0000 Commit: Mark Johnston CommitDate: 2023-10-11 13:21:52 +0000 bhyve: Move some more amd64-specific drivers to their own subdir No functional change intended. Reviewed by: corvink, jhb, emaste MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40551 (cherry picked from commit f927afc1a6fe8257e28d79e8bb77305c2958724a) --- usr.sbin/bhyve/Makefile | 6 ------ usr.sbin/bhyve/amd64/Makefile.inc | 7 +++++++ usr.sbin/bhyve/{ => amd64}/atkbdc.c | 0 usr.sbin/bhyve/{ => amd64}/atkbdc.h | 0 usr.sbin/bhyve/{ => amd64}/post.c | 0 usr.sbin/bhyve/{ => amd64}/ps2kbd.c | 0 usr.sbin/bhyve/{ => amd64}/ps2kbd.h | 0 usr.sbin/bhyve/{ => amd64}/ps2mouse.c | 0 usr.sbin/bhyve/{ => amd64}/ps2mouse.h | 0 usr.sbin/bhyve/bhyverun.c | 6 +++++- usr.sbin/bhyve/snapshot.c | 15 +++++++++++++-- 11 files changed, 25 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 794bfbe4c8a3..86039a8c45da 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -17,7 +17,6 @@ BHYVE_SYSDIR?=${SRCTOP} SRCS= \ acpi.c \ acpi_device.c \ - atkbdc.c \ audio.c \ basl.c \ bhyvegc.c \ @@ -63,9 +62,6 @@ SRCS= \ pci_xhci.c \ pctestdev.c \ pm.c \ - post.c \ - ps2kbd.c \ - ps2mouse.c \ qemu_fwcfg.c \ qemu_loader.c \ rfb.c \ @@ -138,6 +134,4 @@ NO_WTHREAD_SAFETY= NO_WCAST_ALIGN= -SUBDIR= kbdlayout - .include diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc index 62de5f211a23..c52219cb8dd1 100644 --- a/usr.sbin/bhyve/amd64/Makefile.inc +++ b/usr.sbin/bhyve/amd64/Makefile.inc @@ -1,6 +1,13 @@ SRCS+= \ + atkbdc.c \ fwctl.c \ + post.c \ + ps2kbd.c \ + ps2mouse.c \ task_switch.c + .PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm SRCS+= vmm_instruction_emul.c + +SUBDIR+= kbdlayout diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/amd64/atkbdc.c similarity index 100% rename from usr.sbin/bhyve/atkbdc.c rename to usr.sbin/bhyve/amd64/atkbdc.c diff --git a/usr.sbin/bhyve/atkbdc.h b/usr.sbin/bhyve/amd64/atkbdc.h similarity index 100% rename from usr.sbin/bhyve/atkbdc.h rename to usr.sbin/bhyve/amd64/atkbdc.h diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/amd64/post.c similarity index 100% rename from usr.sbin/bhyve/post.c rename to usr.sbin/bhyve/amd64/post.c diff --git a/usr.sbin/bhyve/ps2kbd.c b/usr.sbin/bhyve/amd64/ps2kbd.c similarity index 100% rename from usr.sbin/bhyve/ps2kbd.c rename to usr.sbin/bhyve/amd64/ps2kbd.c diff --git a/usr.sbin/bhyve/ps2kbd.h b/usr.sbin/bhyve/amd64/ps2kbd.h similarity index 100% rename from usr.sbin/bhyve/ps2kbd.h rename to usr.sbin/bhyve/amd64/ps2kbd.h diff --git a/usr.sbin/bhyve/ps2mouse.c b/usr.sbin/bhyve/amd64/ps2mouse.c similarity index 100% rename from usr.sbin/bhyve/ps2mouse.c rename to usr.sbin/bhyve/amd64/ps2mouse.c diff --git a/usr.sbin/bhyve/ps2mouse.h b/usr.sbin/bhyve/amd64/ps2mouse.h similarity index 100% rename from usr.sbin/bhyve/ps2mouse.h rename to usr.sbin/bhyve/amd64/ps2mouse.h diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 229527e580d5..6bebfddc3985 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -82,7 +82,9 @@ #include "bhyverun.h" #include "acpi.h" -#include "atkbdc.h" +#ifdef __amd64__ +#include "amd64/atkbdc.h" +#endif #include "bootrom.h" #include "config.h" #include "inout.h" @@ -1450,7 +1452,9 @@ main(int argc, char *argv[]) init_inout(); kernemu_dev_init(); init_bootrom(ctx); +#ifdef __amd64__ atkbdc_init(ctx); +#endif pci_irq_init(ctx); ioapic_init(ctx); diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 7d8959756757..593930c7f8a3 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -75,7 +75,9 @@ #include "bhyverun.h" #include "acpi.h" -#include "atkbdc.h" +#ifdef __amd64__ +#include "amd64/atkbdc.h" +#endif #include "debug.h" #include "inout.h" #include "ipc.h" @@ -892,7 +894,12 @@ vm_restore_devices(struct restore_state *rstate) return (ret); } - return (vm_restore_device(rstate, atkbdc_snapshot, "atkbdc", NULL)); +#ifdef __amd64__ + ret = vm_restore_device(rstate, atkbdc_snapshot, "atkbdc", NULL); +#else + ret = 0; +#endif + return (ret); } int @@ -1131,8 +1138,12 @@ vm_snapshot_devices(int data_fd, xo_handle_t *xop) goto snapshot_err; } +#ifdef __amd64__ ret = vm_snapshot_device(atkbdc_snapshot, "atkbdc", NULL, data_fd, xop, meta, &offset); +#else + ret = 0; +#endif xo_close_list_h(xop, JSON_DEV_ARR_KEY);