From nobody Wed Oct 11 13:25:10 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 4S5D5z2TRFz4xNvW; Wed, 11 Oct 2023 13:25:11 +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 4S5D5z0qyGz3GRg; Wed, 11 Oct 2023 13:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697030711; 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=gCTiyEzlULPzUFfP3e6jEjQU2zpM+iMIIhFTuz+p8lo=; b=VV8B9wZlb9I+RHCoOrj9FcPA0lTELd+JLvj0oaCiZ5kotJWsAqWWactvyELyrLDzNdaqTZ sWiIHK5miw0dv3Eb1jj2LN/nxZfBBHu+XjWXebKZPCERSh7tN2NMIHdNOW2Rl4osWvXXcM xFEjfu2Pqau1Z9He4Q8mQk+Ay39N7UeUTWTC8n4H7lnhCkRPN0j7JYhY8m30AzJ1Iqwwnm OKcjsczaL4ZOGhgOHNlelFBawAapOkhso2jGoq5qnYfwOV56ECxD7i3WNeUDjt6VOHNrTU P2EhiWB3VNfELVH1KY7U71/Ncfx0bhxk9NUItvDDoG7nK/jGkTJ6inHk5jsNcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697030711; a=rsa-sha256; cv=none; b=Dz7G3194cijGRned4EiRoy/ogessMvQpeWtNuN/M6aXQFJLnRvB50P0WoRXGpLwEpdGmsR cCQ9+7kwQoSLZtf8H6CJ3b5gmgcagXQYJ6dBN1e36MkFD7DuBu34Lna3tQHks9bLWGw2Rw d2QiOvI/iBNuBHg8Se5xkwOCdFWW+bXcS4rSZZHTHOuZJvHFRTjQOYWqZfPDcWby+qE268 PdiKG9XZRr/YXKyWXKvir1VpG7G5BHR7YYpyILK946IX9fvNIsCVxu8iw/Ufbmbg1aKb6I dIfUcqoPdXCQwX7CSWAUaIiGNRx8v3WmcttUtsKNT1bZcBGfVu8SI5UNgu8AKA== 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=1697030711; 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=gCTiyEzlULPzUFfP3e6jEjQU2zpM+iMIIhFTuz+p8lo=; b=j+nUHlGo/R6DQbDoUsSXixajxH8uS6lOM1dzMXatnzGgwSzkcA+WF7GWyByK7hSEnxJ/pr 7nBpMvwU5q5kD9TkIUl5xms5Qd6SSCqhfp2CSkz/nen5b5dVM3A43cEl1txgnA0a/3lfOj k2ooMpJ4mUVG7adFSChRMSqpTD8rSUwY+UsJJKgeD+FAnhnQdsGLJEYo5XF6mC0Esu2I2W AONeP9abAbzCGwjZ6SonOF+t64iikf4Xhl72VoUAIuPj64kaUIRL38pq6bswNCDBEXyxfd aom2Jkay+vM7x9vvBlh1YP+TkL5tyeaq/s/YmYeEo+2ukMNXT6UIVi2z/e+jCg== 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 4S5D5y736Rz7Jw; Wed, 11 Oct 2023 13:25:10 +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 39BDPAbW090207; Wed, 11 Oct 2023 13:25:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDPAtl090204; Wed, 11 Oct 2023 13:25:10 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:25:10 GMT Message-Id: <202310111325.39BDPAtl090204@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: 143fde3faf72 - stable/14 - bhyve: Move power management code 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: 143fde3faf72184227bdbbbf995aa3e5173e6d22 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=143fde3faf72184227bdbbbf995aa3e5173e6d22 commit 143fde3faf72184227bdbbbf995aa3e5173e6d22 Author: Mark Johnston AuthorDate: 2023-10-04 16:23:50 +0000 Commit: Mark Johnston CommitDate: 2023-10-11 13:22:00 +0000 bhyve: Move power management code to amd64/ This implements various x86-specific interfaces. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40735 (cherry picked from commit 75d1e855b0a2acfb60e5a3c81b018d8f73ebf450) --- usr.sbin/bhyve/Makefile | 1 - usr.sbin/bhyve/amd64/Makefile.inc | 1 + usr.sbin/bhyve/{ => amd64}/pm.c | 0 usr.sbin/bhyve/bhyverun.c | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index ef78b149c68c..7c14dbc4a524 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -58,7 +58,6 @@ SRCS= \ pci_virtio_scsi.c \ pci_xhci.c \ pctestdev.c \ - pm.c \ qemu_fwcfg.c \ qemu_loader.c \ rfb.c \ diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc index a18b98a157ec..a176b0e5471f 100644 --- a/usr.sbin/bhyve/amd64/Makefile.inc +++ b/usr.sbin/bhyve/amd64/Makefile.inc @@ -4,6 +4,7 @@ SRCS+= \ fwctl.c \ kernemu_dev.c \ mptbl.c \ + pm.c \ post.c \ ps2kbd.c \ ps2mouse.c \ diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/amd64/pm.c similarity index 100% rename from usr.sbin/bhyve/pm.c rename to usr.sbin/bhyve/amd64/pm.c diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index a1ab5bd32fec..2c32e2a56fbb 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1039,8 +1039,8 @@ main(int argc, char *argv[]) #ifdef __amd64__ rtc_init(ctx); -#endif sci_init(ctx); +#endif if (qemu_fwcfg_init(ctx) != 0) { fprintf(stderr, "qemu fwcfg initialization error");