From 95675d4d7620e61c82fea948d8402d47b5b7b816 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 7 Jul 2008 11:48:40 +0000 Subject: [PATCH] Fix openvz build on x86_64 --- ChangeLog | 5 +++++ src/openvz_driver.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4f8ae39c7..3ec0650184 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 7 12:46:56 BST 2008 Daniel P. Berrange + + * 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 * tests/testutils.c: Remove bogus return statement which diff --git a/src/openvz_driver.c b/src/openvz_driver.c index 80e4ae5dd9..62f202eb28 100644 --- 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){