- Devel - libvirt List Archives

[libvirt] [PATCH] utils: More useful error message for hook script failure
by Osier Yang 29 Jul '11

29 Jul '11

Commit 3709a386 ported hooks codes to new command execution API, together with the useful error message removed. Though we can't get "errbuf" from the new command execution API anymore, still we can give a more useful error. https://bugzilla.redhat.com/show_bug.cgi?id=726398 --- src/util/hooks.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/util/hooks.c b/src/util/hooks.c index 64adfcb..00f3a01 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -193,6 +193,7 @@ int virHookCall(int driver, const char *id, int op, int sub_op, const char *extra, const char *input) { int ret; + int exitstatus; char *path; virCommandPtr cmd; const char *drvstr; @@ -257,7 +258,13 @@ virHookCall(int driver, const char *id, int op, int sub_op, const char *extra, if (input) virCommandSetInputBuffer(cmd, input); - ret = virCommandRun(cmd, NULL); + ret = virCommandRun(cmd, &exitstatus); + if (exitstatus != 0) { + virHookReportError(VIR_ERR_HOOK_SCRIPT_FAILED, + _("Hook script %s %s failed with error code %d"), + path, drvstr, exitstatus); + ret = -1; + } virCommandFree(cmd); -- 1.7.6

3 3

[libvirt] [PATCHv2 1/2] maint: add missing copyright notices
by Eric Blake 29 Jul '11

29 Jul '11

I went with the shorter license notice used by src/libvirt.c, rather than spelling out the full LGPLv2+ clause into each of these files. * configure.ac: Declare copyright. * all Makefile.am: Likewise. --- Noticed while reviewing Matthias' patch. Almost trivial enough to push in isolation, but I'll wait for the review. Makefile.am | 3 +++ configure.ac | 3 +++ daemon/Makefile.am | 3 +++ docs/Makefile.am | 4 ++++ docs/schemas/Makefile.am | 3 ++- examples/apparmor/Makefile.am | 3 +++ examples/domain-events/events-c/Makefile.am | 3 +++ examples/dominfo/Makefile.am | 2 ++ examples/domsuspend/Makefile.am | 2 ++ examples/hellolibvirt/Makefile.am | 3 +++ examples/openauth/Makefile.am | 3 +++ examples/python/Makefile.am | 3 +++ examples/systemtap/Makefile.am | 2 ++ examples/xml/nwfilter/Makefile.am | 2 ++ include/Makefile.am | 4 ++++ include/libvirt/Makefile.am | 3 +++ python/Makefile.am | 3 +++ python/tests/Makefile.am | 3 +++ src/Makefile.am | 3 +++ tests/Makefile.am | 3 +++ tools/Makefile.am | 2 ++ 21 files changed, 59 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 49e42bf..75cff8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + LCOV = lcov GENHTML = genhtml diff --git a/configure.ac b/configure.ac index ac34efc..36037e5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,8 @@ dnl Process this file with autoconf to produce a configure script. +dnl Copyright (C) 2005-2011 Red Hat, Inc. +dnl See COPYING.LIB for the License of this software + AC_INIT([libvirt], [0.9.3], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 63c731e..65ac8e9 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + CLEANFILES = DAEMON_GENERATED = \ diff --git a/docs/Makefile.am b/docs/Makefile.am index de649fe..50a199f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,8 @@ ## Process this file with automake to produce Makefile.in + +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SUBDIRS= schemas PERL = perl diff --git a/docs/schemas/Makefile.am b/docs/schemas/Makefile.am index 75a0e73..596c207 100644 --- a/docs/schemas/Makefile.am +++ b/docs/schemas/Makefile.am @@ -1,4 +1,5 @@ - +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software schemadir = $(pkgdatadir)/schemas schema_DATA = \ diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am index b72bbe1..0bc66ac 100644 --- a/examples/apparmor/Makefile.am +++ b/examples/apparmor/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + EXTRA_DIST= \ TEMPLATE \ libvirt-qemu \ diff --git a/examples/domain-events/events-c/Makefile.am b/examples/domain-events/events-c/Makefile.am index 176892b..2bcbca0 100644 --- a/examples/domain-events/events-c/Makefile.am +++ b/examples/domain-events/events-c/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib noinst_PROGRAMS = event-test diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am index 678de68..07982b0 100644 --- a/examples/dominfo/Makefile.am +++ b/examples/dominfo/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am index 2c277a4..fc5e931 100644 --- a/examples/domsuspend/Makefile.am +++ b/examples/domsuspend/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am index 8d108a7..a55fe19 100644 --- a/examples/hellolibvirt/Makefile.am +++ b/examples/hellolibvirt/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = hellolibvirt hellolibvirt_CFLAGS = $(WARN_CFLAGS) diff --git a/examples/openauth/Makefile.am b/examples/openauth/Makefile.am index 279a032..844b572 100644 --- a/examples/openauth/Makefile.am +++ b/examples/openauth/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_PROGRAMS = openauth openauth_CFLAGS = $(WARN_CFLAGS) diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am index dcd2c24..d782a28 100644 --- a/examples/python/Makefile.am +++ b/examples/python/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + EXTRA_DIST= \ README \ dominfo.py domrestore.py domsave.py domstart.py esxlist.py diff --git a/examples/systemtap/Makefile.am b/examples/systemtap/Makefile.am index 084081e..6eb0546 100644 --- a/examples/systemtap/Makefile.am +++ b/examples/systemtap/Makefile.am @@ -1,2 +1,4 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software EXTRA_DIST = client.stp diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index 439e7b8..23fd753 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software FILTERS = \ allow-arp.xml \ diff --git a/include/Makefile.am b/include/Makefile.am index d075971..426762c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,6 @@ ## Process this file with automake to produce Makefile.in + +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SUBDIRS=libvirt diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am index b2c2b76..8f36ae8 100644 --- a/include/libvirt/Makefile.am +++ b/include/libvirt/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + virincdir = $(includedir)/libvirt virinc_HEADERS = libvirt.h \ diff --git a/python/Makefile.am b/python/Makefile.am index 51f005d..0e14d23 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,5 +1,8 @@ # Makefile for libvirt python library +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SUBDIRS= . tests INCLUDES = \ diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 28e24ba..2a5bc62 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -1,3 +1,6 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + EXAMPLE_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION)/examples PYTESTS= \ diff --git a/src/Makefile.am b/src/Makefile.am index 46b92a8..00307fa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them diff --git a/tests/Makefile.am b/tests/Makefile.am index 872aa22..1560ac1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software + SHELL = $(PREFERABLY_POSIX_SHELL) INCLUDES = \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 62c275e..66d4ed2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2005-2011 Red Hat, Inc. +## See COPYING.LIB for the License of this software POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" -- 1.7.4.4

3 5

[libvirt] ANNOUNCE: ruby-libvirt 0.4.0
by Chris Lalancette 29 Jul '11

29 Jul '11

All, I'm pleased to announce the release of ruby-libvirt 0.4.0. ruby-libvirt is a ruby wrapper around the libvirt API. Version 0.4.0 brings new APIs, more documentation, and bugfixes: * Updated Domain class, implementing dom.memory_parameters=, dom.memory_parameters, dom.updated?, dom.migrate2, dom.migrate_to_uri2, dom.migrate_set_max_speed, dom.qemu_monitor_command, dom.blkio_parameters, dom.blkio_parameters=, dom.state, dom.open_console, dom.screenshot, and dom.inject_nmi * Implementation of the Stream class, which covers the libvirt virStream APIs * Add the ability to build against non-system libvirt libraries * Updated Error object, which now includes the libvirt code, component and level of the error, as well as all of the error constants from libvirt.h * Updated Connect class, implementing conn.sys_info, conn.stream, conn.interface_change_begin, conn.interface_change_commit, and conn.interface_change_rollback * Updated StorageVol class, implementing vol.download and vol.upload * Various bugfixes Version 0.4.0 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.4.0.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.4.0.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalance(a)redhat.com) and/or the libvirt mailing list. -- Chris Lalancette

1 0

[libvirt] [PATCH] freebsd: Avoid /bin/true in commandtest
by Matthias Bolte 29 Jul '11

29 Jul '11

Rely on PATH and use just true, because on FreeBSD it's /usr/bin/true. --- tests/commanddata/test16.log | 2 +- tests/commandtest.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/commanddata/test16.log b/tests/commanddata/test16.log index 2433a4d..7088165 100644 --- a/tests/commanddata/test16.log +++ b/tests/commanddata/test16.log @@ -1 +1 @@ -A=B /bin/true C +A=B true C diff --git a/tests/commandtest.c b/tests/commandtest.c index 2e800ae..9ba53b8 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -566,9 +566,9 @@ cleanup: */ static int test16(const void *unused ATTRIBUTE_UNUSED) { - virCommandPtr cmd = virCommandNew("/bin/true"); + virCommandPtr cmd = virCommandNew("true"); char *outactual = NULL; - const char *outexpect = "A=B /bin/true C"; + const char *outexpect = "A=B true C"; int ret = -1; int fd = -1; @@ -610,7 +610,7 @@ cleanup: */ static int test17(const void *unused ATTRIBUTE_UNUSED) { - virCommandPtr cmd = virCommandNew("/bin/true"); + virCommandPtr cmd = virCommandNew("true"); int ret = -1; char *outbuf; char *errbuf; -- 1.7.4.1

2 2

[libvirt] [PATCH] tests: Unify style of test skipping code
by Matthias Bolte 29 Jul '11

29 Jul '11

Prefer 'return EXIT_AM_SKIP' over 'exit(EXIT_AM_SKIP)'. Prefer 'int main(void)' over 'int main(int argc, char **argv)'. Fix mymain signature in commandtest and nodeinfotest. --- tests/commandtest.c | 10 +++++----- tests/nodeinfotest.c | 10 +++++----- tests/qemuargv2xmltest.c | 6 +++++- tests/qemuxml2xmltest.c | 6 +++++- tests/virnettlscontexttest.c | 6 ++++-- tests/virshtest.c | 26 +++++++++++++++++--------- 6 files changed, 41 insertions(+), 23 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index ef2850d..2e800ae 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -38,10 +38,10 @@ #ifdef WIN32 -static int -mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) +int +main(void) { - exit (EXIT_AM_SKIP); + return EXIT_AM_SKIP; } #else @@ -814,6 +814,6 @@ mymain(void) return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -#endif /* !WIN32 */ - VIRT_TEST_MAIN(mymain) + +#endif /* !WIN32 */ diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 5abee92..448e072 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -15,10 +15,10 @@ defined(__amd64__) || \ defined(__i386__))) -static int -mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) +int +main(void) { - exit (EXIT_AM_SKIP); + return EXIT_AM_SKIP; } #else @@ -130,6 +130,6 @@ mymain(void) return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -#endif /* __linux__ */ - VIRT_TEST_MAIN(mymain) + +#endif /* __linux__ */ diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index bade95d..c2b6cf2 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -239,6 +239,10 @@ VIRT_TEST_MAIN(mymain) #else -int main (void) { return (EXIT_AM_SKIP); } +int +main(void) +{ + return EXIT_AM_SKIP; +} #endif /* WITH_QEMU */ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f1900c5..461fd0d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -204,6 +204,10 @@ VIRT_TEST_MAIN(mymain) #else -int main (void) { exit (EXIT_AM_SKIP); } +int +main(void) +{ + return EXIT_AM_SKIP; +} #endif /* WITH_QEMU */ diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 12ecf1e..520b006 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -1249,9 +1249,11 @@ mymain(void) VIRT_TEST_MAIN(mymain) #else + int -main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) +main(void) { - exit (EXIT_AM_SKIP); + return EXIT_AM_SKIP; } + #endif diff --git a/tests/virshtest.c b/tests/virshtest.c index e22e582..de5138c 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -9,7 +9,17 @@ #include "util.h" #include "testutils.h" -#define DOM_UUID "ef861801-45b9-11cb-88e3-afbfe5370493" +#ifdef WIN32 + +int +main(void) +{ + return EXIT_AM_SKIP; +} + +#else + +# define DOM_UUID "ef861801-45b9-11cb-88e3-afbfe5370493" static const char *dominfo_fc4 = "\ Id: 2\n\ @@ -71,13 +81,13 @@ cleanup: return result; } -#define VIRSH_DEFAULT "../tools/virsh", \ +# define VIRSH_DEFAULT "../tools/virsh", \ "--connect", \ "test:///default" static char *custom_uri; -#define VIRSH_CUSTOM "../tools/virsh", \ +# define VIRSH_CUSTOM "../tools/virsh", \ "--connect", \ custom_uri @@ -224,10 +234,6 @@ mymain(void) { int ret = 0; -#ifdef WIN32 - exit (EXIT_AM_SKIP); -#endif - if (virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.xml", abs_srcdir) < 0) return EXIT_FAILURE; @@ -298,7 +304,7 @@ mymain(void) /* It's a bit awkward listing result before argument, but that's a * limitation of C99 vararg macros. */ -#define DO_TEST(i, result, ...) \ +# define DO_TEST(i, result, ...) \ do { \ const char *myargv[] = { VIRSH_DEFAULT, __VA_ARGS__, NULL }; \ const struct testInfo info = { myargv, result }; \ @@ -380,10 +386,12 @@ mymain(void) DO_TEST(30, "--shell a\n", "echo \t '-'\"-\" \t --shell \t a"); -#undef DO_TEST +# undef DO_TEST free(custom_uri); return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } VIRT_TEST_MAIN(mymain) + +#endif /* WIN32 */ -- 1.7.4.1

2 2

[libvirt] [PATCH 0/4] xen callback cleanups
by Eric Blake 28 Jul '11

28 Jul '11

Noticed because of the recent xen break in commit 1edf5cc5 (fixed in 934fdcb3), which broke because it touched too many files, rather than focusing on just xen_driver.c. Renaming all xen callback structs makes it easier to grep for use of the callback structs, which in turn makes it easier to see what still remains in the goal of getting rid of the callback struct. And using C99 initialization syntax makes it less likely that future patches will needlessly try to patch too many files. Eric Blake (4): xen: cleanup callback struct xen: reduce callback special cases xen: make direct call when there is only one subdriver xen: drop unused callbacks src/xen/xen_driver.c | 186 ++++++++++++++++++---------------------------- src/xen/xen_driver.h | 63 ++++++---------- src/xen/xen_hypervisor.c | 52 ++++---------- src/xen/xen_inotify.c | 39 +---------- src/xen/xend_internal.c | 68 +++++++---------- src/xen/xend_internal.h | 6 ++ src/xen/xm_internal.c | 51 +++---------- src/xen/xs_internal.c | 45 ++---------- 8 files changed, 167 insertions(+), 343 deletions(-) -- 1.7.4.4

2 11

[libvirt] libvirt-0.9.3 and qemu-0.14.1
by Zdenek Styblik 28 Jul '11

28 Jul '11

Hello, I'm not sure if this has been reported or fixed, but ... ~~~ SNIP ~~~ 21:02:59.981: 13171: info : libvirt version: 0.9.3 21:02:59.981: 13171: error : virCommandWait:1957 : internal error Child process (LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root /usr/bin/qemu-kvm -help) status unexpected: exit status 1 21:02:59.986: 13171: error : virCommandWait:1957 : internal error Child process (LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root /usr/bin/qemu-kvm -help) status unexpected: exit status 1 21:02:59.988: 13171: error : virDomainDefParseXML:6069 : unknown OS type hvm ~~~ SNIP ~~~ qemu-0.14.1 and libvirt-0.9.3 What am I missing here? Thanks, Z. -- Zdenek Styblik email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

1 1

[libvirt] [PATCH] freebsd: Fix build problem due to picking up the wrong libvirt.h
by Matthias Bolte 28 Jul '11

28 Jul '11

AM_GNU_GETTEXT calls AM_ICONV_LINK. AM_ICONV_LINK saves and alters CPPFLAGS, but doesn't restore it when it finds libiconv. This results in /usr/local/include ending up in the gcc command line before the include path for the local include directory. This makes gcc pick a previous installed libvirt.h instead of the correct one from the source tree. Workaround this problem by saving and restoring CPPFLAGS around the AM_GNU_GETTEXT call. --- configure.ac | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index b2ba930..8f46dbd 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,8 +2011,16 @@ dnl Enable building libvirtd? AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"]) dnl Check for gettext - don't go any newer than what RHEL 5 supports +dnl +dnl save and restore CPPFLAGS around gettext check as the internal iconv +dnl check might leave -I/usr/local/include in CPPFLAGS on FreeBSD resulting +dnl in the build picking up previously installed libvirt/libvirt.h instead +dnl of the correct one from the soucre tree + +save_CPPFLAGS="$CPPFLAGS" AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) +CPPFLAGS="$save_CPPFLAGS" ALL_LINGUAS=`cd "$srcdir/po" > /dev/null && ls *.po | sed 's+\.po$++'` -- 1.7.0.4

2 6

[libvirt] [PATCH v4] virsh: avoid missing zero value judgement in cmdBlkiotune
by ajia＠redhat.com 28 Jul '11

28 Jul '11

* tools/virsh.c: fix missing zero value judgement in cmdBlkiotune and correct vshError information. when weight is equal to 0, the cmdBlkiotune will not raise any error information when judge weight value first time, and execute else branch to judge weight value again, strncpy(temp->field, VIR_DOMAIN_BLKIO_WEIGHT, sizeof(temp->field)) will be not executed for ever. However, if and only if param->field is equal to VIR_DOMAIN_BLKIO_WEIGHT, underlying qemuDomainSetBlkioParameters function will check whether weight value is in range [100, 1000]. * how to reproduce? % virsh blkiotune ${guestname} --weight 0 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8bd22dc..feb45de 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4004,6 +4004,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) virDomainPtr dom; int weight = 0; int nparams = 0; + int rv = 0; unsigned int i = 0; virTypedParameterPtr params = NULL, temp = NULL; bool ret = false; @@ -4031,15 +4032,15 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(cmd, "weight", &weight) < 0) { + if ((rv = vshCommandOptInt(cmd, "weight", &weight)) < 0) { vshError(ctl, "%s", - _("Unable to parse integer parameter")); + _("Unable to parse non-integer parameter")); goto cleanup; } - if (weight) { + if (rv > 0) { nparams++; - if (weight < 0) { + if (weight <= 0) { vshError(ctl, _("Invalid value of %d for I/O weight"), weight); goto cleanup; } -- 1.7.1

4 4

[libvirt] [PATCH] qemu: fix nested job with driver lock held
by Eric Blake 28 Jul '11

28 Jul '11

qemuMigrationUpdateJobStatus (called in a loop by migration and save tasks) uses qemuDomainObjEnterMonitorWithDriver; however, that function ended up starting a nested job without releasing the driver. Since no one else is making nested calls, we can inline the internal functions to properly track driver_locked. * src/qemu/qemu_domain.h (qemuDomainObjBeginNestedJob) (qemuDomainObjBeginNestedJobWithDriver) (qemuDomainObjEndNestedJob): Drop unused prototypes. * src/qemu/qemu_domain.c (qemuDomainObjEnterMonitorInternal): Reflect driver lock to nested job. (qemuDomainObjBeginNestedJob) (qemuDomainObjBeginNestedJobWithDriver) (qemuDomainObjEndNestedJob): Drop unused functions. --- This does not solve the crash in 'virsh managedsave', but hopefully will make analysis easier in finding where we are freeing the monitor too early when probing to see if outgoing migration is completed. src/qemu/qemu_domain.c | 59 +++++++++++------------------------------------ src/qemu/qemu_domain.h | 9 ------- 2 files changed, 14 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fe88ce3..2eaaf3a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -832,31 +832,6 @@ int qemuDomainObjBeginAsyncJobWithDriver(struct qemud_driver *driver, } /* - * Use this to protect monitor sections within active async job. - * - * The caller must call qemuDomainObjBeginAsyncJob{,WithDriver} before it can - * use this method. Never use this method if you only own non-async job, use - * qemuDomainObjBeginJob{,WithDriver} instead. - */ -int -qemuDomainObjBeginNestedJob(struct qemud_driver *driver, - virDomainObjPtr obj) -{ - return qemuDomainObjBeginJobInternal(driver, false, obj, - QEMU_JOB_ASYNC_NESTED, - QEMU_ASYNC_JOB_NONE); -} - -int -qemuDomainObjBeginNestedJobWithDriver(struct qemud_driver *driver, - virDomainObjPtr obj) -{ - return qemuDomainObjBeginJobInternal(driver, true, obj, - QEMU_JOB_ASYNC_NESTED, - QEMU_ASYNC_JOB_NONE); -} - -/* * obj must be locked before calling, qemud_driver does not matter * * To be called after completing the work associated with the @@ -888,21 +863,6 @@ qemuDomainObjEndAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) return virDomainObjUnref(obj); } -void -qemuDomainObjEndNestedJob(struct qemud_driver *driver, virDomainObjPtr obj) -{ - qemuDomainObjPrivatePtr priv = obj->privateData; - - qemuDomainObjResetJob(priv); - qemuDomainObjSaveJob(driver, obj); - virCondSignal(&priv->job.cond); - - /* safe to ignore since the surrounding async job increased the reference - * counter as well */ - ignore_value(virDomainObjUnref(obj)); -} - - static int ATTRIBUTE_NONNULL(1) qemuDomainObjEnterMonitorInternal(struct qemud_driver *driver, bool driver_locked, @@ -911,7 +871,9 @@ qemuDomainObjEnterMonitorInternal(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = obj->privateData; if (priv->job.active == QEMU_JOB_NONE && priv->job.asyncJob) { - if (qemuDomainObjBeginNestedJob(driver, obj) < 0) + if (qemuDomainObjBeginJobInternal(driver, driver_locked, obj, + QEMU_JOB_ASYNC_NESTED, + QEMU_ASYNC_JOB_NONE) < 0) return -1; if (!virDomainObjIsActive(obj)) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -952,8 +914,15 @@ qemuDomainObjExitMonitorInternal(struct qemud_driver *driver, priv->mon = NULL; } - if (priv->job.active == QEMU_JOB_ASYNC_NESTED) - qemuDomainObjEndNestedJob(driver, obj); + if (priv->job.active == QEMU_JOB_ASYNC_NESTED) { + qemuDomainObjResetJob(priv); + qemuDomainObjSaveJob(driver, obj); + virCondSignal(&priv->job.cond); + + /* safe to ignore since the surrounding async job increased + * the reference counter as well */ + ignore_value(virDomainObjUnref(obj)); + } } /* @@ -962,7 +931,7 @@ qemuDomainObjExitMonitorInternal(struct qemud_driver *driver, * To be called immediately before any QEMU monitor API call * Must have already either called qemuDomainObjBeginJob() and checked * that the VM is still active or called qemuDomainObjBeginAsyncJob, in which - * case this will call qemuDomainObjBeginNestedJob. + * case this will start a nested job. * * To be followed with qemuDomainObjExitMonitor() once complete */ @@ -988,7 +957,7 @@ void qemuDomainObjExitMonitor(struct qemud_driver *driver, * To be called immediately before any QEMU monitor API call * Must have already either called qemuDomainObjBeginJobWithDriver() and * checked that the VM is still active or called qemuDomainObjBeginAsyncJob, - * in which case this will call qemuDomainObjBeginNestedJobWithDriver. + * in which case this will start a nested job. * * To be followed with qemuDomainObjExitMonitorWithDriver() once complete */ diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 679259f..8bff8b0 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -143,9 +143,6 @@ int qemuDomainObjBeginAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj, enum qemuDomainAsyncJob asyncJob) ATTRIBUTE_RETURN_CHECK; -int qemuDomainObjBeginNestedJob(struct qemud_driver *driver, - virDomainObjPtr obj) - ATTRIBUTE_RETURN_CHECK; int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver, virDomainObjPtr obj, enum qemuDomainJob job) @@ -154,9 +151,6 @@ int qemuDomainObjBeginAsyncJobWithDriver(struct qemud_driver *driver, virDomainObjPtr obj, enum qemuDomainAsyncJob asyncJob) ATTRIBUTE_RETURN_CHECK; -int qemuDomainObjBeginNestedJobWithDriver(struct qemud_driver *driver, - virDomainObjPtr obj) - ATTRIBUTE_RETURN_CHECK; int qemuDomainObjEndJob(struct qemud_driver *driver, virDomainObjPtr obj) @@ -164,9 +158,6 @@ int qemuDomainObjEndJob(struct qemud_driver *driver, int qemuDomainObjEndAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; -void qemuDomainObjEndNestedJob(struct qemud_driver *driver, - virDomainObjPtr obj); - void qemuDomainObjSetJobPhase(struct qemud_driver *driver, virDomainObjPtr obj, int phase); -- 1.7.4.4

2 2