From nobody Wed Oct 11 13:25:14 2023 X-Original-To: dev-commits-src-branches@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 4S5D624xSXz4xNpX; Wed, 11 Oct 2023 13:25:14 +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 4S5D624K24z3H0Y; Wed, 11 Oct 2023 13:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697030714; 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=k3bjddA4oOqzO6gwAim+lLtpK0z1YusuyqP+llc/zX0=; b=EbxMN9z3UFKXnd4qEMobm51XpedwSKqhAmWgFsyXfSu51V3nfk3GzDPakYMMswziRTeNwC njXbsWZWbFH+wjTXvpXXWuBv99T5Ciwu+jfa6sI+vrFCeJPunQiJ3LfR9lHt5mtBY2FXs0 VOn5VGpE6gXTzcvLBgvJLbyvQcz9n+4V8CxtFi/fA88STqheK3bhTBhU6fSaKEtYc+JKrv FY8ge5l3Nna6DYQykZfHwPZdoKFOAEKwDge3NEeXz5cqV58soL1O43x0q2o0oGjYS031oG Wp4VqEXoM5RxGEX7DggByuVYuqbwoo7KCQzhZ2e9Kejl4P8MeMeLiHI1IB0GTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697030714; a=rsa-sha256; cv=none; b=J0YXbAaIWvXUkXKEWRHB2JtbQAZqqgwGLDzm/R78zsC1ZhdZSBti569XQLMQhuF8O172Ql d4sxqxDuA+XXRvQFEUOw9kak4BPiQtPok8fEz2RjasfI2VIUlgcFqiakpladb/EfWQZpsA WH1lCDt4ULi+cVBQVGqzo0hpkFyPlsrg/Q2jwFZxcby8yIp6mfwzBdwrlWMJSvZrxPn+01 dHBaO6RDjDIQVlc9fSmwUJKwhx1LRzUqLPnasG5TIQJRzi4jKsoLYS3QMnLgvVhHKobDp/ UBY9NgHzx5STVVF+X2cWhofDv9YajWjC4aD6KhQifehPTYQ257KJ0qVlPeG0kw== 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=1697030714; 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=k3bjddA4oOqzO6gwAim+lLtpK0z1YusuyqP+llc/zX0=; b=gV/CLw8O2+jjLpc9FnxvR8nyRZHWZo/rfGoUBJT+F3MZ6tv+HYvb/y3xOa7ms28w9xzELq 95aEbsKpftUBQhE+xYVV2XRBbQy4Vkk43Pp5pkBI6fXLkLa9FYpXBXwtMWqsgk2qChkjEv 9UmctFi6XXAT09CSpCBIZjPIvdlX3ZrEnEPbdAB0KqkgNBxpAmgcFd+Ra3R+hWXOjvH3dl CZFDtdWfLwlCq8Chx3uoDlnoCDV4EBDwNxDjnHcpKS1SH/cVjLHXY+2wAH/i4BFFUqiKoF wejQxDK042wHt0IGEvtePW7IMvQhCbe7oeZd5g1OATgSP3KLbjulLIGKAGWRuA== 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 4S5D623Lp0z7rw; Wed, 11 Oct 2023 13:25:14 +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 39BDPEa8090359; Wed, 11 Oct 2023 13:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDPEG5090356; Wed, 11 Oct 2023 13:25:14 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:25:14 GMT Message-Id: <202310111325.39BDPEG5090356@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: 4e509e693f32 - stable/14 - bhyve: Compile some device models only on amd64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 4e509e693f3240f6e45972faad84e97e3d15e9ca Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4e509e693f3240f6e45972faad84e97e3d15e9ca commit 4e509e693f3240f6e45972faad84e97e3d15e9ca Author: Mark Johnston AuthorDate: 2023-10-04 16:24:57 +0000 Commit: Mark Johnston 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 \