From nobody Wed Oct 4 16:54:03 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 4S114C4JCfz4wH2k; Wed, 4 Oct 2023 16:54: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 4S114C39Cmz3CdH; Wed, 4 Oct 2023 16:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438443; 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=1n+zJlqyVtdzr0tHUmmM5KRvHYQkmaSeYR2y5MClDXg=; b=mJHfEZCc/zzoNl49Z9vLXto1RT+TcRjkhuXAZeER8KiNxgpuoeJeYSj7q7V2DVgMyFKMyg BO3hEGQSlzU7hP5RDZ4U5E03Jly6N5Oz6N10juFFzuOCUHkPsvB7it1AV0UPSGgYFq20Yk rvosNehp1E87wZboP84D/szAbfpACKWbsUWHdSySlnZX3qGIb8sgRFjTSHclR9Zt29j5Kp +r4vXXotg/jUzL9+nH4F08sEAPIi4iXHxef4ISFuZTKeLPt2/UDPuSH74f9mOet5eqfu5N MaBP+Sr4YKjaA+jxIVbJ+AwIQFOCKefOOGY/96cxZMOBjEEUBA0pWE4JpZVI2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438443; a=rsa-sha256; cv=none; b=uh/zuXV6NBBfu77y18xDlWxztECP1QLwFfSbjDh6Ox205QZ/Rl4CUZ/zQc/w+x/wRSwCgm 05WNFd4mQjLND/kiEckD0THt5rVFwYLuse1fhdUlv+gYXVwVYTrs51OH+pOhHg3LKvSmoI uxfAOeV9b6rqpVO5z98VgfawRbY9NZXwKa2j3y8ZzAgF75tr7FOj6sE6Uc38AEwA2er6tL 9ILxfVcnXnfAfzxVZkF7L/9hERRcP3LPCkNyUeaYdPrhdQ79McnurJ/YvXDtBWqENDtqQS UDdKd7K5v1UxM3T4pE3viG3ad/3/fxOoOIOlMChVtZQ4qA+WtN1NcEDn3jk0GA== 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=1696438443; 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=1n+zJlqyVtdzr0tHUmmM5KRvHYQkmaSeYR2y5MClDXg=; b=n99FG2TRmCv3cyQpl0/x71Pl0jDmJHFVo0ciGIgwkEpwHoO7fbI/y1c3SVvw4Pu4qWPmR/ JqV/1uGG+HBG4JTIFe1re+9kzAaOCRgnsamPY3OQKbzFetieJjLhHfMig4wDqKXFBBXLWF Ng2YpsTOhUJ6WBiGQUoNUBU40D/tec+crLAmS523lbY1/7vT4fT6Rw8c5bF5tjMoefilZ+ x+6DtDmIB3LcoDFlssKg3IkBzE4H9aqFhSZdFdxQEBb+w8Kl+6/ofCsR7RyxLT47LdnBip ypRrON3MB5TrfgqxxYYmEUqiynFtbdYxRdjUHMiEMVZrJKY9TlxgTZlWQXGY+g== 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 4S114C2GMGzlRW; Wed, 4 Oct 2023 16:54: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 394Gs3oE037796; Wed, 4 Oct 2023 16:54:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394Gs3EA037793; Wed, 4 Oct 2023 16:54:03 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:54:03 GMT Message-Id: <202310041654.394Gs3EA037793@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: a7f6c2ff732d - main - bhyve: Move the RTC driver 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: a7f6c2ff732db1d0032066109ee0dd5af1a39b81 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a7f6c2ff732db1d0032066109ee0dd5af1a39b81 commit a7f6c2ff732db1d0032066109ee0dd5af1a39b81 Author: Mark Johnston AuthorDate: 2023-10-04 16:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:16 +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 --- 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 727a47892e41..7716ea119dd6 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__ @@ -903,9 +905,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; @@ -1037,7 +1041,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) {