[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/21] Only check CONFIG_NVMM when NEED_CPU_H is defined
From: |
Paolo Bonzini |
Subject: |
[PULL 19/21] Only check CONFIG_NVMM when NEED_CPU_H is defined |
Date: |
Mon, 13 Sep 2021 13:57:40 +0200 |
From: Reinoud Zandijk <reinoud@NetBSD.org>
Userland targers will otherwise use a poisoned CONFIG_NVMM
Signed-off-by: Reinoud Zandijk <Reinoud@NetBSD.org>
Message-Id: <20210718134650.1191-2-reinoud@NetBSD.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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.31.1
- [PULL 00/21] x86, docs, meson changes for 2021-09-13, Paolo Bonzini, 2021/09/13
- [PULL 01/21] target/i386: add missing bits to CR4_RESERVED_MASK, Paolo Bonzini, 2021/09/13
- [PULL 02/21] target/i386: VMRUN and VMLOAD canonicalizations, Paolo Bonzini, 2021/09/13
- [PULL 03/21] target/i386: Added VGIF feature, Paolo Bonzini, 2021/09/13
- [PULL 08/21] target/i386: Added vVMLOAD and vVMSAVE feature, Paolo Bonzini, 2021/09/13
- [PULL 10/21] docs: standardize directory index to --- with overline, Paolo Bonzini, 2021/09/13
- [PULL 11/21] docs/system: standardize man page sections to --- with overline, Paolo Bonzini, 2021/09/13
- [PULL 06/21] target/i386: Added ignore TPR check in ctl_has_irq, Paolo Bonzini, 2021/09/13
- [PULL 09/21] docs: standardize book titles to === with overline, Paolo Bonzini, 2021/09/13
- [PULL 12/21] docs/system: move x86 CPU configuration to a separate document, Paolo Bonzini, 2021/09/13
- [PULL 19/21] Only check CONFIG_NVMM when NEED_CPU_H is defined,
Paolo Bonzini <=
- [PULL 04/21] target/i386: Moved int_ctl into CPUX86State structure, Paolo Bonzini, 2021/09/13
- [PULL 14/21] meson: look up cp and dtrace with find_program(), Paolo Bonzini, 2021/09/13
- [PULL 16/21] meson: remove dead variable, Paolo Bonzini, 2021/09/13
- [PULL 07/21] target/i386: Added changed priority check for VIRQ, Paolo Bonzini, 2021/09/13
- [PULL 05/21] target/i386: Added VGIF V_IRQ masking capability, Paolo Bonzini, 2021/09/13
- [PULL 13/21] meson.build: Do not look for VNC-related libraries if have_system is not set, Paolo Bonzini, 2021/09/13
- [PULL 17/21] fw_cfg: add etc/msr_feature_control, Paolo Bonzini, 2021/09/13
- [PULL 15/21] meson: do not use python.full_path() unnecessarily, Paolo Bonzini, 2021/09/13
- [PULL 20/21] Fix nvmm_ram_block_added() function arguments, Paolo Bonzini, 2021/09/13
- [PULL 18/21] util: Suppress -Wstringop-overflow in qemu_thread_start, Paolo Bonzini, 2021/09/13