From nobody Wed Oct 4 16:54:07 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 4S114J1db5z4wH9G; Wed, 4 Oct 2023 16:54:08 +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 4S114J08qQz3D6S; Wed, 4 Oct 2023 16:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438448; 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=eHaqTRmXknmJmeaWyM2fwBrhJOla/fLasrOnX74CYVA=; b=vDlKcqdqlTT0+HxjxwdufnpeDD+yFo70owsmVNarqYCg8lXnX/LX1nejYxu4rzXlaX7nQi wLcxQfjiIhSp7Jsl6znazoJmWuHrglEQH5QEL297VoVs7vGTUU/L8NUcEjBLjwpEVgUM1Z JDCk+zSnJPO/PJmJiBBTxx9xSqTYQDwDaz/5uVbmzvLIxqQdWdX7/1i5fxqkosazFzeT+W 2xxLChAVv0ZjKwmOz9O29wBbHVpDEpznNlF4pOz5yQVNRutW4iGgmDLvsWyBRqxFsEaw3M ziL6eoAdS1gEjqEsxd3EMrV12Om+Dh3j7s2bPun/rwdfIdqjxk6L2c+Jckee6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438448; a=rsa-sha256; cv=none; b=aPxzKagGujSKTv8GxcTqEfCTFd0iozbCqa+z+4OLX1FhNfTHm8Z5dTtRcJEi3KIagQ8JH6 +SLTN5AcQ2sH3jpxck7Ap27XpUolYkPCwXj8SwyFdQBelfZyQSGji6MraofcBX9KszeVe5 5XZ+OX2vkyFkFAd4JUwj23o6XEA43P84hChhV86DbQbmthdzCDeGHZJ28AMMX70DMtVRFL 5z10AuXgyUZDpNl/MejpXwohG4j5dBhPYyt+aHio2Sz8IbOe36VLtnnwZKNHQmL8P5k50k JWJC2uSKvZtGl8hWqOr1Kfpjas1bioYi+n2yCTMSbMM/cFsWWgOO9e3rkiZZ6w== 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=1696438448; 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=eHaqTRmXknmJmeaWyM2fwBrhJOla/fLasrOnX74CYVA=; b=fh552SJ5a8lX2+1Dh+9rZVJgChN2BVGJhPH7o9lyd3nFS7GNpK3VNlfuyglx8NzCUoQFxg Jo4IYx/4eVqNrwrtErc2D+gtNkqnJbE9Mm2wbfnVmMInSCewognsfP/L8ZKUmKGqmDy1Bv rQs272FN8s5ic5V8Aotzxm4EY+a7rZICIpt9h5Syt4yHoyfS3iGozBNlBHw0su9kUt5Bq+ 0v6kq6u6Oc9wrMQ8nwXjsPTK8HMNM6I1CbS13bBDFJELk4gjZKp1dzd/hiPR4eZF/a/fmf tt1q3ZyvdCuarEcy8qTj6SVRpsTAUYdu6iFQP/oOo1UdbJeor4g/f1SmP2RERw== 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 4S114H6NK5zlRX; Wed, 4 Oct 2023 16:54:07 +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 394Gs7rb037998; Wed, 4 Oct 2023 16:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394Gs7kP037995; Wed, 4 Oct 2023 16:54:07 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:54:07 GMT Message-Id: <202310041654.394Gs7kP037995@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: 71cc76e8d78e - main - bhyve: Compile some device models only on amd64 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/main X-Git-Reftype: branch X-Git-Commit: 71cc76e8d78eba4f6ff158c1d163af573a52580e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71cc76e8d78eba4f6ff158c1d163af573a52580e commit 71cc76e8d78eba4f6ff158c1d163af573a52580e Author: Mark Johnston AuthorDate: 2023-10-04 16:24:57 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:17 +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 --- 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 \