From nobody Sun Jul 14 18:30:14 2024 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 4WMYm640mHz5R86S; Sun, 14 Jul 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WMYm63Vqqz4XVj; Sun, 14 Jul 2024 18:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720981814; 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=5JLVKNDOICvU4XFKtsp/t2g9ppwxWt43LkYcdKzDHs4=; b=U1V5lMFjoA9y+kdbsyx7J46nwz+A4PJHCcIx40iZ2pR882Trh9p3BSBJXZOFQoHY69pEpF ChbKet90FKAZP0tSiB3hy0EeyOvaH3A6AhAZFIqs4PNzodGhs3fWFt/5wbm1bXvY8vY7jF f5Jt2cFZB/3zeAQeeLqLTTHj1kjRJhAyTwPBgGnV+hLCNbz3/AVTGKodDYiLXF7EtBi3cf N+E8ri3124xWq+0MUe/aUfs3cRJ766xoG/6qNUabw0Azi5NDwu23hnCCKy2Bf9pgyK1nej B1BUMg/XhiHKZwE4Rg6rVpKMQqGeQa6f0aNmCnwreAfCLoB756wKFeKg0tTRvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720981814; a=rsa-sha256; cv=none; b=Kz51fuegSx/B0jb49rt5JPEvlQK/lqRSedBcjwZ5jFmU4MhUOP8cOzNlKBl01qbuQasFjE J6gIFu+ApdVcEaQ2nC3ByCXlczYwckv7RIDQHwuEObtD8xwlZcNSxUcWec3k0hWbOL+HOK kp0JNvi9plQ8UGwiMsjuDOXSuvslmGKsqJC3cTkRIrMJMhdpMt9UOcroOaTAu7oltT7PxO NbyO6Aj2Q26to1zOj+wuZyxT2UyS8n8C0RUit52s8XU5HlIdwq7b+9YgIGuiPLQFyrPwQx +OxvgNMDEZctrBk4tMzGsQ6bLq4cizKmFPg9Dya8IeRGADKkVCKv1UFud/ctPA== 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=1720981814; 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=5JLVKNDOICvU4XFKtsp/t2g9ppwxWt43LkYcdKzDHs4=; b=qQ2gsIbob3ihr3mJbgR8c1WnZd8zZqVO1QbXltPu86MF35y4ltuWMPTzSBwkwzGfbZDmBi g2QeOl2T8I7LrqCOup8snmnf6XRSyhG4+HjWB7uFt5MiV3DlbjoMh9fF1obEclLxSKmdEK 3JwI9CEgCpmuc/2HG5Fqnd8tQKfmj0NPjVk9rPfjAI4LDhQlVx3ryPQAbjvBMo/lh37k/Y KUcBn2c9JI6tQI/D7KtrS5g2nI6rpG6kKdQ2AOp9lwCynTdeKHhSK9xNs+DllA3NTlZdBC 6xbIuaF2ctgVaOeUzcK+nsq4jxtf9iL1WiH0gxEemMAB14qA+uvoewtnDynkyA== 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 4WMYm6348YzKm5; Sun, 14 Jul 2024 18:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46EIUEEE018322; Sun, 14 Jul 2024 18:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46EIUEsY018314; Sun, 14 Jul 2024 18:30:14 GMT (envelope-from git) Date: Sun, 14 Jul 2024 18:30:14 GMT Message-Id: <202407141830.46EIUEsY018314@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: 7cd91315911d - main - vmm: Conditionalize addition of opt_*.h headers 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 7cd91315911d3413ccf527228d4b8c060b681fba Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7cd91315911d3413ccf527228d4b8c060b681fba commit 7cd91315911d3413ccf527228d4b8c060b681fba Author: Mark Johnston AuthorDate: 2024-07-14 16:12:01 +0000 Commit: Mark Johnston CommitDate: 2024-07-14 18:29:14 +0000 vmm: Conditionalize addition of opt_*.h headers These are only included in the amd64 vmm code, so it doesn't make sense to list them unconditionally. PR: 280171 Reviewed by: wosch, imp, emaste Differential Revision: https://reviews.freebsd.org/D45964 --- sys/modules/vmm/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 8f6eb915290a..96155753f1de 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -3,8 +3,13 @@ KMOD= vmm -SRCS= opt_acpi.h opt_bhyve_snapshot.h opt_ddb.h \ - acpi_if.h bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h +.if ${MACHINE_CPUARCH} == "amd64" +SRCS+= opt_acpi.h \ + opt_bhyve_snapshot.h \ + opt_ddb.h +.endif + +SRCS+= acpi_if.h bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h CFLAGS+= -DVMM_KEEP_STATS CFLAGS+= -I${SRCTOP}/sys/${MACHINE}/vmm