[PATCH] Tools: Make xen-access test compile in 32 bits mode

[Andres Lagar-Cavilla <andres@lagarcavilla.org>]

 tools/tests/Makefile                |   2 --
 tools/tests/xen-access/xen-access.c |  12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)


Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>

diff -r 78ff0c8a944f -r 5c7986918883 tools/tests/Makefile
--- a/tools/tests/Makefile
+++ b/tools/tests/Makefile
@@ -11,9 +11,7 @@ ifeq ($(XEN_TARGET_ARCH),__fixme__)
 SUBDIRS-y += regression
 endif
 SUBDIRS-y += x86_emulator
-ifneq ($(XEN_TARGET_ARCH),x86_32)
 SUBDIRS-y += xen-access
-endif
 
 .PHONY: all clean install distclean
 all clean distclean: %: subdirs-%
diff -r 78ff0c8a944f -r 5c7986918883 tools/tests/xen-access/xen-access.c
--- a/tools/tests/xen-access/xen-access.c
+++ b/tools/tests/xen-access/xen-access.c
@@ -600,13 +600,13 @@ int main(int argc, char *argv[])
             case MEM_EVENT_REASON_VIOLATION:
                 rc = xc_hvm_get_mem_access(xch, domain_id, req.gfn, &access);
 
-                printf("PAGE ACCESS: %c%c%c for GFN %lx (offset %06lx) gla %016lx (vcpu %d)\n",
+                printf("PAGE ACCESS: %c%c%c for GFN %llx (offset %06llx) gla %016llx (vcpu %d)\n",
                         req.access_r ? 'r' : '-',
                         req.access_w ? 'w' : '-',
                         req.access_x ? 'x' : '-',
-                        req.gfn,
-                        req.offset,
-                        req.gla,
+                        (unsigned long long) req.gfn,
+                        (unsigned long long) req.offset,
+                        (unsigned long long) req.gla,
                         req.vcpu_id);
 
                 if ( default_access != after_first_access )
@@ -617,7 +617,9 @@ int main(int argc, char *argv[])
                 rsp.p2mt = req.p2mt;
                 break;
             case MEM_EVENT_REASON_INT3:
-                printf("INT3: rip=%016lx, gfn=%lx (vcpu %d)\n", req.gla, req.gfn,
+                printf("INT3: rip=%016llx, gfn=%llx (vcpu %d)\n", 
+                        (unsigned long long) req.gla, 
+                        (unsigned long long) req.gfn,
                         req.vcpu_id);
 
                 /* Reinject */