From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Sun, 16 May 2021 20:53:33 +0000 (+0200)
Subject: target/riscv: Do not include 'pmp.h' in user emulation
X-Git-Tag: v6.1.0-rc0~80^2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bbf3d1b48fe170c0220a2267117d8a1ea9c2c2a3;p=users%2Fdwmw2%2Fqemu.git

target/riscv: Do not include 'pmp.h' in user emulation

Physical Memory Protection is a system feature.
Avoid polluting the user-mode emulation by its definitions.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Message-id: 20210516205333.696094-1-f4bug@amsat.org
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 7e879fb9ca..0619b491a4 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -97,7 +97,9 @@ enum {
 
 typedef struct CPURISCVState CPURISCVState;
 
+#if !defined(CONFIG_USER_ONLY)
 #include "pmp.h"
+#endif
 
 #define RV_VLEN_MAX 256