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

buildconfigs/Rules.mk

@@ -74,8 +74,8 @@ clean::
 ref-%/.valid-ref: pristine-%/.valid-pristine
 	rm -rf $(@D)
 	cp -al $(<D) $(@D)
-	[ -d patches/$* ] && \
-	  for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done
+	([ -d patches/$* ] && \
+	  for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done) || true
 	touch $@ # update timestamp to avoid rebuild
 
 %-build:

tools/libxc/xc_core.c

@@ -48,7 +48,7 @@ xc_domain_dumpcore(int xc_handle,
 		goto error_out;
 	}
 	
-	if (xc_domain_getinfo(xc_handle, domid, 1, &info)) {
+	if (xc_domain_getinfo(xc_handle, domid, 1, &info) != 1) {
 		PERROR("Could not get info for domain");
 		goto error_out;
 	}

tools/libxc/xc_linux_save.c

@@ -333,9 +333,9 @@ int suspend_and_state(int xc_handle, XcIOContext *ioctxt,
 
 retry:
 
-    if ( xc_domain_getinfo(xc_handle, ioctxt->domain, 1, info) )
+    if ( xc_domain_getinfo(xc_handle, ioctxt->domain, 1, info) != 1)
     {
-	xcio_error(ioctxt, "Could not get full domain info");
+	xcio_error(ioctxt, "Could not get domain info");
 	return -1;
     }
 
@@ -447,9 +447,9 @@ int xc_linux_save(int xc_handle, XcIOContext *ioctxt)
         return 1;
     }
     
-    if ( xc_domain_getinfo(xc_handle, domid, 1, &info) )
+    if ( xc_domain_getinfo(xc_handle, domid, 1, &info) != 1)
     {
-        xcio_error(ioctxt, "Could not get full domain info");
+        xcio_error(ioctxt, "Could not get domain info");
         goto out;
     }
     if ( xc_domain_get_vcpu_context( xc_handle, domid, /* FIXME */ 0,