| Message ID | 1350064784-13058-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 301592ea6f9c23d233fadc73124301d1305af13c |
| Headers | show |
Am 12.10.2012 19:59, schrieb Peter Maydell: > 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> I do ask myself though why we would include targphys.h in user mode. ;) Andreas
On Fri, Oct 12, 2012 at 06:59:44PM +0100, Peter Maydell wrote: > 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> > --- > cf brief discussion earlier: > http://lists.gnu.org/archive/html/qemu-devel/2012-10/msg01138.html > > targphys.h | 4 ++++ > 1 file changed, 4 insertions(+) Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
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
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> --- cf brief discussion earlier: http://lists.gnu.org/archive/html/qemu-devel/2012-10/msg01138.html targphys.h | 4 ++++ 1 file changed, 4 insertions(+)