rename target_phy_addr_t to hwaddr to match upstream.
Upstream got rid of the target_phys_addr_t and replaced it with 'hwaddr',
so do the corresponding rename here. Note that:
- This also renames <exec/targphys.h> to <exec/hwaddr.h>
- Upstream always deins hwaddr as a 64-bit type, while the size of
our own hwaddr is still controlled by TARGET_PHYS_ADDR_BITS, and
will be 32 for now.
A future patch will change the type definition to fully match
upstream, but it is more risky / requires more cleanups. It's
simply cleaner / simpler to put the related work in a separate
patch, given the large number of sources touched by the
current change.
Change-Id: Iee30869a57798c12109b6a23570b166232bb9244
diff --git a/vl-android.c b/vl-android.c
index b3482c5..4054a1c 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -69,7 +69,7 @@
#include "android/snapshot.h"
#include "android/opengles.h"
#include "android/multitouch-screen.h"
-#include "exec/targphys.h"
+#include "exec/hwaddr.h"
#include "android/tcpdump.h"
#ifdef CONFIG_MEMCHECK
@@ -436,7 +436,7 @@
/***********************************************************/
/* x86 ISA bus support */
-target_phys_addr_t isa_mem_base = 0;
+hwaddr isa_mem_base = 0;
PicState2 *isa_pic;
static IOPortReadFunc default_ioport_readb, default_ioport_readw, default_ioport_readl;