May 2012 - Devel - libvirt List Archives

[libvirt] [PATCH] lxc: return correct number of CPUs
by Martin Kletzander 30 May '12

30 May '12

When getting number of CPUs the host has assigned, there was always number "1" returned. Even though all lxc domains with no pinning launched by libvirt run on all pCPUs (by default, no matter what's the number), we should at least return the same number as the user specified when creating the domain. --- The bug addressed above will be managed later, because I believe this needs to be discussed first (we don't say that <vcpu> is not supported for lxc, but we are able to set only pinning, shares, not number of CPUs; due to using cgroups). The question will be: "Should we change the docs and ban it in the code or make some workaround for fixing it?" src/lxc/lxc_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9aea556..33b2774 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -590,7 +590,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, } info->maxMem = vm->def->mem.max_balloon; - info->nrVirtCpu = 1; + info->nrVirtCpu = vm->def->vcpus; ret = 0; cleanup: -- 1.7.8.6

2 2

[libvirt] serial console/events example script
by Dave Allan 30 May '12

30 May '12

Hi all, A while back I wrote the attached code to demonstrate how to use events and serial console to create a serial console that stays up even when the VM is down. Is it worth adding to the examples? It might need some work, as I am not terribly strong with Python. Dave

3 5

[libvirt] [PATCH] build: don't lose probes.o files
by Eric Blake 30 May '12

30 May '12

The previous patch fixed an incremental build, but missed that on a fresh checkout, we now have nothing requiring that stops make from nuking libvirt_qemu_probes.o. * src/Makefile.am ($(libvirt_driver_qemu_la_SOURCES)): Delete, since this variable is empty. (.PRECIOUS): Add %_probes.o, so they don't get nuked as an intermediate by-product after creating %_probes.lo. --- Pushing under the build-breaker rule; this time I've done more testing, including ./autobuild.sh on a fresh checkout (that died later on, due to the augeas issue mentioned here[1], but at least it got past the probes.o hangup). [1] https://www.redhat.com/archives/libvir-list/2012-May/msg01296.html src/Makefile.am | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 533e78a..c8efa5b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1294,8 +1294,6 @@ BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp if WITH_QEMU libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h - -$(libvirt_driver_qemu_la_SOURCES): libvirt_qemu_probes.h endif tapsetdir = $(datadir)/systemtap/tapset @@ -1304,6 +1302,7 @@ tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp %_probes.h: %_probes.d $(AM_V_GEN)$(DTRACE) -o $@ -h -s $< +.PRECIOUS: %_probes.o %_probes.o: %_probes.d $(AM_V_GEN)$(DTRACE) -o $@ -G -s $< -- 1.7.7.6

1 0

[libvirt] Compiling Error
by Alex Jia 30 May '12

30 May '12

Hi all, I met some compiling error since May 26: <snip> make[3]: Entering directory `/home/ajia/Workspace/libvirt/src' CCLD libvirt_driver_qemu.la libtool: link: `libvirt_qemu_probes.lo' is not a valid libtool object make[3]: *** [libvirt_driver_qemu.la] Error 1 make[3]: Leaving directory `/home/ajia/Workspace/libvirt/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/ajia/Workspace/libvirt/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/ajia/Workspace/libvirt' make: *** [all] Error 2 </snip> Some details: <snip> File `libvirt_driver_qemu.la' does not exist. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_agent.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_agent.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_command.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_conf.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_domain.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_capabilities.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_capabilities.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_command.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_bridge_filter.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_domain.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_migration.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_cgroup.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_cgroup.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hostdev.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hostdev.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hotplug.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hotplug.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_conf.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_process.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_process.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_migration.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_text.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_json.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_text.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_json.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_driver.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_driver.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_bridge_filter.c'. Must remake target `libvirt_driver_qemu.la'. </snip> Notes, in fact, libvirt_driver_qemu.la hasn't been generated: [root@202 libvirt]# find . -name libvirt_driver_qemu.la [root@202 libvirt]# find . -name libvirt_qemu_probes.lo [root@202 libvirt]# Regards, Alex

4 6

[libvirt] [PATCH] build: fix testing of augeas files in VPATH builds
by Eric Blake 30 May '12

30 May '12

Without this fix, a VPATH build fails with messages like: make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/daemon' ../../build-aux/augeas-gentest.pl libvirtd.conf ../../daemon/test_libvirtd.aug.in test_libvirtd.aug cannot read libvirtd.conf: No such file or directory at ../../build-aux/augeas-gentest.pl line 38. * daemon/Makefile.am (AUG_GENTEST): Factor out definition. (test_libvirtd.aug): Look for correct file. * src/Makefile.am (AUG_GENTEST): Use $(PERL). (qemu/test_libvirtd_qemu.aug, lxc/test_libvirtd_lxc.aug) (locking/test_libvirt_sanlock.aug): Ensure destination dir exists. --- This is one alternative for a fix for a build-breaker, but I'm not pushing it without a review. In particular, I still have a question: Should the various test_*.aug files be in the tarball? Right now, they are listed under EXTRA_DIST (so they are shipped pre-built), but also listed under CLEANFILES (so 'make clean' must regenerate them). Generating the files requires perl, which is a non-standard requirement. Either we require end-users to have perl in order to build from a libvirt tarball, and change the tarball to exclude files that perl can generate; or we fix the use of CLEANFILES to instead be DISTCLEANFILES or even MAINTAINERCLEANFILES (end users need not have perl if they don't alter any sources, but we should then be generating the files into $(srcdir) rather than into the build tree). For another example of a perl-generated file, remote_protocol.h is currently shipped in the tarball, and requires perl for generation, but it is generated into the $(srcdir) and only cleaned by MAINTAINERCLEANFILES. daemon/Makefile.am | 6 ++++-- src/Makefile.am | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index daf24ea..8dd019d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -351,8 +351,10 @@ libvirtd.service: libvirtd.service.in $(top_builddir)/config.status check-local: check-augeas -test_libvirtd.aug: test_libvirtd.aug.in libvirtd.conf - $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl libvirtd.conf $< $@ +AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl + +test_libvirtd.aug: test_libvirtd.aug.in $(srcdir)/libvirtd.conf + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libvirtd.conf $< $@ check-augeas: test_libvirtd.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ diff --git a/src/Makefile.am b/src/Makefile.am index 533e78a..0bbccb2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1119,11 +1119,13 @@ check-local: check-augeas check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock -AUG_GENTEST = $(top_srcdir)/build-aux/augeas-gentest.pl +AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl if WITH_QEMU -qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in qemu/qemu.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) qemu/qemu.conf $< $@ +qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ + $(srcdir)/qemu/qemu.conf $(AUG_GENTEST) + $(AM_V_GEN)$(MKDIR_P) qemu && \ + $(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< $@ check-augeas-qemu: qemu/test_libvirtd_qemu.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ @@ -1135,8 +1137,10 @@ check-augeas-qemu: endif if WITH_LXC -lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in lxc/lxc.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) lxc/lxc.conf $< $@ +lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ + $(srcdir)/lxc/lxc.conf $(AUG_GENTEST) + $(AM_V_GEN)$(MKDIR_P) lxc && \ + $(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@ check-augeas-lxc: lxc/test_libvirtd_lxc.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ @@ -1147,8 +1151,10 @@ else check-augeas-lxc: endif -locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in locking/qemu-sanlock.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ +locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ + locking/qemu-sanlock.conf $(AUG_GENTEST) + $(AM_V_GEN)$(MKDIR_P) locking && \ + $(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ check-augeas-sanlock: locking/test_libvirt_sanlock.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ -- 1.7.7.6

1 1

[libvirt] [PATCH] virsh: avoid strncpy
by Eric Blake 30 May '12

30 May '12

strncpy is generally evil - it runs the risk of missing NUL termination, and more often than not wastes time zeroing way more bytes than strictly necessary. We've avoided this evil in our virStrncpy wrapper, except for places where we forgot to use the wrapper; meanwhile, we have also added an even higher layer wrapper for setting virTypedParameter values. * tools/virsh.c (cmdMemtune, cmdBlkdeviotune): Use modern API. * cfg.mk (exclude_file_name_regexp--sc_prohibit_strncpy): Tighten. --- Noticed this while updating to the latest gnulib. cfg.mk | 3 +- tools/virsh.c | 149 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/cfg.mk b/cfg.mk index daaa867..37f51a6 100644 --- a/cfg.mk +++ b/cfg.mk @@ -808,8 +808,7 @@ exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/util\.c$$ exclude_file_name_regexp--sc_prohibit_sprintf = \ ^(docs/hacking\.html\.in)|(examples/systemtap/.*stp)|(src/dtrace2systemtap\.pl)|(src/rpc/gensystemtap\.pl)$$ -exclude_file_name_regexp--sc_prohibit_strncpy = \ - ^(src/util/util|tools/virsh)\.c$$ +exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/util\.c$$ exclude_file_name_regexp--sc_prohibit_strtol = \ ^src/(util/sexpr|(vbox|xen|xenxs)/.*)\.c$$ diff --git a/tools/virsh.c b/tools/virsh.c index d273c25..5226bd8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6283,7 +6283,6 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < nparams; i++) { temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; /* * Some magic here, this is used to fill the params structure with @@ -6292,24 +6291,32 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) * to the next valid argument and so on. */ if (soft_limit) { - temp->value.ul = soft_limit; - strncpy(temp->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + soft_limit) < 0) + goto error; soft_limit = 0; } else if (hard_limit) { - temp->value.ul = hard_limit; - strncpy(temp->field, VIR_DOMAIN_MEMORY_HARD_LIMIT, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + hard_limit) < 0) + goto error; hard_limit = 0; } else if (swap_hard_limit) { - temp->value.ul = swap_hard_limit; - strncpy(temp->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + swap_hard_limit) < 0) + goto error; swap_hard_limit = 0; } else if (min_guarantee) { - temp->value.ul = min_guarantee; - strncpy(temp->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + VIR_TYPED_PARAM_ULLONG, + min_guarantee) < 0) + goto error; min_guarantee = 0; } @@ -6318,15 +6325,19 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) temp->value.ul = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; } if (virDomainSetMemoryParameters(dom, params, nparams, flags) != 0) - vshError(ctl, "%s", _("Unable to change memory parameters")); + goto error; else ret = true; } - cleanup: +cleanup: VIR_FREE(params); virDomainFree(dom); return ret; + +error: + vshError(ctl, "%s", _("Unable to change memory parameters")); + goto cleanup; } /* @@ -8106,7 +8117,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) unsigned long long total_bytes_sec = 0, read_bytes_sec = 0, write_bytes_sec = 0; unsigned long long total_iops_sec = 0, read_iops_sec = 0, write_iops_sec = 0; int nparams = 0; - virTypedParameterPtr params = NULL, temp = NULL; + virTypedParameterPtr params = NULL; unsigned int flags = 0, i = 0; int rv = 0; bool current = vshCommandOptBool(cmd, "current"); @@ -8224,64 +8235,50 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) params = vshCalloc(ctl, nparams, sizeof(*params)); i = 0; - if (i < nparams && vshCommandOptBool(cmd, "total-bytes-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, - sizeof(temp->field)); - temp->value.ul = total_bytes_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "read-bytes-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, - sizeof(temp->field)); - temp->value.ul = read_bytes_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "write-bytes-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, - sizeof(temp->field)); - temp->value.ul = write_bytes_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "total-iops-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, - sizeof(temp->field)); - temp->value.ul = total_iops_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "read-iops-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, - sizeof(temp->field)); - temp->value.ul = read_iops_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "write-iops-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, - sizeof(temp->field)); - temp->value.ul = write_iops_sec; - } - - if (virDomainSetBlockIoTune(dom, disk, params, nparams, flags) < 0) { - vshError(ctl, "%s", - _("Unable to change block I/O throttle")); - goto cleanup; - } + if (i < nparams && vshCommandOptBool(cmd, "total-bytes-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + total_bytes_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "read-bytes-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + read_bytes_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "write-bytes-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + write_bytes_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "total-iops-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + total_iops_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "read-iops-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + read_iops_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "write-iops-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + write_iops_sec) < 0) + goto error; + + if (virDomainSetBlockIoTune(dom, disk, params, nparams, flags) < 0) + goto error; } ret = true; @@ -8290,6 +8287,10 @@ cleanup: VIR_FREE(params); virDomainFree(dom); return ret; + +error: + vshError(ctl, "%s", _("Unable to change block I/O throttle")); + goto cleanup; } /* -- 1.7.7.6

2 2

[libvirt] [PATCH] build: work around mingw isatty issues
by Eric Blake 30 May '12

30 May '12

Gnulib finally relaxed the isatty license, needed as first mentioned here: https://www.redhat.com/archives/libvir-list/2012-February/msg01022.html * .gnulib: Update to latest, for isatty. * bootstrap.conf (gnulib_modules): Add isatty. * bootstrap: Resync from gnulib. --- Not worth including until after 0.9.12 is out, but I thought I'd post it today, since I was investigating another possible gnulib issue. * .gnulib bb2f564...170e1b4 (33): > isatty: relax license to LGPLv2+ > stat-size: comment fix > Tests for module 'sh-quote'. > sh-quote: Improve shell_quote_argv's signature. > stdint: document issues with int_fast8_t etc. > nanosleep: Fix typo in comment. > nanosleep: Avoid guessing wrong when cross-compiling to Linux. > link-follow: Avoid guessing wrong when cross-compiling to glibc/Linux. > tzset: Avoid guessing wrong when cross-compiling to glibc systems. > d-ino: Avoid guessing "no" when cross-compiling to glibc/Linux systems. > fseeko-tests, ftello-tests: Avoid "guessing no" when cross-compiling. > signbit: Avoid "guessing no" when cross-compiling to glibc systems. > strerror: Avoid "guessing no" when cross-compiling to glibc systems. > canonicalize[-lgpl]: Avoid "guessing no" when cross-compiling to glibc. > gettimeofday: Avoid bad guess when cross-compiling to glibc systems. > Tweak last commit. > unistd_h: make it easier to avoid sys_types_h > lstat: Avoid "guessing no" when cross-compiling to glibc systems. > *alloc-gnu, eealloc: Avoid "guessing no" when cross-compiling to glibc. > getgroups: Avoid "guessing no" when cross-compiling to glibc systems. > chown: Avoid "guessing no" when cross-compiling to glibc systems. > Simplify last commit. > Avoid "guessing no" guesses when cross-compiling to glibc systems. > Say "guessing yes" or "guessing no" when cross-compiling. > relocatable-prog: Enable ELF ORIGIN trick also on GNU/kFreeBSD. > gnulib-tool: Remove transitional code. > getcwd: Fix misindentation. > exclude: process exclude and include directives in order > exclude: handle wildcards with FNM_NOESCAPE and with trailing \ > _Noreturn: future-proof non-GNU and non-MSVC compilers > exclude: handle wildcards with FNM_EXTMATCH > gnulib-tool: Fix list of authors. > bootstrap: support Automake-NG in $buildreq .gnulib | 2 +- bootstrap | 18 +++++++++++++++++- bootstrap.conf | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index bb2f564..170e1b4 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit bb2f5640d5379c5b4eec2d62341413bbab1aa308 +Subproject commit 170e1b42590631eac8279664ccc0b99ee5a73fb7 diff --git a/bootstrap b/bootstrap index 6b45868..c496d29 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-04-25.17; # UTC +scriptversion=2012-04-26.13; # UTC # Bootstrap this package from checked-out sources. @@ -433,6 +433,22 @@ check_versions() { GZIP) ;; # Do not use $GZIP: it contains gzip options. *) eval "app=\${$appvar-$app}" ;; esac + + # Handle the still-experimental Automake-NG programs specially. + # They remain named as the mainstream Automake programs ("automake", + # and "aclocal") to avoid gratuitous incompatibilities with + # pre-existing usages (by, say, autoreconf, or custom autogen.sh + # scripts), but correctly identify themselves (as being part of + # "GNU automake-ng") when asked their version. + case $app in + automake-ng|aclocal-ng) + app=`echo "$app" | sed 's/-ng$//'` + ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { + echo "$me: Error: '$app' not found or not from Automake-NG" >&2 + ret=1 + continue + } ;; + esac if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. diff --git a/bootstrap.conf b/bootstrap.conf index c6620e5..9b42cbf 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -60,6 +60,7 @@ ignore-value inet_pton intprops ioctl +isatty largefile listen maintainer-makefile -- 1.7.7.6

2 3

[libvirt] [PATCH] Fix memory leak
by Stefan Berger 29 May '12

29 May '12

Fix the following memory leak: ==3240== 23 bytes in 1 blocks are definitely lost in loss record 242 of 744 ==3240== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236) ==3240== by 0x8077537: __vasprintf_chk (vasprintf_chk.c:82) ==3240== by 0x509C677: virVasprintf (stdio2.h:199) ==3240== by 0x509C733: virAsprintf (util.c:1912) ==3240== by 0x1906583A: qemudStartup (qemu_driver.c:679) ==3240== by 0x511991D: virStateInitialize (libvirt.c:809) ==3240== by 0x40CD84: daemonRunStateInit (libvirtd.c:751) ==3240== by 0x5098745: virThreadHelper (threads-pthread.c:161) ==3240== by 0x7953D8F: start_thread (pthread_create.c:309) ==3240== by 0x805FF5C: clone (clone.S:115) --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -745,6 +745,8 @@ qemudStartup(int privileged) { if (conn) virConnectClose(conn); + VIR_FREE(membase); + return 0; out_of_memory:

2 2

[libvirt] Error when running "virsh version" and "virt-manager"
by Shradha Shah 29 May '12

29 May '12

Hello all, I have pulled the latest changes from the upstream libvirt repo as of today morning. I have then self-built and installed libvirt using the following commands (machine OS RHEL6.2): 1) ./autogen.sh --system --enable-compile-warnings=error 2) make 3) make install 4) service libvirtd restart At this point when I run the command "virsh version" I see the following output: Compiled against library: libvir 0.9.12 Using library: libvir 0.9.12 Using API: QEMU 0.9.12 error: failed to get the hypervisor version error: internal error Cannot find suitable emulator for x86_64 Some debug commands and their output: [root@c6100o libvirt]# rpm -qa | grep qemu-kvm qemu-kvm-0.12.1.2-2.209.el6.x86_64 [root@c6100o libvirt]# whereis qemu-kvm qemu-kvm: /usr/libexec/qemu-kvm /usr/share/qemu-kvm /usr/share/man/man1/qemu-kvm.1.gz [root@c6100o libvirt]# which virsh /usr/bin/virsh [root@c6100o libvirt]# which libvirtd /usr/sbin/libvirtd Please may I ask for help in order to resolve this issue? -- Many Thanks, Regards, Shradha Shah

2 3

[libvirt] [PATCH] build: silence libtool during tests
by Eric Blake 29 May '12

29 May '12

Libtool is picky about linking against a module library (aka a .so); giving lots of warnings like this in the tests directory: CCLD networkxml2argvtest *** Warning: Linking the executable networkxml2argvtest against the loadable module *** libvirt_driver_network.so is not portable! Fix that by splitting things into a convenience library which can be used directly by the tests, and making the real .so just wrap the convenience library. Based on a suggestion by Daniel P. Berrange. * configure.ac (--with-driver-modules): Fix help test. * src/Makefile.am (libvirt_driver_xen.la, libvirt_driver_libxl.la) (libvirt_driver_qemu.la, libvirt_driver_lxc.la) (libvirt_driver_uml.la): Factor into new convenience libraries. * tests/Makefile.am (xen_LDADDS, qemu_LDADDS, lxc_LDADDS) (networkxml2argvtest_LDADD): Link to convenience libraries, not shared libraries. --- configure.ac | 3 +- src/Makefile.am | 110 +++++++++++++++++++++++++++++----------------------- tests/Makefile.am | 12 +++--- 3 files changed, 69 insertions(+), 56 deletions(-) diff --git a/configure.ac b/configure.ac index 5d06b47..27997ed 100644 --- a/configure.ac +++ b/configure.ac @@ -2420,7 +2420,8 @@ AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""]) dnl Driver-Modules library AC_ARG_WITH([driver-modules], - AC_HELP_STRING([--with-driver-modules], [build drivers as loadable modules @<:@default=no@:>@]), + AC_HELP_STRING([--with-driver-modules], + [build drivers as loadable modules @<:@default=check@:>@]), [], [with_driver_modules=check]) diff --git a/src/Makefile.am b/src/Makefile.am index 0b20f1f..53c246d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -662,25 +662,27 @@ endif WITH_REMOTE $< $@ if WITH_XEN +noinst_LTLIBRARIES += libvirt_driver_xen_impl.la +libvirt_driver_xen_la_SOURCES = +libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_xen.la +libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_xen_la_LDFLAGS = -module -avoid-version else noinst_LTLIBRARIES += libvirt_driver_xen.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la endif -libvirt_driver_xen_la_CFLAGS = \ + +libvirt_driver_xen_impl_la_CFLAGS = \ $(XEN_CFLAGS) \ -I$(top_srcdir)/src/conf \ -I$(top_srcdir)/src/xenxs \ $(AM_CFLAGS) -libvirt_driver_xen_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_xen_la_LIBADD = $(XEN_LIBS) -if WITH_DRIVER_MODULES -libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_xen_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_xen_la_SOURCES = $(XEN_DRIVER_SOURCES) +libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) +libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES) endif if WITH_PHYP @@ -728,50 +730,54 @@ libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES) endif if WITH_LIBXL +noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la +libvirt_driver_libxl_la_SOURCES = +libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_libxl.la +libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version else noinst_LTLIBRARIES += libvirt_driver_libxl.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la endif -libvirt_driver_libxl_la_CFLAGS = $(LIBXL_CFLAGS) \ + +libvirt_driver_libxl_impl_la_CFLAGS = $(LIBXL_CFLAGS) \ -I$(top_srcdir)/src/conf \ -I$(top_srcdir)/src/xenxs \ $(AM_CFLAGS) -libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_libxl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la -if WITH_DRIVER_MODULES -libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_libxl_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_libxl_la_SOURCES = $(LIBXL_DRIVER_SOURCES) +libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la +libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES) endif if WITH_QEMU +noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la +libvirt_driver_qemu_la_SOURCES = +libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_qemu.la +libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version else noinst_LTLIBRARIES += libvirt_driver_qemu.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la endif -libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS) \ + +libvirt_driver_qemu_impl_la_CFLAGS = $(NUMACTL_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(LIBXML_CFLAGS) \ $(LIBNL_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_qemu_la_LIBADD = $(NUMACTL_LIBS) \ +libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_qemu_impl_la_LIBADD = $(NUMACTL_LIBS) \ $(CAPNG_LIBS) \ $(GNUTLS_LIBS) \ $(LIBXML_LIBS) \ $(LIBNL_LIBS) -if WITH_DRIVER_MODULES -libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_qemu_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_qemu_la_SOURCES = $(QEMU_DRIVER_SOURCES) +libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES) conf_DATA += qemu/qemu.conf @@ -784,32 +790,34 @@ EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ if WITH_LXC +noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la +libvirt_driver_lxc_la_SOURCES = +libvirt_driver_lxc_la_LIBADD = libvirt_driver_lxc_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_lxc.la +libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_lxc.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la endif -libvirt_driver_lxc_la_CFLAGS = \ + +libvirt_driver_lxc_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS) +libvirt_driver_lxc_impl_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS) if HAVE_LIBBLKID -libvirt_driver_lxc_la_CFLAGS += $(BLKID_CFLAGS) -libvirt_driver_lxc_la_LIBADD += $(BLKID_LIBS) +libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS) +libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS) endif if WITH_SECDRIVER_SELINUX -libvirt_driver_lxc_la_LIBADD += $(SELINUX_LIBS) +libvirt_driver_lxc_impl_la_LIBADD += $(SELINUX_LIBS) endif if WITH_SECDRIVER_APPARMOR -libvirt_driver_lxc_la_LIBADD += $(APPARMOR_LIBS) -endif -if WITH_DRIVER_MODULES -libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_lxc_impl_la_LIBADD += $(APPARMOR_LIBS) endif -libvirt_driver_lxc_la_SOURCES = $(LXC_DRIVER_SOURCES) +libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES) conf_DATA += lxc/lxc.conf @@ -820,22 +828,24 @@ endif EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug if WITH_UML +noinst_LTLIBRARIES += libvirt_driver_uml_impl.la +libvirt_driver_uml_la_SOURCES = +libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_uml.la +libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_uml_la_LDFLAGS = -module -avoid-version else noinst_LTLIBRARIES += libvirt_driver_uml.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la endif -libvirt_driver_uml_la_CFLAGS = $(NUMACTL_CFLAGS) \ + +libvirt_driver_uml_impl_la_CFLAGS = $(NUMACTL_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_uml_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_uml_la_LIBADD = $(NUMACTL_LIBS) -if WITH_DRIVER_MODULES -libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_uml_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_uml_la_SOURCES = $(UML_DRIVER_SOURCES) +libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_uml_impl_la_LIBADD = $(NUMACTL_LIBS) +libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES) endif @@ -874,21 +884,23 @@ libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES) endif if WITH_NETWORK +noinst_LTLIBRARIES += libvirt_driver_network_impl.la +libvirt_driver_network_la_SOURCES = +libvirt_driver_network_la_LIBADD = libvirt_driver_network_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_network.la +libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la $(LIBNL_LIBS) +libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_network.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la endif -libvirt_driver_network_la_CFLAGS = \ + +libvirt_driver_network_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -if WITH_DRIVER_MODULES -libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la $(LIBNL_LIBS) -libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -endif -libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES) +libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES) endif EXTRA_DIST += network/default.xml diff --git a/tests/Makefile.am b/tests/Makefile.am index d1106cf..e3bd6d1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -252,7 +252,7 @@ sockettest_SOURCES = \ sockettest_LDADD = $(LDADDS) if WITH_XEN -xen_LDADDS = ../src/libvirt_driver_xen.la +xen_LDADDS = ../src/libvirt_driver_xen_impl.la xen_LDADDS += $(LDADDS) xml2sexprtest_SOURCES = \ @@ -290,9 +290,9 @@ endif if WITH_QEMU -qemu_LDADDS = ../src/libvirt_driver_qemu.la +qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la if WITH_NETWORK -qemu_LDADDS += ../src/libvirt_driver_network.la +qemu_LDADDS += ../src/libvirt_driver_network_impl.la endif if WITH_DTRACE_PROBES qemu_LDADDS += ../src/libvirt_qemu_probes.lo @@ -337,9 +337,9 @@ endif if WITH_LXC -lxc_LDADDS = ../src/libvirt_driver_lxc.la +lxc_LDADDS = ../src/libvirt_driver_lxc_impl.la if WITH_NETWORK -lxc_LDADDS += ../src/libvirt_driver_network.la +lxc_LDADDS += ../src/libvirt_driver_network_impl.la endif lxc_LDADDS += $(LDADDS) @@ -393,7 +393,7 @@ if WITH_NETWORK networkxml2argvtest_SOURCES = \ networkxml2argvtest.c \ testutils.c testutils.h -networkxml2argvtest_LDADD = ../src/libvirt_driver_network.la $(LDADDS) +networkxml2argvtest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) else EXTRA_DIST += networkxml2argvtest.c endif -- 1.7.7.6

2 2