Patchwork [2/6] targphys.h: Don't define target_phys_addr_t for user-mode emulators

login
register
mail settings
Submitter Stefan Hajnoczi
Date Nov. 1, 2012, 7:05 p.m.
Message ID <1351796754-21703-5-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/196335/
State New
Headers show

Comments

Stefan Hajnoczi - Nov. 1, 2012, 7:05 p.m.
From: Peter Maydell <peter.maydell@linaro.org>

Commit 4be403c accidentally defined the target_phys_addr_t type when
building user-mode emulators. Since the type doesn't really make
any sense except for system emulators, avoid defining it when building
in user mode.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 targphys.h | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/targphys.h b/targphys.h
index 08cade9..50911fd 100644
--- a/targphys.h
+++ b/targphys.h
@@ -3,6 +3,8 @@ 
 #ifndef TARGPHYS_H
 #define TARGPHYS_H
 
+#ifndef CONFIG_USER_ONLY
+
 #define TARGET_PHYS_ADDR_BITS 64
 /* target_phys_addr_t is the type of a physical address (its size can
    be different from 'target_ulong').  */
@@ -18,3 +20,5 @@  typedef uint64_t target_phys_addr_t;
 #define TARGET_PRIXPHYS PRIX64
 
 #endif
+
+#endif