build OpenVZ and LXC support by default, fix OpenVZ build

* src/openvz_conf.c: fix compilation with new XPath interface
  signatures
* configure.in: build OpenVZ and LXC support by default
Daniel

diff --git a/ChangeLog b/ChangeLog
index b06392fe112b71ef5d06ad7f6bddd9d7c7983abc..24f38112b2d9f5f46303d0bbe3e44d4f3dc938e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 29 10:41:30 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+       * src/openvz_conf.c: fix compilation with new XPath interface
+         signatures
+       * configure.in: build OpenVZ and LXC support by default
+
 Mon Jul 28 16:04:58 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * src/domain_conf.[ch] src/openvz_conf.[ch] src/openvz_driver.c:

diff --git a/configure.in b/configure.in
index 8e04f14131cf68de6eee6eadd05c5704ea8a5d41..14dd776562617e3b67bc6a681061910013f74bbf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -144,9 +144,9 @@ AC_ARG_WITH([xen],
 AC_ARG_WITH([qemu],
 [  --with-qemu             add QEMU/KVM support (on)],[],[with_qemu=yes])
 AC_ARG_WITH([openvz],
-[  --with-openvz           add OpenVZ support (off)],[],[with_openvz=no])
+[  --with-openvz           add OpenVZ support (on)],[],[with_openvz=yes])
 AC_ARG_WITH([lxc],
-[  --with-lxc              add Linux Container support (off)],[],[with_lxc=no])
+[  --with-lxc              add Linux Container support (on)],[],[with_lxc=yes])
 AC_ARG_WITH([test],
 [  --with-test             add test driver support (on)],[],[with_test=yes])
 AC_ARG_WITH([remote],

diff --git a/src/openvz_conf.c b/src/openvz_conf.c
index 6b4dda01965a5ab22884c4981267a55d6bc92570..45de36b806b0bafcf25c503adad5333559a77a3d 100644 (file)
--- a/src/openvz_conf.c
+++ b/src/openvz_conf.c
@@ -310,7 +310,8 @@ static int openvzParseDomainFS(virConnectPtr conn,
     xmlNodePtr *nodes = NULL;
 
 
-    if ((n = virXPathNodeSet("/domain/devices/filesystem", ctxt, &nodes)) < 0) {
+    if ((n = virXPathNodeSet(conn, "/domain/devices/filesystem",
+                             ctxt, &nodes)) < 0) {
         openvzError(conn, VIR_ERR_INTERNAL_ERROR,
                                    _("missing filesystem tag"));
         goto error;
@@ -442,7 +443,7 @@ static struct openvz_vm_def
     obj = NULL;
 
     /* Extract domain uuid */
-    prop = virXPathString("string(./uuid[1])", ctxt);
+    prop = virXPathString(conn, "string(./uuid[1])", ctxt);
     if (!prop) {
         int err;
         if ((err = virUUIDGenerate(def->uuid))) {
@@ -461,7 +462,7 @@ static struct openvz_vm_def
     }
 
     /* extract virtual CPUs */
-    if (virXPathULong("string(./vcpu[1])", ctxt, &def->vcpus) < 0)
+    if (virXPathULong(conn, "string(./vcpu[1])", ctxt, &def->vcpus) < 0)
         def->vcpus = 0; //use default CPUs count
 
     /* Extract filesystem info */
@@ -472,7 +473,8 @@ static struct openvz_vm_def
     }
 
     /* analysis of the network devices */
-    if ((n = virXPathNodeSet("/domain/devices/interface", ctxt, &nodes)) < 0) {
+    if ((n = virXPathNodeSet(conn, "/domain/devices/interface",
+                             ctxt, &nodes)) < 0) {
         openvzError(conn, VIR_ERR_INTERNAL_ERROR,
                              "%s", _("cannot extract network devices"));
         goto bail_out;