git: 18003eb854e8 - stable/13 - vmm_instruction_emul.c: fix bhyve build

From: John Baldwin <>
Date: Thu, 26 Jan 2023 19:28:48 UTC
The branch stable/13 has been updated by jhb:


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 <string.h>
 #include <strings.h>
 #include <vmmapi.h>
+#define	__diagused
 #define	KASSERT(exp,msg)	assert((exp))
 #define	panic(...)		errx(4, __VA_ARGS__)
 #endif	/* _KERNEL */