From 5fd0711b859c101876585f736ddb48721c106685 Mon Sep 17 00:00:00 2001 From: Reinoud Zandijk Date: Sun, 18 Jul 2021 15:46:49 +0200 Subject: [PATCH] Only check CONFIG_NVMM when NEED_CPU_H is defined Userland targers will otherwise use a poisoned CONFIG_NVMM Signed-off-by: Reinoud Zandijk Message-Id: <20210718134650.1191-2-reinoud@NetBSD.org> Signed-off-by: Paolo Bonzini --- include/sysemu/nvmm.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/sysemu/nvmm.h b/include/sysemu/nvmm.h index 6d216599b0..833670fccb 100644 --- a/include/sysemu/nvmm.h +++ b/include/sysemu/nvmm.h @@ -10,8 +10,7 @@ #ifndef QEMU_NVMM_H #define QEMU_NVMM_H -#include "config-host.h" -#include "qemu-common.h" +#ifdef NEED_CPU_H #ifdef CONFIG_NVMM @@ -23,4 +22,6 @@ int nvmm_enabled(void); #endif /* CONFIG_NVMM */ -#endif /* CONFIG_NVMM */ +#endif /* NEED_CPU_H */ + +#endif /* QEMU_NVMM_H */ -- 2.11.0