From nobody Sun Apr 10 21:39:21 2022 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 E18E81AA843B; Sun, 10 Apr 2022 21:39:21 +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 4Kc53Y62FGz3t6Y; Sun, 10 Apr 2022 21:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649626761; 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=1PDcdG5QSGbhAeqyqupQ/5m6fi/ueHMJJNWeGFovIIs=; b=KZcynihILGNFDv2ZV9fgatMG3U9OENfEvjYstLpductgynPeoPtCFbv8xgSFoGg6aIDGhR oc3SDJR7QdLE7mNPlA86e6m52CWNsOwZmxge4M8uTAz9lyfy8LB+8tnVDfcjvMupExTVuS XFF+l1/qS1y60+I3IHmM+siGFSFeLE5sAhq26rmns+EVIwQoG1i/EgaUCvZt5386iqZndX 7GAyqVVkCqDo5L71VQDKIK6+SY27NNKGd/c6k4s47+hGFsI41eXqV9aQlYV5i8apb7Jc0e FbErd4nHf5iw2JK1BwMx+z82pg5Yfwq7J8cu4UpxiCeybVI0Pl7XOhcp9P18bQ== 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 AED7116794; Sun, 10 Apr 2022 21:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23ALdLiC022214; Sun, 10 Apr 2022 21:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23ALdLKV022213; Sun, 10 Apr 2022 21:39:21 GMT (envelope-from git) Date: Sun, 10 Apr 2022 21:39:21 GMT Message-Id: <202204102139.23ALdLKV022213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: d4e8207317ca - main - vmm_instruction_emul.c: fix bhyve build 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: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4e8207317ca1827ba2529203d5cc4e67d836fcb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649626761; 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=1PDcdG5QSGbhAeqyqupQ/5m6fi/ueHMJJNWeGFovIIs=; b=YAaWdOwNMobul/mjAvEoLTYSm+i4SckfEmjlzINy+NORYF/le+BtxPZxz5SirRw1il9Aql YB0YZqHh9J90+kJzTAJkC58DLvDqzHF27DxSNa1WvWP4YjBtE5cLvzUZ5rs9d8hrMzHnui jwE/e9BZFH2x1gZasnQBSvwZ0xfJax0lo/rS3ROMeSxkvuZ4OMtPJZcUasuQlzEJK9T9au CFTPEMLdZ7EyqYwUnL17QgjTBLc1bG9GEjHkj5y7ejJiHkalvhOYWj7zZjQG22boGILCpw FV5dfy1Y35TygSbIQSIMOy+Xg+B7xoeuiu3BTauSbBuFqZHrqAJmM2wyzRY42A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649626761; a=rsa-sha256; cv=none; b=g4ZdjiEn3ZnzKnCS6ghga8xk29m85k2VUDU+N64moLKRmEDTbEpH/CgE2r8OugkL/lTUi1 Jo4TVA/+s80YGbiA8haHMthi1Da5GD8wichTUOfF4f+pnYEggXnyTCnwtt2jUYdURvx8GN LZNaGKp4LL1y12VaZhtgcGZIo4ilY6bzXODbYMI6dhPvX9ddN7VbHVpg+xmFDXpUhMBrpP TmnwtEh18aNMNp67Z0WGdoiOwqcJD5gmthQp6qat5zXcxZD+Enn2NsCgV2YvbdrsK9eU7a scrEB+3Tmkus87Zlc0CbHCyNsfHJAWaU0SLCDxQ6TR9W+ijFiJc9T14caKZr7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=d4e8207317ca1827ba2529203d5cc4e67d836fcb commit d4e8207317ca1827ba2529203d5cc4e67d836fcb Author: Robert Wing AuthorDate: 2022-04-10 21:37:24 +0000 Commit: Robert Wing CommitDate: 2022-04-10 21:37:24 +0000 vmm_instruction_emul.c: fix bhyve build The __diagused macro was used to cure a "set but not used" warning. This broke the build for bhyve since __diagused is only defined in the kernel. Define __diagused when not building the kernel. Fixes: 5241577a223d ("vmm: fix set but not used warning") Reported by: Jenkins --- sys/amd64/vmm/vmm_instruction_emul.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c index 809fa16bce46..06dffe6a80b9 100644 --- a/sys/amd64/vmm/vmm_instruction_emul.c +++ b/sys/amd64/vmm/vmm_instruction_emul.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#define __diagused #define KASSERT(exp,msg) assert((exp)) #define panic(...) errx(4, __VA_ARGS__) #endif /* _KERNEL */