mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
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
This commit is contained in:
parent
996933bbcd
commit
4779e0bcb2
@ -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:
|
||||
|
@ -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],
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user