- Devel - libvirt List Archives

[libvirt] PATCH: Autostart for Xen domains < 3.0.4
by Daniel P. Berrange 25 Nov '08

25 Nov '08

The old 'xm' driver does not currently implement the autostart feature for domains managed via /etc/xen. This patche addresses that limitation by making it create the symlinks in /etc/xen/auto as expected by the existing 'xendomains' init script for autostart. Daniel diff -r dddbb717add4 src/xen_unified.c --- a/src/xen_unified.c Mon Nov 24 10:45:05 2008 -0500 +++ b/src/xen_unified.c Mon Nov 24 11:00:24 2008 -0500 @@ -1159,13 +1159,16 @@ xenUnifiedDomainGetAutostart (virDomainP xenUnifiedDomainGetAutostart (virDomainPtr dom, int *autostart) { GET_PRIVATE(dom->conn); - int i; - - for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) - if (priv->opened[i] && drivers[i]->domainGetAutostart && - drivers[i]->domainGetAutostart (dom, autostart) == 0) - return 0; - + + if (priv->xendConfigVersion < 3) { + if (priv->opened[XEN_UNIFIED_XM_OFFSET]) + return xenXMDomainGetAutostart(dom, autostart); + } else { + if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) + return xenDaemonDomainGetAutostart(dom, autostart); + } + + xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1173,13 +1176,16 @@ xenUnifiedDomainSetAutostart (virDomainP xenUnifiedDomainSetAutostart (virDomainPtr dom, int autostart) { GET_PRIVATE(dom->conn); - int i; - - for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) - if (priv->opened[i] && drivers[i]->domainSetAutostart && - drivers[i]->domainSetAutostart (dom, autostart) == 0) - return 0; - + + if (priv->xendConfigVersion < 3) { + if (priv->opened[XEN_UNIFIED_XM_OFFSET]) + return xenXMDomainSetAutostart(dom, autostart); + } else { + if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) + return xenDaemonDomainSetAutostart(dom, autostart); + } + + xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } diff -r dddbb717add4 src/xm_internal.c --- a/src/xm_internal.c Mon Nov 24 10:45:05 2008 -0500 +++ b/src/xm_internal.c Mon Nov 24 11:02:16 2008 -0500 @@ -2669,3 +2669,84 @@ xenXMDomainBlockPeek (virDomainPtr dom, return -1; } + +static char *xenXMAutostartLinkName(virDomainPtr dom) +{ + char *ret; + if (asprintf(&ret, "/etc/xen/auto/%s", dom->name) < 0) + return NULL; + return ret; +} + +static char *xenXMDomainConfigName(virDomainPtr dom) +{ + char *ret; + if (asprintf(&ret, "/etc/xen/%s", dom->name) < 0) + return NULL; + return ret; +} + +int xenXMDomainGetAutostart(virDomainPtr dom, int *autostart) +{ + char *linkname = xenXMAutostartLinkName(dom); + char *config = xenXMDomainConfigName(dom); + int ret = -1; + + if (!linkname || !config) { + xenXMError(dom->conn, VIR_ERR_NO_MEMORY, NULL); + goto cleanup; + } + + *autostart = virFileLinkPointsTo(linkname, config); + if (*autostart < 0) { + xenXMError(dom->conn, VIR_ERR_INTERNAL_ERROR, + _("failed to check autostart link %s: %s"), + linkname, strerror(errno)); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(linkname); + VIR_FREE(config); + return ret; +} + + +int xenXMDomainSetAutostart(virDomainPtr dom, int autostart) +{ + char *linkname = xenXMAutostartLinkName(dom); + char *config = xenXMDomainConfigName(dom); + int ret = -1; + + if (!linkname || !config) { + xenXMError(dom->conn, VIR_ERR_NO_MEMORY, NULL); + goto cleanup; + } + + if (autostart) { + if (symlink(config, linkname) < 0 && + errno != EEXIST) { + xenXMError(dom->conn, VIR_ERR_INTERNAL_ERROR, + "failed to create link %s: %s", + linkname, strerror(errno)); + goto cleanup; + } + } else { + if (unlink(linkname) < 0 && + errno != ENOENT) { + xenXMError(dom->conn, VIR_ERR_INTERNAL_ERROR, + "failed to remove link %s: %s", + linkname, strerror(errno)); + goto cleanup; + } + } + ret = 0; + +cleanup: + VIR_FREE(linkname); + VIR_FREE(config); + + return ret; +} diff -r dddbb717add4 src/xm_internal.h --- a/src/xm_internal.h Mon Nov 24 10:45:05 2008 -0500 +++ b/src/xm_internal.h Mon Nov 24 10:59:24 2008 -0500 @@ -65,4 +65,7 @@ virDomainDefPtr xenXMDomainConfigParse(v int xenXMDomainBlockPeek (virDomainPtr dom, const char *path, unsigned long long offset, size_t size, void *buffer); +int xenXMDomainGetAutostart(virDomainPtr dom, int *autostart); +int xenXMDomainSetAutostart(virDomainPtr dom, int autostart); + #endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] PATCH: Fix node device build on mingw32
by Daniel P. Berrange 25 Nov '08

25 Nov '08

The node device XML configuration handling routines contain a struct member called 'interface'. This seems to clash with a some typedef or function in the Win32 header files, causing horrific compile failure. This patch simply renames 'interface' to 'ifname'. Index: src/node_device_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/node_device_conf.c,v retrieving revision 1.2 diff -r1.2 node_device_conf.c 272c272 < data->net.interface); --- > data->net.ifname); 377c377 < VIR_FREE(data->net.interface); --- > VIR_FREE(data->net.ifname); Index: src/node_device_conf.h =================================================================== RCS file: /data/cvs/libvirt/src/node_device_conf.h,v retrieving revision 1.3 diff -r1.3 node_device_conf.h 105c105 < char *interface; --- > char *ifname; Index: src/node_device_devkit.c =================================================================== RCS file: /data/cvs/libvirt/src/node_device_devkit.c,v retrieving revision 1.2 diff -r1.2 node_device_devkit.c 121c121 < const char *interface; --- > const char *ifname; 125,126c125,126 < interface = strrchr(sysfs_path, '/'); < if (!interface || !*interface || !*(++interface)) --- > ifname = strrchr(sysfs_path, '/'); > if (!ifname || !*ifname || !*(++ifname)) 128c128 < if ((d->net.interface = strdup(interface)) == NULL) --- > if ((d->net.ifname = strdup(ifname)) == NULL) Index: src/node_device_hal.c =================================================================== RCS file: /data/cvs/libvirt/src/node_device_hal.c,v retrieving revision 1.2 diff -r1.2 node_device_hal.c 199c199 < (void)get_str_prop(ctx, udi, "net.interface", &d->net.interface); --- > (void)get_str_prop(ctx, udi, "net.interface", &d->net.ifname); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] [PATCH] fix build for srcdir != builddir
by Guido Günther 25 Nov '08

25 Nov '08

Hi, libvirt_sym.version is looked for at the wrong location. O.k. to apply? Cheers, -- Guido

2 3

[libvirt] [PATCH] Xen Events Updated
by Ben Guthro 25 Nov '08

25 Nov '08

This version of the Xen-Events patch goes a step further than the last version, and now emits the following domain events: STARTED STOPPED ADDED REMOVED This is accomplished by monitoring /etc/xen, and taking advantage of what seemed to be dormant code in the XM driver. By re-enabling the "config cache", we can properly track domains when files come, and go into this directory. configure.in | 13 + include/libvirt/virterror.h | 1 po/POTFILES.in | 1 src/Makefile.am | 3 src/virterror.c | 3 src/xen_inotify.c | 270 +++++++++++++++++++++++++++ src/xen_inotify.h | 32 +++ src/xen_unified.c | 190 +++++++++++++++++++ src/xen_unified.h | 61 ++++++ src/xm_internal.c | 24 +- src/xs_internal.c | 430 +++++++++++++++++++++++++++++++++++++++++++- src/xs_internal.h | 51 +++++ 12 files changed, 1069 insertions(+), 10 deletions(-)

3 15

[libvirt] PATCH: allow to set nvcpus = 0
by Evgeniy Sokolov 25 Nov '08

25 Nov '08

OpenVZ uses all CPUs available in system - by default (number of CPUs did not set) - number of CPUs = 0 Currenty, libvirt don't allow to set nvcpus = 0. Attached patch removes limitation in libvirt set nvcpu = 0, but add it to each driver which allow to set number of virtual CPU. For OpenVZ set default number of CPUs = 0.

2 3

[libvirt] [PATCH] fix python events
by David Lively 25 Nov '08

25 Nov '08

This patch gets python events working again after upstream changes, and make the test implementation properly clean up after itself and implement the new EventImpl API properly. Note that the Python RemoveHandle and RemoveTimeout implementations should return the opaque object registered by the corresponding AddHandle/Timeout calls, in lieu of calling the (C) freefunc. (The binding code will then call freefunc if it's not NULL.) Ignoring this means you'll leak memory in the same way that C RemoveHandle/Timeout leak if they don't (now) call the freefunc. I also moved around some of the error checking code to unclutter (and speed up) the common code paths. For instance, we now check that the virRegisterEventImpl arguments are callable just once (and return failure if they're not), rather than checking them before every call and blithely ignoring them if they're not callable. Dave examples/domain-events/events-python/event-test.py | 29 +-- python/libvir.c | 200+++++++++++++++---- python/libvir.py | 4 python/libvirt_wrap.h | 8 python/types.c | 1 python/virConnect.py | 4 6 files changed, 194 insertions(+), 52 deletions(-)

3 10

[libvirt] [PATCH] libvirt.c: fix virStateActive return value; document ...
by Jim Meyering 25 Nov '08

25 Nov '08

The s/1/-1/ fix induces no semantic change, since the sole use of virStateActive tests solely for nonzero. >From 4bc9713207a2ed6b101e2067f7bba82d1df45987 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 24 Nov 2008 15:52:55 +0100 Subject: [PATCH] libvirt.c: fix virStateActive return value; document some new functions * src/libvirt.c (virStateActive): Return -1 upon error, not 1, to be consistent with the other virState* functions. (virStateActive, virStateCleanup, virStateReload, virStateActive): Add per-function comments. --- src/libvirt.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f445333..10835b9 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -636,6 +636,13 @@ virRegisterStateDriver(virStateDriverPtr driver) return virStateDriverTabCount++; } +/** + * virStateInitialize: + * + * Initialize all virtualization drivers. + * + * Return 0 if successful, -1 upon error. + */ int virStateInitialize(void) { int i, ret = 0; @@ -650,6 +657,13 @@ int virStateInitialize(void) { return ret; } +/** + * virStateCleanup: + * + * Run each virtualization driver's cleanup method. + * + * Return 0 if successful, -1 upon error. + */ int virStateCleanup(void) { int i, ret = 0; @@ -661,6 +675,13 @@ int virStateCleanup(void) { return ret; } +/** + * virStateReload + * + * Run each virtualization driver's reload method. + * + * Return 0 if successful, -1 upon error. + */ int virStateReload(void) { int i, ret = 0; @@ -672,13 +693,20 @@ int virStateReload(void) { return ret; } +/** + * virStateActive + * + * Run each virtualization driver's "active" method. + * + * Return 0 if successful, -1 upon error. + */ int virStateActive(void) { int i, ret = 0; for (i = 0 ; i < virStateDriverTabCount ; i++) { if (virStateDriverTab[i]->active && virStateDriverTab[i]->active()) - ret = 1; + ret = -1; } return ret; } -- 1.6.0.4.1021.g4320

3 5

[libvirt] [PATCH] fix --without-xen build
by David Lively 25 Nov '08

25 Nov '08

The last change to tests/Makefile.am broke the build when --without-xen is specified. This patch fixes it ... Dave tests/Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+)

3 5

[libvirt] [PATCH] * src/virterror.c (virReportErrorHelper): Sync doc to code.
by Jim Meyering 25 Nov '08

25 Nov '08

The dom and net parameters are long gone. Reflect s/msg/fmt/ renaming: >From 8b87344dbe31fe478ac4a679005835e03a329ace Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 24 Nov 2008 15:55:24 +0100 Subject: [PATCH] * src/virterror.c (virReportErrorHelper): Sync doc to code. --- src/virterror.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/virterror.c b/src/virterror.c index 0723db8..112a19e 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -747,17 +747,15 @@ virErrorMsg(virErrorNumber error, const char *info) } /** - * virReportErrorHelper + * virReportErrorHelper: * * @conn: the connection to the hypervisor if available - * @dom: the domain if available - * @net: the network if available * @domcode: the virErrorDomain indicating where it's coming from * @errcode: the virErrorNumber code for the error * @filename: Source file error is dispatched from * @funcname: Function error is dispatched from * @linenr: Line number error is dispatched from - * @msg: the message to display/transmit + * @fmt: the format string * @...: extra parameters for the message display * * Helper function to do most of the grunt work for individual driver -- 1.6.0.4.1021.g4320

2 1

[libvirt] [PATCH] tests: virsh-all: new script
by Jim Meyering 22 Nov '08

22 Nov '08

Actually, this was the first step. This tiny script merely invokes all commands blindly, solely to get test coverage, even if they (as most do) fail. Additional tests will be smarter about providing sensible arguments. >From 058681eab07936f4ecbb1ff514528eb921d27074 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 21 Nov 2008 10:18:43 +0100 Subject: [PATCH] tests: virsh-all: new script * tests/virsh-all: New script. * tests/Makefile.am (test_scripts): Add virsh-all. --- tests/Makefile.am | 1 + tests/virsh-all | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) create mode 100755 tests/virsh-all diff --git a/tests/Makefile.am b/tests/Makefile.am index bdbf927..0b4eebd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -57,6 +57,7 @@ test_scripts += \ read-non-seekable \ undefine \ vcpupin + virsh-all endif EXTRA_DIST += $(test_scripts) diff --git a/tests/virsh-all b/tests/virsh-all new file mode 100755 index 0000000..af7e09d --- /dev/null +++ b/tests/virsh-all @@ -0,0 +1,39 @@ +#!/bin/sh +# blindly run each and every command listed by "virsh help" + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if test "$VERBOSE" = yes; then + set -x + virsh --version +fi + +. $srcdir/test-lib.sh + +fail=0 + +test_url=test:///default + +virsh -c $test_url help > cmds || framework_failure +cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure +test -n "$cmds" || framework_failure + +for i in $cmds; do + echo testing $i... 1>&2 + virsh -c $test_url $i < /dev/null +done + +(exit $fail); exit $fail -- 1.6.0.4.1021.g4320

2 2