ia64/xen-unstable
changeset 4909:650b80c41719
bitkeeper revision 1.1405 (4284f1eblDv0pt9WRByVi3DRdlLGSA)
Merge firebug.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/smh22/mwray-xend2.bk
Merge firebug.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/smh22/mwray-xend2.bk
author | smh22@firebug.cl.cam.ac.uk |
---|---|
date | Fri May 13 18:28:59 2005 +0000 (2005-05-13) |
parents | 69bd3136c3b7 03d2d6123dd2 |
children | 85b71d470051 |
files | buildconfigs/Rules.mk tools/libxc/xc_core.c tools/libxc/xc_linux_save.c tools/libxutil/sxpr_parser.c tools/libxutil/sxpr_parser.h xen/arch/x86/mm.c |
line diff
1.1 --- a/buildconfigs/Rules.mk Fri May 13 18:21:30 2005 +0000 1.2 +++ b/buildconfigs/Rules.mk Fri May 13 18:28:59 2005 +0000 1.3 @@ -74,8 +74,8 @@ clean:: 1.4 ref-%/.valid-ref: pristine-%/.valid-pristine 1.5 rm -rf $(@D) 1.6 cp -al $(<D) $(@D) 1.7 - [ -d patches/$* ] && \ 1.8 - for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done 1.9 + ([ -d patches/$* ] && \ 1.10 + for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done) || true 1.11 touch $@ # update timestamp to avoid rebuild 1.12 1.13 %-build:
2.1 --- a/tools/libxc/xc_core.c Fri May 13 18:21:30 2005 +0000 2.2 +++ b/tools/libxc/xc_core.c Fri May 13 18:28:59 2005 +0000 2.3 @@ -48,7 +48,7 @@ xc_domain_dumpcore(int xc_handle, 2.4 goto error_out; 2.5 } 2.6 2.7 - if (xc_domain_getinfo(xc_handle, domid, 1, &info)) { 2.8 + if (xc_domain_getinfo(xc_handle, domid, 1, &info) != 1) { 2.9 PERROR("Could not get info for domain"); 2.10 goto error_out; 2.11 }
3.1 --- a/tools/libxc/xc_linux_save.c Fri May 13 18:21:30 2005 +0000 3.2 +++ b/tools/libxc/xc_linux_save.c Fri May 13 18:28:59 2005 +0000 3.3 @@ -333,9 +333,9 @@ int suspend_and_state(int xc_handle, XcI 3.4 3.5 retry: 3.6 3.7 - if ( xc_domain_getinfo(xc_handle, ioctxt->domain, 1, info) ) 3.8 + if ( xc_domain_getinfo(xc_handle, ioctxt->domain, 1, info) != 1) 3.9 { 3.10 - xcio_error(ioctxt, "Could not get full domain info"); 3.11 + xcio_error(ioctxt, "Could not get domain info"); 3.12 return -1; 3.13 } 3.14 3.15 @@ -447,9 +447,9 @@ int xc_linux_save(int xc_handle, XcIOCon 3.16 return 1; 3.17 } 3.18 3.19 - if ( xc_domain_getinfo(xc_handle, domid, 1, &info) ) 3.20 + if ( xc_domain_getinfo(xc_handle, domid, 1, &info) != 1) 3.21 { 3.22 - xcio_error(ioctxt, "Could not get full domain info"); 3.23 + xcio_error(ioctxt, "Could not get domain info"); 3.24 goto out; 3.25 } 3.26 if ( xc_domain_get_vcpu_context( xc_handle, domid, /* FIXME */ 0,