From nobody Wed Oct 4 16:54:10 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 4S114L3bdrz4wH9V; Wed, 4 Oct 2023 16:54: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 4S114L2X0nz3D77; Wed, 4 Oct 2023 16:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438450; 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=Hsy3HWVFd9JyiuQVZIQ4XTsJt0JtjF0jv9Eltsa2j2Q=; b=qKQty9O2cYdtTVYsNuhYookeYA6oLng6dm1oiMzYGU48aSp8FnnEvSogUzpXukZs+2Mrsc A+QGvEyYFDaRaPVRcNudtUOKFCEfpvSkAbrc7obnujUIphIkB3S4aRFQ/Ag8LeqEX8ce4W Vv7V0PyU7c6+e99pIBhtxqtslKevYs3HKGAb9kNIPARQ63RxcH3wFtCqOTrxWa0IqYG981 2LFJzWawPRnI639iJl0WJbnyekjAieM1JNlXn70VLFvBK+yEhbEV2x4DFGYfWDT09irCwo isiLhj448aZtBMlPVIgINzWdttE4NcA/ZlLQ4OHChp1506qUNyZzJCbgznFrgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438450; a=rsa-sha256; cv=none; b=myEIVgT56v/cablrCMp0tShKisVz+ZCtUkmF4lj2AVUG7EuDV0WfIfBR9BnZFLtxWPXI14 sQrjj2GyfjBTwk3b1LHfCTeJnq2YaLMhYocjNkHOdYOil7TwpmBiTiMKDIyou9n3mIfT5a yeFvTVBEmoE33DqrTgZTD0VEiBNdyAVfca7m4yvC60IAC11FF4DBqUeitb+iM2lR77Q9P8 t9n2lVHLjdNHdHsR6vhDPTI4Dp73mbFAfwpPqoZcLF9rRYpJaQhl1RKBQaF4nay/MWRO/X DKfddlx73QUg1mJxVjeE5nsdUOQgcEqYpdAvnwfAQ4Osjepp0AlPB1mTIYvhGA== 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=1696438450; 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=Hsy3HWVFd9JyiuQVZIQ4XTsJt0JtjF0jv9Eltsa2j2Q=; b=JdrO84HT7EDiD9pMfgvoLP78HUUCA/XYXvSMKvceJ7ewppivAx11m7z+cJxmAjfmwMEwY5 p/zm/dy4dhmuE1SpSzD3qgXTC8mmgJBvTGzqZYmUkBYGwreAF/4TkeqnkwDt72oiuQSt21 J0C6lLPK9qCA10gSM1E3fnr5bMFAcD2QNK0QIVB4twER0zjaPM8b82rB0Kn4FkhSW753dt ZAz9dz85ZZ/wAs/dz2sfAgdTZkVimLA2D+B58fEBaFwdKga0pb0a/mnyauOmwIoaNBQFi4 PvZ0Nb+y8gOc9igEOTHqlzmq+3/kEspENGWfAJt+NJx7zXn9tOrgDrm5Pep+NQ== 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 4S114L1SkWzlm1; Wed, 4 Oct 2023 16:54: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 394GsASU038094; Wed, 4 Oct 2023 16:54:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394GsAf2038091; Wed, 4 Oct 2023 16:54:10 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:54:10 GMT Message-Id: <202310041654.394GsAf2038091@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: 61429b49d2bd - main - bhyve: Conditionally compile framebuffer-related code 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: 61429b49d2bd4fdad37e0873b2fc085eacbd26b2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=61429b49d2bd4fdad37e0873b2fc085eacbd26b2 commit 61429b49d2bd4fdad37e0873b2fc085eacbd26b2 Author: Mark Johnston AuthorDate: 2023-10-04 16:25:47 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:17 +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 --- 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.