diff options
author | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-03-20 15:19:38 -0600 |
---|---|---|
committer | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-03-20 15:19:38 -0600 |
commit | ebdb5845bec78bbdf4344c2d67538369d196759b (patch) | |
tree | d469b806705ffe1df1ac7139a90856cf2e2ed1f0 /tools/libxc/xc_core.c | |
parent | 52ae27be8a2c3ac38b6a7c4fb05eb6e3cc41af96 (diff) | |
parent | 5b3327347f83a473755b00a76ff1176dc6cda301 (diff) | |
download | xen-ebdb5845bec78bbdf4344c2d67538369d196759b.tar.gz xen-ebdb5845bec78bbdf4344c2d67538369d196759b.tar.bz2 xen-ebdb5845bec78bbdf4344c2d67538369d196759b.zip |
merge with xen-unstable.hg
Diffstat (limited to 'tools/libxc/xc_core.c')
-rw-r--r-- | tools/libxc/xc_core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c index 3dcf51e131..3c1ff185a6 100644 --- a/tools/libxc/xc_core.c +++ b/tools/libxc/xc_core.c @@ -349,11 +349,7 @@ xc_domain_dumpcore_via_callback(int xc_handle, /* Map the shared info frame */ live_shinfo = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE, PROT_READ, info.shared_info_frame); - if ( !live_shinfo -#ifdef __ia64__ - && !info.hvm -#endif - ) + if ( !live_shinfo && !info.hvm ) { PERROR("Couldn't map live_shinfo"); goto out; |