From nobody Wed Oct 4 16:54:04 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 4S114D5ZmDz4wH01; Wed, 4 Oct 2023 16:54:04 +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 4S114D4QdZz3CkF; Wed, 4 Oct 2023 16:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438444; 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=akLxv1hxKT+WjvYFB/eR57iPyEwAtm5p6jXmRvj0oms=; b=JQyzAp2lDS39Ya3TWzwcwMII3n3pSV/BrVGpWzaq879Rz1+HD4Z9EWOMDmR4dNyTnMV7dF ZqxMsZELRy/C40WkdZhHItVBumJH6ZywNm6wBHLcuexeAVfzmz/0ehmSrZPdMwaFDyXP7f VdUNXvxWfwYBYSwBmkrfYbGW1xm46ptYFaK540qz8xom8aDbl5kPVd0FpFshzMzlxzYfma NPkO6WcPQhxJGGu5uO3Q0vEPqIWBZ3Vh13Mdc9me6lb94l+AoDEQAOMs8wfri2qfMwZHeN MVjfIaMg3J5bG1LLoLMjfrfxp+qzx1lGcIw84Kd890AacQxkWb49KF3tKHojUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438444; a=rsa-sha256; cv=none; b=J5LSw/3geD7kEhG8Zp7RL0q9w0K85ebZn7RUnjVci0PhrzwMxrjiv4FQEa+tUjoOcSphgQ sPazNRk0XN3sDc25jVc0oQ5Bu2+k0Uaen1ToukmHZdqtzGenwfdZdaeHwpzUo8F3mxy44J f4QsiwHmBN48zN1LWYl1RO1GQdda6+oSaZ4WWSWAmiFMOsGk6GCfHB2KWNY3WC3J5ig73/ UJ938HBDDiFrPmXxCVe2WlCmbaDJLB6nqvJa+IVK+4ANSHg6qeqM4iHAMJKNLChmvqYlZf ySRJj/viwkR77eD2WaH3XZ0ejgNychFUZcuPnaiIBQ0NOnAtWT3J5OdlgzubHQ== 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=1696438444; 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=akLxv1hxKT+WjvYFB/eR57iPyEwAtm5p6jXmRvj0oms=; b=Kj9MGIlBA4P5j0zRs9Z3SQJsHZuDIiDgTDLDx5Gy2ujqHe533U4rMPNadPUPNSAoCHiIVq xeiOiu/DAlpVa5bPOl7IiocmpGXkhAd4pORKQfq8JMWzAPhRMUm782I7udlO+fKTRbJptO XduCNRVwlksGbXOV07a1x+p0JCOFOsWAOLhUMmV7vUoIRTnTpoykfF1F5vU2FJE3KtopGe FDjaYELMEtNZYojgB/vk+xMidWY0G6EEn8s8GOtEJ0/bF/hANPaifikPTbHeryQmZLJAvP TYAKxsWTqYg/v+7cSGFisrrnzD9MrL/RIAYDVAGS4dxCdqYXv3phQbcDbQAuJg== 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 4S114D3Wcgzljj; Wed, 4 Oct 2023 16:54:04 +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 394Gs451037845; Wed, 4 Oct 2023 16:54:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394Gs4Sd037842; Wed, 4 Oct 2023 16:54:04 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:54:04 GMT Message-Id: <202310041654.394Gs4Sd037842@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: 75d1e855b0a2 - main - bhyve: Move power management code 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: 75d1e855b0a2acfb60e5a3c81b018d8f73ebf450 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=75d1e855b0a2acfb60e5a3c81b018d8f73ebf450 commit 75d1e855b0a2acfb60e5a3c81b018d8f73ebf450 Author: Mark Johnston AuthorDate: 2023-10-04 16:23:50 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:16 +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 --- 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 7716ea119dd6..c27cb427f1e2 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1043,8 +1043,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");