diff options
author | Hollis Blanchard <hollisb@us.ibm.com> | 2007-03-21 18:08:31 -0500 |
---|---|---|
committer | Hollis Blanchard <hollisb@us.ibm.com> | 2007-03-21 18:08:31 -0500 |
commit | 001e8c5cd8f60e7cafbfed9869862db46b5ed473 (patch) | |
tree | 7ac30f8387c3f66c1860ea9421e0a681bb4b4b7f /tools/libxc/xc_core.c | |
parent | a7706a8de0119f07b6f7e014a78fd07947af3787 (diff) | |
parent | 5b3327347f83a473755b00a76ff1176dc6cda301 (diff) | |
download | xen-001e8c5cd8f60e7cafbfed9869862db46b5ed473.tar.gz xen-001e8c5cd8f60e7cafbfed9869862db46b5ed473.tar.bz2 xen-001e8c5cd8f60e7cafbfed9869862db46b5ed473.zip |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
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; |