diff options
| author | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-02-09 06:28:53 -0800 |
|---|---|---|
| committer | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-02-09 06:28:53 -0800 |
| commit | 94a1eb5ac8d95f42d4a25ba3279c68ca42d1d239 (patch) | |
| tree | c4969bd1bea569ea18a04dadc8ca23b9a70fd616 /tools/tests | |
| parent | 6c1e5375c1370d410837e560adc83c3d3854d367 (diff) | |
| download | xen-94a1eb5ac8d95f42d4a25ba3279c68ca42d1d239.tar.gz xen-94a1eb5ac8d95f42d4a25ba3279c68ca42d1d239.tar.bz2 xen-94a1eb5ac8d95f42d4a25ba3279c68ca42d1d239.zip | |
Tools: Make xen-access test compile in 32 bits mode
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'tools/tests')
| -rw-r--r-- | tools/tests/Makefile | 2 | ||||
| -rw-r--r-- | tools/tests/xen-access/xen-access.c | 23 |
2 files changed, 13 insertions, 12 deletions
diff --git a/tools/tests/Makefile b/tools/tests/Makefile index f4f1169229..cc96cd3a7f 100644 --- 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 --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 4394f8f203..033ff8f962 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -600,14 +600,15 @@ 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", - req.access_r ? 'r' : '-', - req.access_w ? 'w' : '-', - req.access_x ? 'x' : '-', - req.gfn, - req.offset, - req.gla, - req.vcpu_id); + printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" + PRIx64") gla %016"PRIx64" (vcpu %d)\n", + req.access_r ? 'r' : '-', + req.access_w ? 'w' : '-', + req.access_x ? 'x' : '-', + req.gfn, + req.offset, + req.gla, + req.vcpu_id); if ( default_access != after_first_access ) rc = xc_hvm_set_mem_access(xch, domain_id, after_first_access, req.gfn, 1); @@ -617,8 +618,10 @@ 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, - req.vcpu_id); + printf("INT3: rip=%016"PRIx64", gfn=%"PRIx64" (vcpu %d)\n", + req.gla, + req.gfn, + req.vcpu_id); /* Reinject */ rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, 3, -1, 0); |