Fix misc compile warnings

diff --git a/ChangeLog b/ChangeLog
index 532782234a44417b0a63374e58e5f63e12b0a8b2..5d0c20009e5bbb98a8cc0f7805182a612a23558e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun 12 14:46:08 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/lxc_driver.c, src/openvz_driver.c: Add missing driver
+       entry points
+       * src/lxc_conf.c: Re-arrange headers to comply with standard
+       * tests/testutils.c: Fix use of signed/unsigned ints
+
 Thu Jun 12 14:46:08 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/qemu_driver.c: Fix saving of iptables rules

diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 33fa766bea0ec98fa35b2980c7568f7aad01eb72..dea3aff0ed31e55bba581709033cae033dbd5922 100644 (file)
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1202,6 +1202,8 @@ static virDriver lxcDriver = {
     NULL, /* domainMigrateFinish */
     NULL, /* domainBlockStats */
     NULL, /* domainInterfaceStats */
+    NULL, /* domainBlockPeek */
+    NULL, /* domainMemoryPeek */
     NULL, /* nodeGetCellsFreeMemory */
     NULL, /* getFreeMemory */
 };

diff --git a/src/openvz_conf.c b/src/openvz_conf.c
index 090c0a4fd5a7a06b0f86806c5093a1d890a0a94e..28c5ef3a219346dda37dfeabb2a217c9ef6d1f9a 100644 (file)
--- a/src/openvz_conf.c
+++ b/src/openvz_conf.c
@@ -41,13 +41,14 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
+#include <string.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #include <libxml/uri.h>
 
-#include "libvirt/virterror.h"
+#include "internal.h"
 
 #include "openvz_driver.h"
 #include "openvz_conf.h"
@@ -55,8 +56,6 @@
 #include "buf.h"
 #include "memory.h"
 
-#include <string.h>
-
 static char *openvzLocateConfDir(void);
 static void error (virConnectPtr conn, virErrorNumber code, const char *info);
 static struct openvz_vm_def *openvzParseXML(virConnectPtr conn, xmlDocPtr xml);

diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index a20438f091cb2c0e2f342ddd8ff1f9bc80117c24..80e4ae5dd9bcc045565964b30078cf29edb014ac 100644 (file)
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -761,6 +761,8 @@ static virDriver openvzDriver = {
     NULL, /* domainMigrateFinish */
     NULL, /* domainBlockStats */
     NULL, /* domainInterfaceStats */
+    NULL, /* domainBlockPeek */
+    NULL, /* domainMemoryPeek */
     NULL, /* nodeGetCellsFreeMemory */
     NULL, /* nodeGetFreeMemory */
 };
@@ -770,6 +772,7 @@ static virStateDriver openvzStateDriver = {
     openvzShutdown,
     openvzReload,
     openvzActive,
+    NULL, /* sigHandler */
 };
 
 int openvzRegister(void) {

diff --git a/tests/testutils.c b/tests/testutils.c
index d998d1fdf489c24a1064fb3dc94b49166985bc48..3a799d69506e108416af052338dc7b26ea263020 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -329,10 +329,7 @@ int virtTestMain(int argc,
     int oomCount;
 
     if ((debugStr = getenv("VIR_TEST_DEBUG")) != NULL) {
-        if (virStrToLong_i(debugStr, NULL, 10, &testDebug) < 0)
-            testDebug = 0;
-
-        if (testDebug < 0)
+        if (virStrToLong_ui(debugStr, NULL, 10, &testDebug) < 0)
             testDebug = 0;
     }