git: 4e509e693f32 - stable/14 - bhyve: Compile some device models only on amd64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Oct 2023 13:25:14 UTC
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=4e509e693f3240f6e45972faad84e97e3d15e9ca
commit 4e509e693f3240f6e45972faad84e97e3d15e9ca
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-10-04 16:24:57 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-10-11 13:22:04 +0000
bhyve: Compile some device models only on amd64
These models register legacy PCI interrupts, which won't be supported in
the arm64 port. In principle it should be possible to make these models
work on arm64 with a bit of effort, so don't move the sources to the
amd64 subdirectory.
No functional change intended.
Reviewed by: corvink, jhb
MFC after: 1 week
Sponsored by: Innovate UK
Differential Revision: https://reviews.freebsd.org/D40738
(cherry picked from commit 71cc76e8d78eba4f6ff158c1d163af573a52580e)
---
usr.sbin/bhyve/Makefile | 6 ------
usr.sbin/bhyve/amd64/Makefile.inc | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index f6db03a3358b..0ec6ad73e2a2 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -37,17 +37,13 @@ SRCS= \
mevent.c \
net_backends.c \
net_utils.c \
- pci_ahci.c \
- pci_e82545.c \
pci_emul.c \
pci_fbuf.c \
- pci_hda.c \
pci_hostbridge.c \
pci_irq.c \
pci_lpc.c \
pci_nvme.c \
pci_passthru.c \
- pci_uart.c \
pci_virtio_9p.c \
pci_virtio_block.c \
pci_virtio_console.c \
@@ -55,8 +51,6 @@ SRCS= \
pci_virtio_net.c \
pci_virtio_rnd.c \
pci_virtio_scsi.c \
- pci_xhci.c \
- pctestdev.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 824f12861923..862aeddb16e0 100644
--- a/usr.sbin/bhyve/amd64/Makefile.inc
+++ b/usr.sbin/bhyve/amd64/Makefile.inc
@@ -4,7 +4,13 @@ SRCS+= \
fwctl.c \
kernemu_dev.c \
mptbl.c \
+ pci_ahci.c \
+ pci_e82545.c \
pci_gvt-d.c \
+ pci_hda.c \
+ pci_uart.c \
+ pci_xhci.c \
+ pctestdev.c \
pm.c \
post.c \
ps2kbd.c \