From nobody Wed Oct 11 13:25:09 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 4S5D5y01XJz4xNvT; Wed, 11 Oct 2023 13:25:10 +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 4S5D5x6dn5z3GfY; Wed, 11 Oct 2023 13:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697030709; 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=Bc4k0GJpoqMo3k7Vj6JjmVlEMQ1k2tTqdnDXM+zqhY8=; b=UElW9NCGXcaM/N80Sldkd6Iv+HTNC4YaBWiK68GKtjlCJ1r99nsr6OaAx08UE+7tUzZqhg SPjGFRe0riCLBZJqZ+/O5RNppRYEQGrnCssUZbr6FspjyxbRs2ZrmCLoSUJDUFJDiVQPv7 vsaljCAGWOngsJjK60ElVnLyaEflh0w4JdbpyTL7TZsCpa43DXa40ShzQyJPvu7DLz2aCr 8PG8LBr661bQk8v6C8u+pPAuIn1u/5mbBJA90ytgBD3bQdu8gLz+6R6HRrDS2B5C1PJDXu yTXL4OFgY79afUcc42ap4i5hFSBPiSJ9tpJ6DRnTc7aOKokRq4LRWfToPetrUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697030709; a=rsa-sha256; cv=none; b=sagDRTellxNVYljMhc1Ldg2jxRDb6/cFQwm5V/IxGDYJTmRMe9Tck6cwwHoO4i/vPEeAB1 YDT+xIDTwjemxok9D3E5uDrSgwDnNeV4sWe/BEmSuJJp8hOWnYPGT0XU/rMffctar7RoJ2 H+oOrFhJT3v6l6cqfNPInFdBHrus+XrGFsVECjoVpczW6adYhwHT53KtskkzGz+vnX3JY0 1b+xC84QFTzARSnqYZJUf4SUOBTzskZIheXnAXjV5sd9uyxNAAntqPa9p7BuFSUbFGux/+ gYaRy/3ti6bysEAMNLOFxOX1Osa+coQKeK4iFCCRmmymXXo6hMVIDibwZUIokA== 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=1697030709; 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=Bc4k0GJpoqMo3k7Vj6JjmVlEMQ1k2tTqdnDXM+zqhY8=; b=R6QjnjaFbzi1/WPkCd7nX/Fk4JZ6HFlRx+gB5cUrmNA+0kTHQf+JU1z7IQxGeDlZQgjPlN pOLVsrFVpr0ducHsEz7Q/ItGPf2IvqNlF+ob9Ed1F5AR1E2qB3Qen/VFESxq22CKli5db/ cFRgTQzO1U++/vpRn0o6ysPycKv3si2m3DT8hgjMeiJyn8ChT22XiFov/AAnjGzExIBw18 LsbjlpaQ1gmZGalhRmbpOD8zBA3buQu/NAatZY9flnu6ZvnNWDJHKZ3SSlDHqw+M/QdwwV L/M+2ygWc0t+wJ/YEtPGfM66zQgW8ao4BHZk4xcM+3QRu4nclo5xFfTCcQsmFQ== 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 4S5D5x5hRKz7gH; Wed, 11 Oct 2023 13:25:09 +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 39BDP9Bv090159; Wed, 11 Oct 2023 13:25:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDP9Eh090156; Wed, 11 Oct 2023 13:25:09 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:25:09 GMT Message-Id: <202310111325.39BDP9Eh090156@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: 83a8ffc20205 - stable/14 - bhyve: Move the RTC driver 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: 83a8ffc20205fe4389a57d22bdeacf91eb365b12 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=83a8ffc20205fe4389a57d22bdeacf91eb365b12 commit 83a8ffc20205fe4389a57d22bdeacf91eb365b12 Author: Mark Johnston AuthorDate: 2023-10-04 16:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-11 13:21:59 +0000 bhyve: Move the RTC driver to amd64/ No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40734 (cherry picked from commit a7f6c2ff732db1d0032066109ee0dd5af1a39b81) --- usr.sbin/bhyve/Makefile | 1 - usr.sbin/bhyve/amd64/Makefile.inc | 1 + usr.sbin/bhyve/{ => amd64}/rtc.c | 0 usr.sbin/bhyve/{ => amd64}/rtc.h | 0 usr.sbin/bhyve/bhyverun.c | 8 +++++++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 30ecf56ae748..ef78b149c68c 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -62,7 +62,6 @@ SRCS= \ qemu_fwcfg.c \ qemu_loader.c \ rfb.c \ - rtc.c \ smbiostbl.c \ sockstream.c \ spinup_ap.c \ diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc index d655708210ce..a18b98a157ec 100644 --- a/usr.sbin/bhyve/amd64/Makefile.inc +++ b/usr.sbin/bhyve/amd64/Makefile.inc @@ -7,6 +7,7 @@ SRCS+= \ post.c \ ps2kbd.c \ ps2mouse.c \ + rtc.c \ task_switch.c \ xmsr.c diff --git a/usr.sbin/bhyve/rtc.c b/usr.sbin/bhyve/amd64/rtc.c similarity index 100% rename from usr.sbin/bhyve/rtc.c rename to usr.sbin/bhyve/amd64/rtc.c diff --git a/usr.sbin/bhyve/rtc.h b/usr.sbin/bhyve/amd64/rtc.h similarity index 100% rename from usr.sbin/bhyve/rtc.h rename to usr.sbin/bhyve/amd64/rtc.h diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 005acec77a93..a1ab5bd32fec 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -103,7 +103,9 @@ #include "snapshot.h" #endif #include "tpm_device.h" -#include "rtc.h" +#ifdef __amd64__ +#include "amd64/rtc.h" +#endif #include "vmgenc.h" #include "vmexit.h" #ifdef __amd64__ @@ -899,9 +901,11 @@ main(int argc, char *argv[]) case 'e': set_config_bool("x86.strictio", true); break; +#ifdef __amd64__ case 'u': set_config_bool("rtc.use_localtime", false); break; +#endif case 'U': set_config_value("uuid", optarg); break; @@ -1033,7 +1037,9 @@ main(int argc, char *argv[]) pci_irq_init(ctx); ioapic_init(ctx); +#ifdef __amd64__ rtc_init(ctx); +#endif sci_init(ctx); if (qemu_fwcfg_init(ctx) != 0) {