Fix openvz build on x86_64

diff --git a/ChangeLog b/ChangeLog
index a4f8ae39c799fbbc40c3c20943ae55982014967c..3ec065018457ab48cecf3892b4a3a595f8305c79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul  7 12:46:56 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/openvz_driver.c: Don't cast pointers to ints, and fix
+       the return value to be -1, not 0.
+
 Mon Jul  7 11:34:56 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * tests/testutils.c: Remove bogus return statement which

diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index 80e4ae5dd9bcc045565964b30078cf29edb014ac..62f202eb2869df747ce6566550f7a0aea270e5f2 100644 (file)
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -634,7 +634,7 @@ static int openvzListDomains(virConnectPtr conn, int *ids, int nids) {
     ret = virExec(conn, (char **)cmd, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
         error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
-        return (int)NULL;
+        return -1;
     }
 
     while(got < nids){
@@ -665,7 +665,7 @@ static int openvzListDefinedDomains(virConnectPtr conn,
     ret = virExec(conn, (char **)cmd, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
         error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
-        return (int)NULL;
+        return -1;
     }
 
     while(got < nnames){