From nobody Wed Oct 11 13:25:16 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 4S5D652G14z4xNmN; Wed, 11 Oct 2023 13:25:17 +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 4S5D646Zhxz3Gn0; Wed, 11 Oct 2023 13:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697030716; 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=8QoDIjNSDN4ZjRlI1BmnfBVEHTQ0hhH7D/Qe4de/Z08=; b=osWWAhbLc3XnDcrKAfHPZhuybFunlROkTSexiz14Fhm3SpbVV4YT9wrdYl962RfbFriUoB 2B2Cfityi9+S+zub1z7gLLVkybgvHR3L8vUP52/4WKfEBt1D4L3ZWXcW/KsxAJk85nI+ee bBMiBXznYfiqWoXNe2U8TNYOLm2rsqyhsHuKFt85SxAEtsi/XJR/gtVHnbKA1GJS6ykhzj 9YVXcKl1R8Qm5h4Xt6PvoUMwClyCPN8U1PKI7+58NbseKieM7yTwuVAqUzPV524tOgrNup M1falgp1JPOdi/d0lXrceqPQlo2lwR1p2uUlLDvcb4KnLUNHJD/cGpQZvb/zcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697030716; a=rsa-sha256; cv=none; b=NNTIQDXXslALrFkIJkZrhBFNeVQ+qXmr2yfzEyEEom1yaWDIF/+kfnYj23zIOog1MtcRrv Rto1luY7coI8jLCIz926GwCXoxlGLMX3+Y6V/mFJ8zMdLacBu+hX5WBy2fnQ6wGVZUebS8 WMqfQonkzTc6neHjJKYlazYia6c7b42a8c3tJ0fjWm9FraMhYSCIGJaKLdKJrJkffZRcK3 0z64i2G4/o2COBmEsQskV6zXbUE95qu4oDl+ZVgYiMkzKO44yFGye8juOwNB0VQuW52thC rFJUbJFq3BQQdvVT582cnhNrTPsohu0sI7U8lJXzGT+8WHWzDnHHBHg1mSOTAg== 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=1697030716; 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=8QoDIjNSDN4ZjRlI1BmnfBVEHTQ0hhH7D/Qe4de/Z08=; b=XYPZso7lReZRNp4nhUAxkvmFIF0h1EcLRvWpcLFZ+tmOjF902P+CsxvFD03WKkTHzb0ETA VG5weV2B9rbkgtd4zDVGhzMtoyDQ+rSLLSdkCYvel+wPgkn8vjGF4bX4tDkov2UxQMMKXo LHKykE/JkXGw9IzU3s7rLtHq7P63d5JvWUi4AwJb4fMg4MWsHmpB/UxJcQZj1GXRQaziyy LyWFg2X1oISNGq7qQjLtr9sSE3Xm9UonMz8/IetnZTUnPhrmfQYrXd7r91coR07ymb2O0T 0MTCMLy3i2/jiNNK/ZKhwO4DRpbB33P/q38/CW797merv8JvO0REiOLRw8x9Eg== 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 4S5D645gZRz7rx; Wed, 11 Oct 2023 13:25:16 +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 39BDPGfo090458; Wed, 11 Oct 2023 13:25:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDPG1Q090455; Wed, 11 Oct 2023 13:25:16 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:25:16 GMT Message-Id: <202310111325.39BDPG1Q090455@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: 96753aebcc39 - stable/14 - bhyve: Conditionally compile framebuffer-related code 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: 96753aebcc39fdd96e369e2da9feca03a3b0b794 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=96753aebcc39fdd96e369e2da9feca03a3b0b794 commit 96753aebcc39fdd96e369e2da9feca03a3b0b794 Author: Mark Johnston AuthorDate: 2023-10-04 16:25:47 +0000 Commit: Mark Johnston CommitDate: 2023-10-11 13:22:06 +0000 bhyve: Conditionally compile framebuffer-related code The arm64 port does not implement VGA, so move the device model sources. Compile framebuffer code only on amd64 for now, but do not move the sources, as we ought to be able to add support later. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40740 (cherry picked from commit 61429b49d2bd4fdad37e0873b2fc085eacbd26b2) --- usr.sbin/bhyve/Makefile | 3 --- usr.sbin/bhyve/amd64/Makefile.inc | 3 +++ usr.sbin/bhyve/{ => amd64}/vga.c | 0 usr.sbin/bhyve/{ => amd64}/vga.h | 0 usr.sbin/bhyve/pci_fbuf.c | 5 +++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 5aaf0d4ea2a0..1bb3c9a1b053 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -37,7 +37,6 @@ SRCS= \ net_backends.c \ net_utils.c \ pci_emul.c \ - pci_fbuf.c \ pci_hostbridge.c \ pci_nvme.c \ pci_passthru.c \ @@ -50,7 +49,6 @@ SRCS= \ pci_virtio_scsi.c \ qemu_fwcfg.c \ qemu_loader.c \ - rfb.c \ smbiostbl.c \ sockstream.c \ tpm_device.c \ @@ -60,7 +58,6 @@ SRCS= \ uart_emul.c \ usb_emul.c \ usb_mouse.c \ - vga.c \ virtio.c \ vmexit.c \ vmgenc.c diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc index 76813891b0a0..435327155fc3 100644 --- a/usr.sbin/bhyve/amd64/Makefile.inc +++ b/usr.sbin/bhyve/amd64/Makefile.inc @@ -7,6 +7,7 @@ SRCS+= \ mptbl.c \ pci_ahci.c \ pci_e82545.c \ + pci_fbuf.c \ pci_gvt-d.c \ pci_hda.c \ pci_irq.c \ @@ -18,9 +19,11 @@ SRCS+= \ post.c \ ps2kbd.c \ ps2mouse.c \ + rfb.c \ rtc.c \ spinup_ap.c \ task_switch.c \ + vga.c \ xmsr.c .PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm diff --git a/usr.sbin/bhyve/vga.c b/usr.sbin/bhyve/amd64/vga.c similarity index 100% rename from usr.sbin/bhyve/vga.c rename to usr.sbin/bhyve/amd64/vga.c diff --git a/usr.sbin/bhyve/vga.h b/usr.sbin/bhyve/amd64/vga.h similarity index 100% rename from usr.sbin/bhyve/vga.h rename to usr.sbin/bhyve/amd64/vga.h diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c index 3d63707affa8..a6bf508a46e6 100644 --- a/usr.sbin/bhyve/pci_fbuf.c +++ b/usr.sbin/bhyve/pci_fbuf.c @@ -46,10 +46,11 @@ #include "config.h" #include "debug.h" #include "console.h" -#include "inout.h" #include "pci_emul.h" #include "rfb.h" -#include "vga.h" +#ifdef __amd64__ +#include "amd64/vga.h" +#endif /* * bhyve Framebuffer device emulation.