From nobody Thu Jan 26 19:28:48 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 4P2rNc52pGz3bTlx; Thu, 26 Jan 2023 19:28:48 +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 4P2rNc4Z1Yz4M3s; Thu, 26 Jan 2023 19:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761328; 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=1iVTThCSr8MHhhq3McjvkfOODCROy9gy8wawA/su7bY=; b=rTGb9lEBLyH6b7v50LV+cHaEoH71xYgovDgAGU9EC1jaF6H3DCL3Xt8wVY/XZDo2VsFGS6 CSOgykpRcqWZL01xLmFAXKbyAIZDb9+K7iC0rCbCgMcD78NyGTQBUfWNWKox2LvGq04XFf T4Wx4DkGfK7vzM8/UFkhrxuhurE45fAwv1cv+QcOZQYiD831Qul7IGyw9CNVIQZ4RJhbeH 7JBHsIP0cU0HvcjJFktKXpeC7d5peRa5VX639cjx1etu1hL1MrAoNChN/kxHzqt2vwb8bA 2PLjmivr7UL7DAue9v42ne6Bh1AQXR4wxCmZobvSk4eAKTEEk0gmDAKXlxa5Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761328; 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=1iVTThCSr8MHhhq3McjvkfOODCROy9gy8wawA/su7bY=; b=CjB59oE8LQfQYdKAfbUMpiVqHT5FBXvaZXyYT70b1ugPPBFhXERNdvsdTxs3U0NOMsDL82 lteVaUFvoUALAi5lcfPOF6kvt1VEUpR+BCVHCaliYGLwi8Td6wIIanKedBDYp+AWg3vgmx QvpIZTlynAScCUmAwIyDqVx/5lq4PJ+4nNJ9FBF8hmnCsTzh4tof+osPN4k+uIfbONPupl S3o40vIofUFo4RYFnYYeE9axCEgRkQ3NOAstdUoBLe2/3CpEJmGUwenGiFTyKDIxB1YUPf Ir8R6RW/pCrust3FJjkuvv4Z8Tps9OI5bXXHadBjmxRlxhKdYWw31nHpir/bjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674761328; a=rsa-sha256; cv=none; b=Y77si4veL24YqGkYSoRhfoiee7hbGClO2b1i43xFghW32vZeMVKcNUMc/oqqI0nHhMx4vr 3taYlrqlYAeqS5PmgQNBb1ib0xUpofTFfU2kEsXzC8113+c3D6JgrC3SlmPTOo8w7p8/ZJ sIs2jn2iAm5WJG4VedEoRgL0X4XnKTy0LfrxJ0+w0kC9QMC0iD1NOqzDxc7q7Ojp55195t 8p+VAW9b2PdBegTmRXHvPGpdJtcMjOthl0TJRexsadcO1wfxmIb/cEuwfPLAfvIeQDpyXH zS2KnhsbyyZPZ/6m1kXiThxS8Xi5cvg9BtS4fCXwglsS2F1DiHg2j4qplsAsXg== 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 4P2rNc3g7gzgwJ; Thu, 26 Jan 2023 19:28:48 +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 30QJSm03078981; Thu, 26 Jan 2023 19:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJSm1p078980; Thu, 26 Jan 2023 19:28:48 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:28:48 GMT Message-Id: <202301261928.30QJSm1p078980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 18003eb854e8 - stable/13 - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18003eb854e89b19dcfa4bdd09474bd664b5b116 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=18003eb854e89b19dcfa4bdd09474bd664b5b116 commit 18003eb854e89b19dcfa4bdd09474bd664b5b116 Author: Robert Wing AuthorDate: 2022-04-10 21:37:24 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:27:12 +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 (cherry picked from commit d4e8207317ca1827ba2529203d5cc4e67d836fcb) --- 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 */