External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

build OpenVZ and LXC support by default, fix OpenVZ build

Browse Source 
* src/openvz_conf.c: fix compilation with new XPath interface
  signatures
* configure.in: build OpenVZ and LXC support by default
Daniel
This commit is contained in:
Daniel Veillard 2008-07-29 08:42:56 +00:00
parent 996933bbcd
commit 4779e0bcb2
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 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: * src/domain_conf.[ch] src/openvz_conf.[ch] src/openvz_driver.c:

4
configure.in
View File

@ -144,9 +144,9 @@ AC_ARG_WITH([xen],
AC_ARG_WITH([qemu], AC_ARG_WITH([qemu],
[ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes]) [ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes])
AC_ARG_WITH([openvz], 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], 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], AC_ARG_WITH([test],
[ --with-test add test driver support (on)],[],[with_test=yes]) [ --with-test add test driver support (on)],[],[with_test=yes])
AC_ARG_WITH([remote], AC_ARG_WITH([remote],

10
src/openvz_conf.c
View File

@ -310,7 +310,8 @@ static int openvzParseDomainFS(virConnectPtr conn,
xmlNodePtr *nodes = NULL; 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, openvzError(conn, VIR_ERR_INTERNAL_ERROR,
_("missing filesystem tag")); _("missing filesystem tag"));
goto error; goto error;
@ -442,7 +443,7 @@ static struct openvz_vm_def
obj = NULL; obj = NULL;
/* Extract domain uuid */ /* Extract domain uuid */
prop = virXPathString("string(./uuid[1])", ctxt); prop = virXPathString(conn, "string(./uuid[1])", ctxt);
if (!prop) { if (!prop) {
int err; int err;
if ((err = virUUIDGenerate(def->uuid))) { if ((err = virUUIDGenerate(def->uuid))) {
@ -461,7 +462,7 @@ static struct openvz_vm_def
} }
/* extract virtual CPUs */ /* 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 def->vcpus = 0; //use default CPUs count
/* Extract filesystem info */ /* Extract filesystem info */
@ -472,7 +473,8 @@ static struct openvz_vm_def
} }
/* analysis of the network devices */ /* 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, openvzError(conn, VIR_ERR_INTERNAL_ERROR,
"%s", _("cannot extract network devices")); "%s", _("cannot extract network devices"));
goto bail_out; goto bail_out;