- Devel - libvirt List Archives

[libvirt] [PATCH] python: improve conversion validation
by Eric Blake 02 Apr '12

02 Apr '12

Laszlo Ersek pointed out that in trying to convert a long to an unsigned int, we used: long long_val = ...; if ((unsigned int)long_val == long_val) According to C99 integer promotion rules, the if statement is equivalent to: (unsigned long)(unsigned int)long_val == (unsigned long)long_val since you get an unsigned comparison if at least one side is unsigned, using the largest rank of the two sides; but on 32-bit platforms, where unsigned long and unsigned int are the same size, this comparison is always true and ends up converting negative long_val into posigive unsigned int values, rather than rejecting the negative value as we had originally intended (python longs are unbounded size, and we don't want to do silent modulo arithmetic when converting to C code). Fix this by using direct comparisons, rather than casting. * python/typewrappers.c (libvirt_intUnwrap, libvirt_uintUnwrap) (libvirt_ulongUnwrap, libvirt_ulonglongUnwrap): Fix conversion checks. --- python/typewrappers.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/python/typewrappers.c b/python/typewrappers.c index af209e6..4ae3ee1 100644 --- a/python/typewrappers.c +++ b/python/typewrappers.c @@ -132,7 +132,7 @@ libvirt_intUnwrap(PyObject *obj, int *val) if ((long_val == -1) && PyErr_Occurred()) return -1; - if ((int)long_val == long_val) { + if (long_val <= INT_MAX && long_val >= INT_MIN) { *val = long_val; } else { PyErr_SetString(PyExc_OverflowError, @@ -151,7 +151,7 @@ libvirt_uintUnwrap(PyObject *obj, unsigned int *val) if ((long_val == -1) && PyErr_Occurred()) return -1; - if ((unsigned int)long_val == long_val) { + if (long_val >= 0 && long_val <= UINT_MAX) { *val = long_val; } else { PyErr_SetString(PyExc_OverflowError, @@ -183,7 +183,13 @@ libvirt_ulongUnwrap(PyObject *obj, unsigned long *val) if ((long_val == -1) && PyErr_Occurred()) return -1; - *val = long_val; + if (long_val >= 0) { + *val = long_val; + } else { + PyErr_SetString(PyExc_OverflowError, + "negative Python int cannot be converted to C unsigned long"); + return -1; + } return 0; } @@ -207,16 +213,23 @@ int libvirt_ulonglongUnwrap(PyObject *obj, unsigned long long *val) { unsigned long long ullong_val = -1; + long long llong_val; /* The PyLong_AsUnsignedLongLong doesn't check the type of * obj, only accept argument of PyLong_Type, so we check it instead. */ - if (PyInt_Check(obj)) - ullong_val = PyInt_AsLong(obj); - else if (PyLong_Check(obj)) + if (PyInt_Check(obj)) { + llong_val = PyInt_AsLong(obj); + if (llong_val < 0) + PyErr_SetString(PyExc_OverflowError, + "negative Python int cannot be converted to C unsigned long long"); + else + ullong_val = llong_val; + } else if (PyLong_Check(obj)) { ullong_val = PyLong_AsUnsignedLongLong(obj); - else + } else { PyErr_SetString(PyExc_TypeError, "an integer is required"); + } if ((ullong_val == -1) && PyErr_Occurred()) return -1; -- 1.7.1

3 3

Re: [libvirt] Start of freeze for libvirt-0.9.11 and availability of rc1
by Maxim Sditanov 01 Apr '12

01 Apr '12

2012/4/1 Maxim Sditanov <feniksa(a)rambler.ru> > 2012/4/1 Feniks Gordon Freeman <feniksa(a)rambler.ru> > >> 2012/4/1 Feniks Gordon Freeman <feniksa(a)rambler.ru> >> >>> 2012/4/1 Laine Stump <laine(a)laine.org> >>> >>>> On 03/31/2012 07:56 AM, Daniel Veillard wrote: >>>> > I just made the second release candidate >>>> > >>>> > ftp://libvirt.org/libvirt/libvirt-0.9.11-rc2.tar.gz >>>> > >>>> > along with the rpms and tagged the git tree. >>>> > >>>> > It seems to work okay in my limited testing. If all goes well I would >>>> > probably push on Tuesday, >>>> > >>>> >>>> A gentoo user reported in irc (#virt on irc.oftc.net) earlier today >>>> that >>>> builds were failing for him on a fresh checkout from git: >>>> >>>> <feniksa> hi, when i compile libvirt on my gentoo i get warning: >>>> >>>> cc1: warning: unrecognized command line option >>>> "-Wno-suggest-attribute=const" >>>> cc1: warning: unrecognized command line option >>>> "-Wno-suggest-attribute=pure" >>>> >>>> <feniksa> gcc (Gentoo 4.5.3-r2 p1.1, pie-0.4.7) 4.5.3 >>>> <feniksa> last part of conf: http://pastebin.com/gnT4Y2Ba >>>> and compile log http://pastebin.com/FcSwshzS >>>> <feniksa> laine: 2 weeks ago i didn't see this warning. Now i pull >>>> from master sources and get this warning. But, this is only because i am >>>> using gcc 4.5.3 (this is latest gcc version in gentoo OS). >>>> >>>> I haven't looked at any of this code before, but it looks to me like >>>> ql_WARN_ADD() in gnulib must not be doing the right thing, and is adding >>>> the option even though the compiler apparently doesn't support it. This >>>> probably didn't crop up before because full warnings weren't turned on >>>> in the build until March 27 in commit 851117bd. That commit does things >>>> different for builds of git trees vs. tarballs, so I don't know if this >>>> failure will affect builds of release tarballs (I asked feniksa to try a >>>> build of the rc2 tarball, but he hasn't responded yet). >>>> >>> I compiled rc2 (ftp://libvirt.org/libvirt/libvirt-0.9.11-rc2.tar.gz) Same problem present in release candidate rc2 cc1: warning: unrecognized command line option "-Wno-suggest-attribute=const" cc1: warning: unrecognized command line option "-Wno-suggest-attribute=pure" -- With best wishes, Maxim Sditanov

1 0

[libvirt] [PATCH] libvirt:qemu: fix max_balloon less than cur_balloon
by Zhou Peng 01 Apr '12

01 Apr '12

In qemuDomainGetXMLDesc, if cur_balloon is bigger than max_balloon, max_balloon should be updated too, otherwise the currentMemory is bigger than memory in dumped xml, which will produce invalid checkpoint by virsh-save. The bug appears like this below: $virsh save vm-num foo.ckp $virsh restore foo.ckp error: XML error: current memory '824320k' exceeds maximum '824288k' Signed-off-by: Zhou Peng <ailvpeng25(a)gmail.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d3b0bd..96d3219 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4485,7 +4485,13 @@ endjob: if (err < 0) goto cleanup; if (err > 0) + { vm->def->mem.cur_balloon = balloon; + if (balloon > vm->def->mem.max_balloon) + { + vm->def->mem.max_balloon = balloon; + } + } /* err == 0 indicates no balloon support, so ignore it */ } } -- 1.7.7.6

3 12

[libvirt] [PATCH] Fix client only RPM build & other misc RPM problems
by Daniel P. Berrange 31 Mar '12

31 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushing under build break rule - some misc problems discovered while doing the RPM refactoring * libvirt.spec.in: Remove obsolete --with-remote-pid-file arg. Add missing %{without_libxl} statement. Fix handling of docs in client only build. Put systemtap files in -client RPM instead of -daemon RPM * examples/xml/nwfilter/Makefile.am: Don't install examples if nwfilter is disabled. --- examples/xml/nwfilter/Makefile.am | 2 ++ libvirt.spec.in | 30 +++++++++--------------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index 12a3619..c503682 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -22,6 +22,7 @@ FILTERS = \ EXTRA_DIST=$(FILTERS) +if WITH_NWFILTER confdir = $(sysconfdir)/libvirt NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" @@ -37,3 +38,4 @@ uninstall-local:: rm -f "$(NWFILTER_DIR)/$$f"; \ done -test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR) +endif diff --git a/libvirt.spec.in b/libvirt.spec.in index d91653c..b787fde 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -973,6 +973,7 @@ autoreconf -if %{?_without_openvz} \ %{?_without_lxc} \ %{?_without_vbox} \ + %{?_without_libxl} \ %{?_without_xenapi} \ %{?_without_sasl} \ %{?_without_avahi} \ @@ -1008,8 +1009,7 @@ autoreconf -if %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ - %{init_scripts} \ - --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid + %{init_scripts} make %{?_smp_mflags} gzip -9 ChangeLog @@ -1059,16 +1059,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} %endif -%if %{client_only} -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} -%endif - -%if ! %{with_libvirtd} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html \ - $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-devel-%{version}/ -%endif - %if ! %{with_qemu} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu @@ -1081,11 +1071,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif -mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} - -%if ! %{with_nwfilter} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter -%endif +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ + $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} %clean rm -fr %{buildroot} @@ -1305,10 +1292,6 @@ fi %else rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %endif -%if %{with_dtrace} -%{_datadir}/systemtap/tapset/libvirt_probes.stp -%{_datadir}/systemtap/tapset/libvirt_functions.stp -%endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ @@ -1495,6 +1478,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_bindir}/virt-host-validate %{_libdir}/lib*.so.* +%if %{with_dtrace} +%{_datadir}/systemtap/tapset/libvirt_probes.stp +%{_datadir}/systemtap/tapset/libvirt_functions.stp +%endif + %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ -- 1.7.7.6

1 0

[libvirt] [PATCH] openvz: Allow missing micro tag in the version
by Osier Yang 31 Mar '12

31 Mar '12

No reason to cause the openvz driver to fail on startup if the micro tag in missed. This solves the problem: https://www.redhat.com/archives/libvirt-users/2012-March/msg00202.html --- src/openvz/openvz_conf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 28f86ff..da6869b 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -95,11 +95,13 @@ openvzExtractVersionInfo(const char *cmdstr, int *retversion) tmp = help; - /* expected format: vzctl version <major>.<minor>.<micro> */ + /* expected format: vzctl version <major>.<minor>.<micro>, + * missing <micro> is allowed. + */ if ((tmp = STRSKIP(tmp, "vzctl version ")) == NULL) goto cleanup; - if (virParseVersionString(tmp, &version, false) < 0) + if (virParseVersionString(tmp, &version, true) < 0) goto cleanup; if (retversion) -- 1.7.7.3

1 0

Re: [libvirt] Using Libvirt to change the bridge a virtual network card of a running vm is connected to
by Hendrik Schwartke 31 Mar '12

31 Mar '12

I fixed the patch and added it to https://bugzilla.redhat.com/show_bug.cgi?id=784767.

4 13

[libvirt] [PATCH] build: fix build on cygwin
by Eric Blake 30 Mar '12

30 Mar '12

Regression introduced when we changed types in commit 3e2c3d8f6. We've done this sort of cleanup before (see commit c685993d7). * src/conf/storage_conf.c (virStoragePoolDefFormat) (virStorageVolTargetDefFormat): Cast gid_t and uid_t. --- Pushing under the build-breaker rule. src/conf/storage_conf.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index bdf6218..2330fa1 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -915,10 +915,10 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { virBufferAddLit(&buf," <permissions>\n"); virBufferAsprintf(&buf," <mode>0%o</mode>\n", def->target.perms.mode); - virBufferAsprintf(&buf," <owner>%d</owner>\n", - def->target.perms.uid); - virBufferAsprintf(&buf," <group>%d</group>\n", - def->target.perms.gid); + virBufferAsprintf(&buf," <owner>%u</owner>\n", + (unsigned int) def->target.perms.uid); + virBufferAsprintf(&buf," <group>%u</group>\n", + (unsigned int) def->target.perms.gid); if (def->target.perms.label) virBufferAsprintf(&buf," <label>%s</label>\n", @@ -1152,10 +1152,10 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAddLit(buf," <permissions>\n"); virBufferAsprintf(buf," <mode>0%o</mode>\n", def->perms.mode); - virBufferAsprintf(buf," <owner>%d</owner>\n", - def->perms.uid); - virBufferAsprintf(buf," <group>%d</group>\n", - def->perms.gid); + virBufferAsprintf(buf," <owner>%u</owner>\n", + (unsigned int) def->perms.uid); + virBufferAsprintf(buf," <group>%u</group>\n", + (unsigned int) def->perms.gid); if (def->perms.label) -- 1.7.7.6

1 0

[libvirt] [PATCH] build: fix mingw ssize_t, syntax check
by Eric Blake 30 Mar '12

30 Mar '12

We are so close to a release that we don't want to pull in a gnulib submodule update and risk regressions, since there has been a lot of other gnulib churn upstream. However, there are a couple of gnulib issues that are worth fixing in isolation, by applying local patches to gnulib. There was an upstream gnulib bug in maint.mk that rendered most of our syntax checks ineffective (and fixing it flushed out a minor bug in our code): https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00194.html There is still an upstream bug where gnulib uses the wrong type for ssize_t on mingw; we need the fix now even though it has not yet been accepted into gnulib: https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00188.html * gnulib/local/top/maint.mk.diff: Pick up upstream gnulib maint.mk. * gnulib/local/m4/ssize_t.m4.diff: Work around gnulib bug. * src/libvirt.c: Remove unused header. --- Yes, I know reading a diff of a diff is hard. Any objections to this? I'd like to apply it before RC2 is built. I am not set up to easily test if the ssize_t fix works on mingw. I _did_ test it on Linux, including where I primed the configure cache to intentionally treat ssize_t as missing, so I'm confident the replacement mechanism works; I just don't know if it will silence the warnings that Dan reported here: https://www.redhat.com/archives/libvir-list/2012-March/msg01273.html And we still need _part_ of that patch (the conversion from fprintf to asprintf, in order to support %zd in the first place). gnulib/local/m4/ssize_t.m4.diff | 34 ++++++++++++++++++++++++++++++++++ gnulib/local/top/maint.mk.diff | 32 ++++++++++++++++++++++++++++++++ src/libvirt.c | 2 -- 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 gnulib/local/m4/ssize_t.m4.diff create mode 100644 gnulib/local/top/maint.mk.diff diff --git a/gnulib/local/m4/ssize_t.m4.diff b/gnulib/local/m4/ssize_t.m4.diff new file mode 100644 index 0000000..d0ae286 --- /dev/null +++ b/gnulib/local/m4/ssize_t.m4.diff @@ -0,0 +1,34 @@ +diff --git i/m4/ssize_t.m4 w/m4/ssize_t.m4 +index 209d64c..5ea72a1 100644 +--- i/m4/ssize_t.m4 ++++ w/m4/ssize_t.m4 +@@ -1,4 +1,4 @@ +-# ssize_t.m4 serial 5 (gettext-0.18.2) ++# ssize_t.m4 serial 6 (gettext-0.18.2) + dnl Copyright (C) 2001-2003, 2006, 2010-2012 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -17,7 +17,21 @@ AC_DEFUN([gt_TYPE_SSIZE_T], + return !x;]])], + [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])]) + if test $gt_cv_ssize_t = no; then +- AC_DEFINE([ssize_t], [int], +- [Define as a signed type of the same size as size_t.]) ++ AC_CACHE_CHECK([for rank of size_t], [gt_cv_size_t_rank], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <sys/types.h> ++ #ifdef __cplusplus ++ extern "C" { ++ #endif ++ int foo(unsigned long bar); ++ int foo(size_t bar); ++ #ifdef __cplusplus ++ } ++ #endif ++ ]])], ++ [gt_cv_size_t_rank=long], [gt_cv_size_t_rank=int])]) ++ AC_DEFINE_UNQUOTED([ssize_t], [$gt_cv_size_t_rank], ++ [Define as a signed type of the same size and rank as size_t.]) + fi + ]) diff --git a/gnulib/local/top/maint.mk.diff b/gnulib/local/top/maint.mk.diff new file mode 100644 index 0000000..85e97ae --- /dev/null +++ b/gnulib/local/top/maint.mk.diff @@ -0,0 +1,32 @@ +diff --git i/top/maint.mk w/top/maint.mk +index 4cbd5f4..2228a37 100644 +--- i/top/maint.mk ++++ w/top/maint.mk +@@ -279,7 +279,7 @@ define _sc_search_regexp + if test -n "$$files"; then \ + if test -n "$$prohibit"; then \ + grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \ +- | grep -vE "$${exclude-^$$}" \ ++ | grep -vE "$${exclude:-^$$}" \ + && { msg="$$halt" $(_sc_say_and_exit) } || :; \ + else \ + grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \ +@@ -455,7 +455,8 @@ sc_prohibit_quotearg_without_use: + + # Don't include quote.h unless you use one of its functions. + sc_prohibit_quote_without_use: +- @h='quote.h' re='\<quote(_n)? *\(' $(_sc_header_without_use) ++ @h='quote.h' re='\<quote((_n)? *\(|_quoting_options\>)' \ ++ $(_sc_header_without_use) + + # Don't include this header unless you use one of its functions. + sc_prohibit_long_options_without_use: +@@ -1332,7 +1333,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks) + $(MAKE) vc-diff-check + $(MAKE) news-check + $(MAKE) distcheck +- $(MAKE) dist XZ_OPT=-9ev ++ $(MAKE) dist + $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@ + $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@ + diff --git a/src/libvirt.c b/src/libvirt.c index 8bca16d..16d1fd5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -45,8 +45,6 @@ #include "virrandom.h" #include "viruri.h" -#include <ctype.h> - #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST # include "test/test_driver.h" -- 1.7.1

2 2

[libvirt] [PATCH] hold the reference when call monitor's callback
by Wen Congyang 30 Mar '12

30 Mar '12

When qemu cannot startup, we will call EOF notify callback. Unfortunately, there is a bug in libvirt, and it will cause mon->ref to be 0 while we call EOF notify callback. This bug will cause the libvirt to be deadlock. We call the other callback while holding the reference. So I think we should also hold the reference here. Note: this patch does not fix the bug. The libvirt will be deadlock in qemuMonitorUnwatch() because the monitor is freed unexpectedly. I am still investigating this bug. But if I set a breakpoint in qemuMonitorUnref(), it does not happen now. If i remove the breakpoint, it will happen sometime(the probability is about 20%). The steps to reproduce this bug: 1. use newest qemu-kvm 2. add a host pci device into guest config file 3. start the guest The qemu will fail with the following error message: Failed to assign irq for "hostdev0": Input/output error Perhaps you are assigning a device that shares an IRQ with another device? I have reported qemu's problem to qemu maillist. --- src/qemu/qemu_monitor.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 78eb492..20eb9ea 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -668,10 +668,14 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) { /* Make sure anyone waiting wakes up now */ virCondSignal(&mon->notify); - if (qemuMonitorUnref(mon) > 0) - qemuMonitorUnlock(mon); + + /* hold the reference when call monitor's callback to avoid deadlock */ + qemuMonitorUnlock(mon); VIR_DEBUG("Triggering EOF callback"); (eofNotify)(mon, vm); + qemuMonitorLock(mon); + if (qemuMonitorUnref(mon) > 0) + qemuMonitorUnlock(mon); } else if (error) { void (*errorNotify)(qemuMonitorPtr, virDomainObjPtr) = mon->cb->errorNotify; @@ -679,10 +683,14 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) { /* Make sure anyone waiting wakes up now */ virCondSignal(&mon->notify); - if (qemuMonitorUnref(mon) > 0) - qemuMonitorUnlock(mon); + + /* hold the reference when call monitor's callback to avoid deadlock */ + qemuMonitorUnlock(mon); VIR_DEBUG("Triggering error callback"); (errorNotify)(mon, vm); + qemuMonitorLock(mon); + if (qemuMonitorUnref(mon) > 0) + qemuMonitorUnlock(mon); } else { if (qemuMonitorUnref(mon) > 0) qemuMonitorUnlock(mon); -- 1.7.1

3 6

[libvirt] [PATCH] Set default name for SPICE agent channel
by Christophe Fergeau 30 Mar '12

30 Mar '12

libvirt documentation for channels with type 'spicevmc' says that the 'target' child node has: "an optional attribute name controls how the guest will have access to the channel, and defaults to name='com.redhat.spice.0'." However, this default value is never set in libvirt code base, there's only a check in qemu_command.c to error out if the name attribute doesn't have the expected value (if it's set). This commit sets a default target name for spicevmc channels during the domain configuration parsing so that the code agrees with the documentation. --- src/conf/domain_conf.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d5def1c..9012462 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5218,6 +5218,13 @@ virDomainChrDefParseXML(virCapsPtr caps, goto error; } else { def->source.data.spicevmc = VIR_DOMAIN_CHR_SPICEVMC_VDAGENT; + if (!def->target.name) { + def->target.name = strdup("com.redhat.spice.0"); + if (!def->target.name) { + virReportOOMError(); + goto error; + } + } } } -- 1.7.7.6

4 10

[libvirt] [PATCH] Refactor the libvirt RPM daemon pieces
by Daniel P. Berrange 30 Mar '12

30 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> NB: this is in response to a Fedora 17 beta blocker bug. Currently gnome-boxes depends on 'libvirt' which pulls in the default virtual network, which kills networking if you install Fedora 17 inside a KVM guest. There are a number of flaws with our packaging of the libvirtd daemon: - Installing 'libvirt' does not install 'qemu-kvm' or 'xen' etc which are required to actually run the hypervisor in question - Installing 'libvirt' pulls in the default configuration files which may not be wanted & cause problems if installed inside a guest - It is not possible to explicitly required all the peices required to manage a specific hypervisor This change takes the 'libvirt' RPM and and changes it thus - libvirt: just a virtual package with dep on libvirt-daemon and libvirt-daemon-configs - libvirt-daemon: the libvirt daemon and related pieces - libvirt-daemon-configs: the default network & filter configs - libvirt-docs: the website HTML We then introduce some more virtual (empty) packages - libvirt-daemon-qemu: Deps on libvirt-daemon & 'qemu' - libvirt-daemon-kvm: Deps on libvirt-daemon & 'qemu-kvm' - libvirt-daemon-lxc: Deps on libvirt-daemon - libvirt-daemon-uml: Deps on libvirt-daemon - libvirt-daemon-xen: Deps on libvirt-daemon & 'xen' - libvirt-qemu: Deps on libvirt-daemon-qemu & libvirt-daemon-configs - libvirt-kvm: Deps on libvirt-daemon-kvm & libvirt-daemon-configs - libvirt-lxc: Deps on libvirt-daemon-lxc & libvirt-daemon-configs - libvirt-uml: Deps on libvirt-daemon-uml & libvirt-daemon-configs - libvirt-xen: Deps on libvirt-daemon-xen & libvirt-daemon-configs My intent in the future is to turn on the driver modules by default, at which time 'libvirt-daemon' will cease to include any specific drivers, instead we'll get libvirt-daemon-driver-XXXX packages for each driver. The libvirt-daemon-XXX packages will then pull in each driver that they require. It is recommended that applications required a locally installed libvirtd daemon, use either 'Requires: libvirt-daemon-XXXX' or 'Requires: libvirt-XXX' and *not* "Requires: libvirt-daemon" or 'Requires: libvirt' * libvirt.spec.in: Refactor RPMs * docs/packaging.html.in, docs/sitemap.html.in: Document new RPM split rationale --- docs/packaging.html.in | 100 ++++++++++ docs/sitemap.html.in | 4 + libvirt.spec.in | 474 +++++++++++++++++++++++++++++++++++------------- 3 files changed, 456 insertions(+), 122 deletions(-) create mode 100644 docs/packaging.html.in diff --git a/docs/packaging.html.in b/docs/packaging.html.in new file mode 100644 index 0000000..2e4abf7 --- /dev/null +++ b/docs/packaging.html.in @@ -0,0 +1,100 @@ +<?xml version="1.0"?> +<html> + <body> + <h1>Distribution packaging</h1> + + <ul id="toc"></ul> + + <p> + This page describes the rationale behind the libvirt distribution +packaging in RPM format. The RPM specfile provided with libvirt targets +all Fedora and RHEL releases. It is split up into a number of sub-RPMs +in order to facilitate minimal installations, targetting specific +feature sets. + </p> + + <h2>Real packages</h2> + + <p> + The so called "real" packages provide the actual file payloads + related to libvirt. If very specific / targetted functionality + is required, then applications can depend on one or more of these + real packages. + </p> + + <dl> + <dt>libvirt-client</dt> + <dd>This package provides the main libvirt.so library along with the virsh command line tool. + If a C based application only wants to be able to manage remote hypervisors, this is all + that they need depend on</dd> + <dt>libvirt-devel</dt> + <dd>This package provides the header files and libraries required to compile and link C + applications using libvirt</dd> + <dt>libvirt-python</dt> + <dd>This package provides the Python binding to the C libraries. It will pull in the libvirt-client + RPM. If a Python application only wants to be able to manage remote hypervisors, this is all that + they need depend on</dd> + <dt>libvirt-daemon</dt> + <dd>This package provides server side libvirtd daemon, which is required in order to + manage any stateful hypervisors (currently QEMU, KVM, Xen, LXC and UML).</dd> + <dt>libvirt-daemon-configs</dt> + <dd>This package provides the standard configuration files for setting up a NAT + based network, and network filter rules for ensuring clean VM traffic.</dd> + </dl> + + <h2>Virtual packages</h2> + + <p> + The virtual packages provide convenient targets for application dependencies to + pull in functionality related to specific hypervisors. Since the packaging of + the <code>libvirt-daemon</code> RPM is expected to change in the future to split + each hypervisor driver out into a separate RPM, applications are strongly + recommended to depend on one of the following virtual packages, instead of + depending directly on <code>libvirt-daemon</code> + </p> + + <dl> + <dt>libvirt</dt> + <dd>This package, simply pulls in every single other server side RPM. + If an application wants to ensure all possible libvirt drivers are installed, + this is what they should depend on</dd> + + <dt>libvirt-daemon-qemu</dt> + <dd>This package pulls in the server side daemon, drivers and the QEMU TCG binaries + required to provide emulation of non-native architectures</dd> + <dt>libvirt-daemon-kvm</dt> + <dd>This package pulls in the server side daemon, drivers and the KVM binaries + required to provide hardware accelerated virtualization of the native + architectures</dd> + <dt>libvirt-daemon-lxc</dt> + <dd>This package pulls in the server side daemon and drivers required to + run native Linux containers</dd> + <dt>libvirt-daemon-uml</dt> + <dd>This package pulls in the server side daemon and drivers required to + run User Mode Linux. The application must still provide the actual + UML binary kenrels</dd> + <dt>libvirt-daemon-xen</dt> + <dd>This package pulls in the server side daemon and drivers required to + run guests on the Xen hypervisor.</dd> + + <dt>libvirt-qemu</dt> + <dd>This package pulls in the server side daemon, drivers and the QEMU TCG binaries + required to provide emulation of non-native architectures</dd> + <dt>libvirt-kvm</dt> + <dd>This package pulls in the server side daemon, drivers and the KVM binaries + required to provide hardware accelerated virtualization of the native + architectures</dd> + <dt>libvirt-lxc</dt> + <dd>This package pulls in the server side daemon, drivers and default + configuration files required to run native Linux containers</dd> + <dt>libvirt-uml</dt> + <dd>This package pulls in the server side daemon, drivers and default + configuration files required to run User Mode Linux. The application + must still provide the actual UML binary kenrels</dd> + <dt>libvirt-xen</dt> + <dd>This package pulls in the server side daemon, drivers and default + configuration files required to run guests on the Xen hypervisor.</dd> + </dl> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 1de2b20..620c989 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -84,6 +84,10 @@ <a href="hooks.html">Hooks</a> <span>Hooks for system specific management</span> </li> + <li> + <a href="packaging.html">Distribution packaging</a> + <span>Rationale for distribution RPM packaging</span> + </li> </ul> </li> <li> diff --git a/libvirt.spec.in b/libvirt.spec.in index 67f1c33..743d43e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -52,6 +52,14 @@ %define with_libxl 0%{!?_without_libxl:%{server_drivers}} %define with_vmware 0%{!?_without_vmware:%{server_drivers}} +%define with_qemu_tcg %{with_qemu} +# Change if we ever provide qemu-kvm binaries on non-x86 hosts +%ifarch %{ix86} x86_64 +%define with_qemu_kvm %{with_qemu} +%else +%define with_qemu_kvm 0 +%endif + # Then the hypervisor drivers that talk via a native remote protocol %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} @@ -125,8 +133,10 @@ # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC %if 0%{?rhel} == 5 +%define with_qemu_tcg 0 %ifnarch x86_64 %define with_qemu 0 +%define with_qemu_kvm 0 %endif %define with_lxc 0 %endif @@ -134,8 +144,10 @@ # RHEL-6 has restricted QEMU to x86_64 only, stopped including Xen # on all archs. Other archs all have LXC available though %if 0%{?rhel} >= 6 +%define with_qemu_tcg 0 %ifnarch x86_64 %define with_qemu 0 +%define with_qemu_kvm 0 %endif %define with_xen 0 %endif @@ -268,109 +280,17 @@ Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ -# All runtime requirements for the libvirt package (runtime requrements -# for subpackages are listed later in those subpackages) - -# The client side, i.e. shared libs and virsh are in a subpackage -Requires: %{name}-client = %{version}-%{release} - -# Used by many of the drivers, so turn it on whenever the -# daemon is present %if %{with_libvirtd} -# for modprobe of pci devices -Requires: module-init-tools -# for /sbin/ip & /sbin/tc -Requires: iproute -%if %{with_avahi} -Requires: avahi-libs -%endif -%endif -%if %{with_network} -Requires: dnsmasq >= 2.41 -Requires: radvd -%endif -%if %{with_network} || %{with_nwfilter} -Requires: iptables -Requires: iptables-ipv6 -%endif -%if %{with_nwfilter} -Requires: ebtables -%endif -# needed for device enumeration -%if %{with_hal} -Requires: hal -%endif -%if %{with_udev} -Requires: udev >= 145 -%endif -%if %{with_polkit} -%if 0%{?fedora} >= 12 || 0%{?rhel} >=6 -Requires: polkit >= 0.93 -%else -Requires: PolicyKit >= 0.6 -%endif -%endif -%if %{with_storage_fs} -Requires: nfs-utils -# For mkfs -Requires: util-linux-ng -# For pool-build probing for existing pools -BuildRequires: libblkid-devel >= 2.17 -# For glusterfs -%if 0%{?fedora} >= 11 -Requires: glusterfs-client >= 2.0.1 -%endif -%endif -%if %{with_qemu} -# From QEMU RPMs -Requires: /usr/bin/qemu-img -# For image compression -Requires: gzip -Requires: bzip2 -Requires: lzop -Requires: xz -%else -%if %{with_xen} -# From Xen RPMs -Requires: /usr/sbin/qcow-create -%endif -%endif -%if %{with_storage_lvm} -# For LVM drivers -Requires: lvm2 -%endif -%if %{with_storage_iscsi} -# For ISCSI driver -Requires: iscsi-initiator-utils -%endif -%if %{with_storage_disk} -# For disk driver -Requires: parted -Requires: device-mapper -%endif -%if %{with_storage_mpath} -# For multipath support -Requires: device-mapper -%endif -%if %{with_cgconfig} -Requires: libcgroup -%endif -%ifarch %{ix86} x86_64 ia64 -# For virConnectGetSysinfo -Requires: dmidecode -%endif -# For service management -%if %{with_systemd} -Requires(post): systemd-units -Requires(post): systemd-sysv -Requires(preun): systemd-units -Requires(postun): systemd-units -%endif -%if %{with_numad} -Requires: numad +Requires: libvirt-daemon = %{version}-%{release} +Requires: libvirt-daemon-configs = %{version}-%{release} +# XXX when we turn on driver modules, we need to add +# deps on each driver (Requires: libvirt-daemon-drv-qemu) %endif +Requires: libvirt-docs = %{version}-%{release} +Requires: libvirt-client = %{version}-%{release} -# All build-time requirements +# All build-time requirements. Run-time requirements are +# listed against each sub-RPM %if 0%{?enable_autotools} BuildRequires: autoconf BuildRequires: automake @@ -537,6 +457,271 @@ Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes the libvirtd server exporting the virtualization support. +%if %{with_libvirtd} +%package daemon +Summary: Server side daemon and supporting files for libvirt library +Group: Development/Libraries + +# All runtime requirements for the libvirt package (runtime requrements +# for subpackages are listed later in those subpackages) + +# The client side, i.e. shared libs and virsh are in a subpackage +Requires: %{name}-client = %{version}-%{release} + +# Used by many of the drivers, so turn it on whenever the +# daemon is present +%if %{with_libvirtd} +# for modprobe of pci devices +Requires: module-init-tools +# for /sbin/ip & /sbin/tc +Requires: iproute +%if %{with_avahi} +Requires: avahi-libs +%endif +%endif +%if %{with_network} +Requires: dnsmasq >= 2.41 +Requires: radvd +%endif +%if %{with_network} || %{with_nwfilter} +Requires: iptables +Requires: iptables-ipv6 +%endif +%if %{with_nwfilter} +Requires: ebtables +%endif +# needed for device enumeration +%if %{with_hal} +Requires: hal +%endif +%if %{with_udev} +Requires: udev >= 145 +%endif +%if %{with_polkit} +%if 0%{?fedora} >= 12 || 0%{?rhel} >=6 +Requires: polkit >= 0.93 +%else +Requires: PolicyKit >= 0.6 +%endif +%endif +%if %{with_storage_fs} +Requires: nfs-utils +# For mkfs +Requires: util-linux-ng +# For pool-build probing for existing pools +BuildRequires: libblkid-devel >= 2.17 +# For glusterfs +%if 0%{?fedora} >= 11 +Requires: glusterfs-client >= 2.0.1 +%endif +%endif +%if %{with_qemu} +# From QEMU RPMs +Requires: /usr/bin/qemu-img +# For image compression +Requires: gzip +Requires: bzip2 +Requires: lzop +Requires: xz +%else +%if %{with_xen} +# From Xen RPMs +Requires: /usr/sbin/qcow-create +%endif +%endif +%if %{with_storage_lvm} +# For LVM drivers +Requires: lvm2 +%endif +%if %{with_storage_iscsi} +# For ISCSI driver +Requires: iscsi-initiator-utils +%endif +%if %{with_storage_disk} +# For disk driver +Requires: parted +Requires: device-mapper +%endif +%if %{with_storage_mpath} +# For multipath support +Requires: device-mapper +%endif +%if %{with_cgconfig} +Requires: libcgroup +%endif +%ifarch %{ix86} x86_64 ia64 +# For virConnectGetSysinfo +Requires: dmidecode +%endif +# For service management +%if %{with_systemd} +Requires(post): systemd-units +Requires(post): systemd-sysv +Requires(preun): systemd-units +Requires(postun): systemd-units +%endif +%if %{with_numad} +Requires: numad +%endif + +%package docs +Summary: Documentation for libvirt library and daemon +Group: Development/Libraries + +%description docs +Copy of the libvirt website documentation + +%description daemon +Server side daemon required to manage the virtualization capabilities +of recent versions of Linux. Requires a hypervisor specific sub-RPM +for specific drivers. + +%package daemon-configs +Summary: Default configuration files for the libvirtd daemon +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-configs +Default configuration files for setting up NAT based networking +and guest network traffic filtering. +%endif + +# XXX when we turn on driver modules, we will need to +# create daemon-drv-XXX sub-RPMs and add them as deps +# to all of the following daemon-XXX RPMs + +%if %{with_qemu_tcg} +%package daemon-qemu +Summary: Server side daemon & driver required to run QEMU guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +Requires: qemu +%endif + +%if %{with_qemu_kvm} +%package daemon-kvm +Summary: Server side daemon & driver required to run QEMU guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +Requires: qemu-kvm +%endif + +%if %{with_qemu_tcg} +%description daemon-qemu +Server side daemon and driver required to manage the virtualization +capabilities of the QEMU TCG emulators +%endif + +%if %{with_qemu_kvm} +%description daemon-kvm +Server side daemon and driver required to manage the virtualization +capabilities of the QEMU KVM hypervisor +%endif + +%if %{with_qemu_tcg} +%package qemu +Summary: Server side daemon, driver & default configs required to run QEMU guests +Group: Development/Libraries + +Requires: libvirt-daemon-qemu = %{version}-%{release} +Requires: libvirt-configs = %{version}-%{release} + +%description qemu +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of QEMU. +%endif + +%if %{with_qemu_kvm} +%package kvm +Summary: Server side daemon, driver & default configs required to run KVM guests +Group: Development/Libraries + +Requires: libvirt-daemon-kvm = %{version}-%{release} +Requires: libvirt-configs = %{version}-%{release} + +%description kvm +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of KVM. +%endif + + +%if %{with_lxc} +%package daemon-lxc +Summary: Server side daemon & driver required to run LXC guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +Requires: lxc + +%description daemon-lxc +Server side daemon and driver required to manage the virtualization +capabilities of LXC + +%package lxc +Summary: Server side daemon, driver & default configs required to run LXC guests +Group: Development/Libraries + +Requires: libvirt-daemon-lxc = %{version}-%{release} +Requires: libvirt-configs = %{version}-%{release} + +%description lxc +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of LXC. +%endif + + +%if %{with_uml} +%package daemon-uml +Summary: Server side daemon & driver required to run UML guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +# There are no UML kernel RPMs in Fedora/RHEL to depend on. + +%description daemon-uml +Server side daemon and driver required to manage the virtualization +capabilities of UML + +%package uml +Summary: Server side daemon, driver & default configs required to run UML guests +Group: Development/Libraries + +Requires: libvirt-daemon-uml = %{version}-%{release} +Requires: libvirt-configs = %{version}-%{release} + +%description uml +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of UML. +%endif + + +%if %{with_xen} +%package daemon-xen +Summary: Server side daemon & driver required to run XEN guests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} +Requires: xen + +%description daemon-xen +Server side daemon and driver required to manage the virtualization +capabilities of XEN + +%package xen +Summary: Server side daemon, driver & default configs required to run XEN guests +Group: Development/Libraries + +Requires: libvirt-daemon-xen = %{version}-%{release} +Requires: libvirt-configs = %{version}-%{release} + +%description xen +Server side daemon, driver and default network & firewall configs +required to manage the virtualization capabilities of Xen. +%endif + %package client Summary: Client side library and utilities of the libvirt library Group: Development/Libraries @@ -582,7 +767,7 @@ Group: Development/Libraries Requires: sanlock >= 1.8 #for virt-sanlock-cleanup require augeas Requires: augeas -Requires: %{name} = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description lock-sanlock Includes the Sanlock lock manager plugin for the QEMU @@ -811,8 +996,7 @@ autoreconf -if %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ - %{init_scripts} \ - --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid + %{init_scripts} make %{?_smp_mflags} gzip -9 ChangeLog @@ -884,6 +1068,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} + %clean rm -fr %{buildroot} @@ -898,7 +1084,8 @@ do done make check -%pre +%if %{with_libvirtd} +%pre daemon %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Normally 'setup' adds this in /etc/passwd, but this is # here for case of upgrades from earlier Fedora/RHEL. This @@ -910,22 +1097,9 @@ getent passwd qemu >/dev/null || \ -c "qemu user" qemu %endif -%post +%post daemon -%if %{with_libvirtd} %if %{with_network} -# We want to install the default network for initial RPM installs -# or on the first upgrade from a non-network aware libvirt only. -# We check this by looking to see if the daemon is already installed -if ! /sbin/chkconfig libvirtd && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml -then - UUID=`/usr/bin/uuidgen` - sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ - < %{_datadir}/libvirt/networks/default.xml \ - > %{_sysconfdir}/libvirt/qemu/networks/default.xml - ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml -fi - # All newly defined networks will have a mac address for the bridge # auto-generated, but networks already existing at the time of upgrade # will not. We need to go through all the network configs, look for @@ -991,8 +1165,8 @@ fi %endif %endif -%preun %if %{with_libvirtd} +%preun daemon %if %{with_systemd} if [ $1 -eq 0 ] ; then # Package removal, not upgrade @@ -1007,8 +1181,8 @@ fi %endif %endif -%postun %if %{with_libvirtd} +%postun daemon %if %{with_systemd} /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -1019,6 +1193,20 @@ fi %endif %if %{with_libvirtd} +%if %{with_network} +%post daemon-configs +if [ $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ] ; then + UUID=`/usr/bin/uuidgen` + sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ + < %{_datadir}/libvirt/networks/default.xml \ + > %{_sysconfdir}/libvirt/qemu/networks/default.xml + ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml +fi +%endif +%endif + + +%if %{with_libvirtd} %if %{with_systemd} %triggerun -- libvirt < 0.9.4 %{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: @@ -1064,10 +1252,19 @@ fi /bin/systemctl try-restart libvirt-guests.service >/dev/null 2>&1 || : %endif -%if %{with_libvirtd} %files %defattr(-, root, root) +%files docs +%defattr(-, root, root) +%dir %{_datadir}/doc/libvirt-docs-%{version} +%dir %{_datadir}/doc/libvirt-docs-%{version}/html +%{_datadir}/doc/libvirt-docs-%{version}/html/* + +%if %{with_libvirtd} +%files daemon +%defattr(-, root, root) + %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ @@ -1078,7 +1275,6 @@ fi %endif %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ -%{_sysconfdir}/libvirt/nwfilter/*.xml %{_sysconfdir}/rc.d/init.d/libvirtd %if %{with_systemd} @@ -1190,8 +1386,42 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_mandir}/man8/libvirtd.8* %doc docs/*.xml + +%files daemon-configs +%defattr(-, root, root) +%{_sysconfdir}/libvirt/nwfilter/*.xml %endif +%files daemon-qemu +%defattr(-, root, root) + +%files daemon-kvm +%defattr(-, root, root) + +%files daemon-lxc +%defattr(-, root, root) + +%files daemon-uml +%defattr(-, root, root) + +%files daemon-xen +%defattr(-, root, root) + +%files qemu +%defattr(-, root, root) + +%files kvm +%defattr(-, root, root) + +%files lxc +%defattr(-, root, root) + +%files uml +%defattr(-, root, root) + +%files xen +%defattr(-, root, root) + %if %{with_sanlock} %files lock-sanlock %defattr(-, root, root) -- 1.7.7.6

3 6

[libvirt] [PATCH v2] qemu_agent: Issue guest-sync prior to every command
by Michal Privoznik 30 Mar '12

30 Mar '12

If we issue guest command and GA is not running, the issuing thread will block endlessly. We can check for GA presence by issuing guest-sync with unique ID (timestamp). We don't want to issue real command as even if GA is not running, once it is started, it process all commands written to GA socket. --- diff to v1: - don't keep list of issued IDs because it's pointless Some background on this: I've intended to switch to new guest-sync-delimited and use older guest-sync for older GA. However, since we don't use stream base implementation but use new line as delimiter for GA responses we don't need GA to issue sentinel byte 0xFF for us: http://wiki.qemu.org/Features/QAPI/GuestAgent#QEMU_Guest_Agent_Protocol Moreover, since we are using guest-sync just for detecting GA, it is not necessary to use sentinel byte at all: http://lists.nongnu.org/archive/html/qemu-devel/2012-03/msg03278.html src/qemu/qemu_agent.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 128 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index a17d025..ee82fae 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -39,6 +39,7 @@ #include "virterror_internal.h" #include "json.h" #include "virfile.h" +#include "virtime.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -316,6 +317,7 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, { virJSONValuePtr obj = NULL; int ret = -1; + unsigned long long id; VIR_DEBUG("Line [%s]", line); @@ -340,6 +342,20 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, obj = NULL; ret = 0; } else { + /* If we've received something like: + * {"return": 1234} + * it is likely that somebody started GA + * which is now processing our previous + * guest-sync commands. Check if this is + * the case and don't report an error but + * return silently. + */ + if (virJSONValueObjectGetNumberUlong(obj, "return", &id) == 0) { + VIR_DEBUG("Ignoring delayed reply to guest-sync: %llu", id); + ret = 0; + goto cleanup; + } + qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected JSON reply '%s'"), line); } @@ -813,11 +829,28 @@ void qemuAgentClose(qemuAgentPtr mon) qemuAgentUnlock(mon); } +#define QEMU_AGENT_WAIT_TIME (1000ull * 5) +/** + * qemuAgentSend: + * @mon: Monitor + * @msg: Message + * @timeout: use timeout? + * + * Send @msg to agent @mon. + * Wait max QEMU_AGENT_WAIT_TIME for agent + * to reply. + * + * Returns: 0 on success, + * -2 on timeout, + * -1 otherwise + */ static int qemuAgentSend(qemuAgentPtr mon, - qemuAgentMessagePtr msg) + qemuAgentMessagePtr msg, + bool timeout) { int ret = -1; + unsigned long long now, then; /* Check whether qemu quit unexpectedly */ if (mon->lastError.code != VIR_ERR_OK) { @@ -827,13 +860,26 @@ static int qemuAgentSend(qemuAgentPtr mon, return -1; } + if (timeout) { + if (virTimeMillisNow(&now) < 0) + return -1; + then = now + QEMU_AGENT_WAIT_TIME; + } + mon->msg = msg; qemuAgentUpdateWatch(mon); while (!mon->msg->finished) { - if (virCondWait(&mon->notify, &mon->lock) < 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to wait on monitor condition")); + if ((timeout && virCondWaitUntil(&mon->notify, &mon->lock, then) < 0) || + (!timeout && virCondWait(&mon->notify, &mon->lock) < 0)) { + if (errno == ETIMEDOUT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Guest agent not available for now")); + ret = -2; + } else { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to wait on monitor condition")); + } goto cleanup; } } @@ -855,6 +901,78 @@ cleanup: } +/** + * qemuAgentGuestSync: + * @mon: Monitor + * + * Send guest-sync with unique ID + * and wait for reply. If we get one, check if + * received ID is equal to given. + * + * Returns: 0 on success, + * -1 otherwise + */ +static int +qemuAgentGuestSync(qemuAgentPtr mon) +{ + int ret = -1; + int send_ret; + unsigned long long id, id_ret; + qemuAgentMessage sync_msg; + + memset(&sync_msg, 0, sizeof sync_msg); + + if (virTimeMillisNow(&id) < 0) + return -1; + + if (virAsprintf(&sync_msg.txBuffer, + "{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}", id) < 0) { + virReportOOMError(); + return -1; + } + + sync_msg.txLength = strlen(sync_msg.txBuffer); + + VIR_DEBUG("Sending guest-sync command with ID: %llu", id); + + send_ret = qemuAgentSend(mon, &sync_msg, true); + + VIR_DEBUG("qemuAgentSend returned: %d", send_ret); + + if (send_ret < 0) { + /* error reported */ + goto cleanup; + } + + if (!sync_msg.rxObject) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing monitor reply object")); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(sync_msg.rxObject, + "return", &id_ret) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed return value")); + goto cleanup; + } + + VIR_DEBUG("Guest returned ID: %llu", id_ret); + if (id_ret != id) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Guest agent returned ID: %llu instead of %llu"), + id_ret, id); + goto cleanup; + } + ret = 0; + +cleanup: + virJSONValueFree(sync_msg.rxObject); + VIR_FREE(sync_msg.txBuffer); + return ret; +} + static int qemuAgentCommand(qemuAgentPtr mon, virJSONValuePtr cmd, @@ -866,6 +984,11 @@ qemuAgentCommand(qemuAgentPtr mon, *reply = NULL; + if (qemuAgentGuestSync(mon) < 0) { + /* helper reported the error */ + return -1; + } + memset(&msg, 0, sizeof msg); if (!(cmdstr = virJSONValueToString(cmd))) { @@ -880,12 +1003,11 @@ qemuAgentCommand(qemuAgentPtr mon, VIR_DEBUG("Send command '%s' for write", cmdstr); - ret = qemuAgentSend(mon, &msg); + ret = qemuAgentSend(mon, &msg, false); VIR_DEBUG("Receive command reply ret=%d rxObject=%p", ret, msg.rxObject); - if (ret == 0) { if (!msg.rxObject) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.7.8.5

2 2

[libvirt] [ANNOUNCE] libvirt-glib 0.0.7 release
by Daniel P. Berrange 30 Mar '12

30 Mar '12

am pleased to announce that a new release of the libvirt-glib package, version 0.0.7 is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Fix typo in filesystem access mode constant - Remove incorrect encoding of XML attributes - Add support for USB redirection devices - Add support for SPICE agent device - Fix typo in channel device target constant - Make all string getters return a const string - Keep list of devices sorted in original XML order libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable, for the first few releases, we are *NOT* guaranteeing that libvirt-glib libraries are API/ABI stable. ABI stability will only be guaranteed once the bulk of the APIs have been fleshed out and proved in non-trivial application usage. We anticipate this will be within the next 6 months in order to line up with Fedora 17. Follow up comments about libvirt-glib should be directed to the regular libvir-list redhat com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] virnetdevtap: Don't check for flags in virNetDevTapCreateFlags
by Michal Privoznik 30 Mar '12

30 Mar '12

With latest gnulib we are checking even the lowest level functions whether they check flags. Moreover, we are shadowing the real error on system without TUNSETIFF support. --- cfg.mk | 2 +- src/util/virnetdevtap.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index c3de533..d44c8d2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -741,7 +741,7 @@ exclude_file_name_regexp--sc_avoid_write = \ exclude_file_name_regexp--sc_bindtextdomain = ^(tests|examples)/ -exclude_file_name_regexp--sc_flags_usage = ^docs/ +exclude_file_name_regexp--sc_flags_usage = ^(docs/|src/util/virnetdevtap\.c$$) exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \ ^src/rpc/gendispatch\.pl$$ diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 717b6ac..54f76bd 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -129,14 +129,12 @@ virNetDevProbeVnetHdr(int tapfd) */ int virNetDevTapCreate(char **ifname, int *tapfd, - unsigned int flags) + unsigned int flags ATTRIBUTE_UNUSED) { int fd; struct ifreq ifr; int ret = -1; - virCheckFlags(VIR_NETDEV_TAP_CREATE_VNET_HDR, -1); - if ((fd = open("/dev/net/tun", O_RDWR)) < 0) { virReportSystemError(errno, "%s", _("Unable to open /dev/net/tun, is tun module loaded?")); @@ -241,7 +239,6 @@ int virNetDevTapCreate(char **ifname ATTRIBUTE_UNUSED, int *tapfd ATTRIBUTE_UNUSED, unsigned int flags) { - virCheckFlags(0, -1); virReportSystemError(ENOSYS, "%s", _("Unable to create TAP devices on this platform")); return -1; -- 1.7.8.5

2 2

[libvirt] [PATCH] conf: Prevent crash of libvirtd without channel target name
by Alex Jia 30 Mar '12

30 Mar '12

* src/conf/domain_conf.c (virDomainChannelDefCheckABIStability): avoid crashing libvirtd due to derefing a NULL pointer. For details, please see bug: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=808371 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 24e10e6..4caef6f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9597,10 +9597,10 @@ static bool virDomainChannelDefCheckABIStability(virDomainChrDefPtr src, switch (src->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (STRNEQ(src->target.name, dst->target.name)) { + if (STRNEQ_NULLABLE(src->target.name, dst->target.name)) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target channel name %s does not match source %s"), - dst->target.name, src->target.name); + NULLSTR(dst->target.name), NULLSTR(src->target.name)); goto cleanup; } break; -- 1.7.1

2 2

[libvirt] [PATCH] build: silence recent syntax check violations
by Eric Blake 30 Mar '12

30 Mar '12

An upstream gnulib bug meant that some of our syntax checks weren't being run. Fix up our offenders before we upgrade to a newer gnulib. * src/util/virnetdevtap.c (virNetDevTapCreate): Use flags. * tests/lxcxml2xmltest.c (mymain): Strip useless (). --- The gnulib bug was here: https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00194.html I tested this by temporarily using the fixed gnulib maint.mk. Pushing under the trivial rule. I can't call it a build breaker, because it won't break the build without a gnulib update. I'm reluctant to update the .gnulib submodule this late in the game without some review, as we've had bad luck with a submodule update after the rc1 build in previous releases, so I'm saving that for another day. Besides, I'm waiting for a review of a patch that fixes ssize_t for mingw, and it isn't worth a gnulib update without that fix. src/util/virnetdevtap.c | 7 +++++-- tests/lxcxml2xmltest.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 0b3ac46..717b6ac 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -129,12 +129,14 @@ virNetDevProbeVnetHdr(int tapfd) */ int virNetDevTapCreate(char **ifname, int *tapfd, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int flags) { int fd; struct ifreq ifr; int ret = -1; + virCheckFlags(VIR_NETDEV_TAP_CREATE_VNET_HDR, -1); + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) { virReportSystemError(errno, "%s", _("Unable to open /dev/net/tun, is tun module loaded?")); @@ -237,8 +239,9 @@ cleanup: #else /* ! TUNSETIFF */ int virNetDevTapCreate(char **ifname ATTRIBUTE_UNUSED, int *tapfd ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int flags) { + virCheckFlags(0, -1); virReportSystemError(ENOSYS, "%s", _("Unable to create TAP devices on this platform")); return -1; diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 558bd01..6a87939 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -99,7 +99,7 @@ mymain(void) int ret = 0; if ((caps = testLXCCapsInit()) == NULL) - return (EXIT_FAILURE); + return EXIT_FAILURE; # define DO_TEST_FULL(name, is_different, inactive) \ do { \ @@ -124,7 +124,7 @@ mymain(void) virCapabilitiesFree(caps); - return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); + return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } VIRT_TEST_MAIN(mymain) -- 1.7.7.6

2 1

[libvirt] [PATCH] build: avoid 'devname' for BSD
by Eric Blake 30 Mar '12

30 Mar '12

Commit 21b5daa1 was the last time we cleaned this up. * tools/virt-host-validate-common.c (virHostValidateDevice): Rename local variable. --- Pushing under the build-breaker rule. I considered adding a syntax-check rule to catch this, but we use 'devname' in enough other places where the name pollution was not happening as to make writing a rule difficult. tools/virt-host-validate-common.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index bd118be..066343c 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -113,13 +113,13 @@ void virHostMsgFail(virHostValidateLevel level, int virHostValidateDevice(const char *hvname, - const char *devname, + const char *dev_name, virHostValidateLevel level, const char *hint) { - virHostMsgCheck(hvname, "for device %s", devname); + virHostMsgCheck(hvname, "for device %s", dev_name); - if (access(devname, R_OK|W_OK) < 0) { + if (access(dev_name, R_OK|W_OK) < 0) { virHostMsgFail(level, hint); return -1; } -- 1.7.7.6

1 0

[libvirt] Syntax check rules broken if 'exclude' is not defined
by Daniel P. Berrange 29 Mar '12

29 Mar '12

I noticed that many (most) of the libvirt syntax-check rules were not generating any results, despite me introducing obvious violations. >From my debugging the problem appears to be caused by this commit: commit 727075d03c670affa68f71313979781f5ba9bbfc Author: Eric Blake <eblake(a)redhat.com> Date: Thu Mar 1 14:51:31 2012 -0700 maint.mk: add per-line exclusions to prohibitions If I revert the following hunk from maint.mk @@ -258,6 +268,7 @@ define _sc_search_regexp if test -n "$$files"; then \ if test -n "$$prohibit"; then \ grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \ + | grep -vE "$${exclude-^$$}" \ && { msg="$$halt" $(_sc_say_and_exit) } || :; \ else \ grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \ then the syntax-check rules work again. It seems that this grep is broken, if a test leaves $exclude undefined, causing it to filter out all results. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 1

[libvirt] [PATCH] Consistent style for usage of sizeof operator
by Daniel P. Berrange 29 Mar '12

29 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The code is splattered with a mix of sizeof foo sizeof (foo) sizeof(foo) Standardize on sizeof(foo) and add a syntax check rule to enforce it --- cfg.mk | 4 + daemon/libvirtd.c | 2 +- daemon/remote.c | 32 ++++---- examples/domain-events/events-c/event-test.c | 2 +- src/esx/esx_driver.c | 14 ++-- src/esx/esx_storage_driver.c | 14 ++-- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 2 +- src/esx/esx_vi_types.c | 2 +- src/hyperv/hyperv_driver.c | 6 +- src/internal.h | 4 +- src/libvirt.c | 10 ++- src/libxl/libxl_driver.c | 8 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_driver.c | 4 +- src/node_device/node_device_udev.c | 2 +- src/nodeinfo.c | 4 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_driver.c | 20 +++--- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_text.c | 2 +- src/qemu/qemu_process.c | 16 ++-- src/remote/remote_driver.c | 96 +++++++++++++------------- src/rpc/gendispatch.pl | 8 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetsaslcontext.c | 2 +- src/rpc/virnetsocket.c | 12 ++-- src/security/virt-aa-helper.c | 6 +- src/storage/storage_backend_iscsi.c | 4 +- src/storage/storage_driver.c | 2 +- src/uml/uml_driver.c | 14 ++-- src/util/buf.h | 2 +- src/util/command.c | 2 +- src/util/ebtables.c | 2 +- src/util/memory.h | 4 +- src/util/pci.c | 2 +- src/util/stats_linux.c | 2 +- src/util/storage_file.c | 2 +- src/util/util.c | 4 +- src/util/uuid.c | 2 +- src/util/viraudit.c | 2 +- src/util/virauth.c | 4 +- src/util/virnetdevmacvlan.c | 4 +- src/util/virpidfile.c | 2 +- src/util/virterror.c | 2 +- src/vbox/vbox_MSCOMGlue.c | 4 +- src/vbox/vbox_tmpl.c | 8 +- src/xen/block_stats.c | 6 +- src/xen/xen_hypervisor.c | 22 +++--- src/xen/xend_internal.c | 6 +- src/xenapi/xenapi_utils.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/virnetsockettest.c | 2 +- tools/virsh.c | 14 ++-- 56 files changed, 209 insertions(+), 203 deletions(-) diff --git a/cfg.mk b/cfg.mk index 2cb066e..9a32ce1 100644 --- a/cfg.mk +++ b/cfg.mk @@ -813,3 +813,7 @@ exclude_file_name_regexp--sc_trailing_blank = \.(fig|gif|ico|png)$$ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test)$$ + +exclude_file_name_regexp--sc_size_of_brackets = cfg.mk + +exclude_file_name_regexp--sc_const_long_option = tools/virt-host-validate.c diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 44fb363..af07e84 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1441,7 +1441,7 @@ int main(int argc, char **argv) { if ((statuswrite = daemonForkIntoBackground(argv[0])) < 0) { VIR_ERROR(_("Failed to fork as daemon: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); goto cleanup; } } diff --git a/daemon/remote.c b/daemon/remote.c index 4fd676d..b71ffa2 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -132,7 +132,7 @@ static int remoteRelayDomainEventLifecycle(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_DEBUG("Relaying domain lifecycle event %d %d", event, detail); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); make_nonnull_domain(&data.dom, dom); data.event = event; data.detail = detail; @@ -157,7 +157,7 @@ static int remoteRelayDomainEventReboot(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_DEBUG("Relaying domain reboot event %s %d", dom->name, dom->id); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); make_nonnull_domain(&data.dom, dom); remoteDispatchDomainEventSend(client, remoteProgram, @@ -182,7 +182,7 @@ static int remoteRelayDomainEventRTCChange(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_DEBUG("Relaying domain rtc change event %s %d %lld", dom->name, dom->id, offset); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); make_nonnull_domain(&data.dom, dom); data.offset = offset; @@ -208,7 +208,7 @@ static int remoteRelayDomainEventWatchdog(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_DEBUG("Relaying domain watchdog event %s %d %d", dom->name, dom->id, action); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); make_nonnull_domain(&data.dom, dom); data.action = action; @@ -236,7 +236,7 @@ static int remoteRelayDomainEventIOError(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_DEBUG("Relaying domain io error %s %d %s %s %d", dom->name, dom->id, srcPath, devAlias, action); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); data.srcPath = strdup(srcPath); if (data.srcPath == NULL) goto mem_error; @@ -277,7 +277,7 @@ static int remoteRelayDomainEventIOErrorReason(virConnectPtr conn ATTRIBUTE_UNUS dom->name, dom->id, srcPath, devAlias, action, reason); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); data.srcPath = strdup(srcPath); if (data.srcPath == NULL) goto mem_error; @@ -333,7 +333,7 @@ static int remoteRelayDomainEventGraphics(virConnectPtr conn ATTRIBUTE_UNUSED, } /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); data.phase = phase; data.local.family = local->family; data.remote.family = remote->family; @@ -409,7 +409,7 @@ static int remoteRelayDomainEventBlockJob(virConnectPtr conn ATTRIBUTE_UNUSED, dom->name, dom->id, path, type, status); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); data.path = strdup(path); if (data.path == NULL) goto mem_error; @@ -443,7 +443,7 @@ static int remoteRelayDomainEventControlError(virConnectPtr conn ATTRIBUTE_UNUSE VIR_DEBUG("Relaying domain control error %s %d", dom->name, dom->id); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); make_nonnull_domain(&data.dom, dom); remoteDispatchDomainEventSend(client, remoteProgram, @@ -473,7 +473,7 @@ static int remoteRelayDomainEventDiskChange(virConnectPtr conn ATTRIBUTE_UNUSED, dom->name, dom->id, oldSrcPath, newSrcPath, devAlias, reason); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); if (oldSrcPath && ((VIR_ALLOC(oldSrcPath_p) < 0) || !(*oldSrcPath_p = strdup(oldSrcPath)))) @@ -521,7 +521,7 @@ static int remoteRelayDomainEventTrayChange(virConnectPtr conn ATTRIBUTE_UNUSED, dom->name, dom->id, devAlias, reason); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); if (!(data.devAlias = strdup(devAlias))) { virReportOOMError(); @@ -550,7 +550,7 @@ static int remoteRelayDomainEventPMWakeup(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_DEBUG("Relaying domain %s %d system pmwakeup", dom->name, dom->id); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); make_nonnull_domain(&data.dom, dom); remoteDispatchDomainEventSend(client, remoteProgram, @@ -572,7 +572,7 @@ static int remoteRelayDomainEventPMSuspend(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_DEBUG("Relaying domain %s %d system pmsuspend", dom->name, dom->id); /* build return data */ - memset(&data, 0, sizeof data); + memset(&data, 0, sizeof(data)); make_nonnull_domain(&data.dom, dom); remoteDispatchDomainEventSend(client, remoteProgram, @@ -1357,7 +1357,7 @@ remoteDispatchNodeGetSecurityModel(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; } - memset(&secmodel, 0, sizeof secmodel); + memset(&secmodel, 0, sizeof(secmodel)); if (virNodeGetSecurityModel(priv->conn, &secmodel) < 0) goto cleanup; @@ -2710,7 +2710,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, if (!(pkaction = polkit_action_new())) { char ebuf[1024]; VIR_ERROR(_("Failed to create polkit action %s"), - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); polkit_caller_unref(pkcaller); goto authfail; } @@ -2721,7 +2721,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, char ebuf[1024]; VIR_ERROR(_("Failed to create polkit context %s"), (pkerr ? polkit_error_get_error_message(pkerr) - : virStrerror(errno, ebuf, sizeof ebuf))); + : virStrerror(errno, ebuf, sizeof(ebuf)))); if (pkerr) polkit_error_free(pkerr); polkit_caller_unref(pkcaller); diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 5a6ef1d..c54778f 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -393,7 +393,7 @@ int main(int argc, char **argv) int callback12ret = -1; struct sigaction action_stop; - memset(&action_stop, 0, sizeof action_stop); + memset(&action_stop, 0, sizeof(action_stop)); action_stop.sa_handler = stop; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 6962832..dff8aa6 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1360,7 +1360,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) int32_t numaInfo_numNodes = 0; char *ptr = NULL; - memset(nodeinfo, 0, sizeof (*nodeinfo)); + memset(nodeinfo, 0, sizeof(*nodeinfo)); if (esxVI_EnsureSession(priv->primary) < 0) { return -1; @@ -2286,7 +2286,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) esxVI_Long *value = NULL; #endif - memset(info, 0, sizeof (*info)); + memset(info, 0, sizeof(*info)); if (esxVI_EnsureSession(priv->primary) < 0) { return -1; @@ -2763,7 +2763,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) /* Flags checked by virDomainDefFormat */ - memset(&data, 0, sizeof (data)); + memset(&data, 0, sizeof(data)); if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -2870,7 +2870,7 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, virCheckFlags(0, NULL); - memset(&data, 0, sizeof (data)); + memset(&data, 0, sizeof(data)); if (STRNEQ(nativeFormat, "vmware-vmx")) { ESX_ERROR(VIR_ERR_INVALID_ARG, @@ -2913,7 +2913,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, virCheckFlags(0, NULL); - memset(&data, 0, sizeof (data)); + memset(&data, 0, sizeof(data)); if (STRNEQ(nativeFormat, "vmware-vmx")) { ESX_ERROR(VIR_ERR_INVALID_ARG, @@ -3137,7 +3137,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) char *taskInfoErrorMessage = NULL; virDomainPtr domain = NULL; - memset(&data, 0, sizeof (data)); + memset(&data, 0, sizeof(data)); if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -4344,7 +4344,7 @@ esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, virCheckFlags(0, NULL); - memset(&def, 0, sizeof (def)); + memset(&def, 0, sizeof(def)); if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 96ef59a..adf1edb 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -407,7 +407,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_Boolean accessible = esxVI_Boolean_Undefined; - memset(info, 0, sizeof (*info)); + memset(info, 0, sizeof(*info)); if (esxVI_EnsureSession(priv->primary) < 0) { return -1; @@ -479,7 +479,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) virCheckFlags(0, NULL); - memset(&def, 0, sizeof (def)); + memset(&def, 0, sizeof(def)); if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -977,7 +977,7 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc, virCheckFlags(0, NULL); - memset(&poolDef, 0, sizeof (poolDef)); + memset(&poolDef, 0, sizeof(poolDef)); if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -1205,7 +1205,7 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, virCheckFlags(0, NULL); - memset(&poolDef, 0, sizeof (poolDef)); + memset(&poolDef, 0, sizeof(poolDef)); if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -1483,7 +1483,7 @@ esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) esxVI_FileInfo *fileInfo = NULL; esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; - memset(info, 0, sizeof (*info)); + memset(info, 0, sizeof(*info)); if (esxVI_EnsureSession(priv->primary) < 0) { return -1; @@ -1538,8 +1538,8 @@ esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags) virCheckFlags(0, NULL); - memset(&pool, 0, sizeof (pool)); - memset(&def, 0, sizeof (def)); + memset(&pool, 0, sizeof(pool)); + memset(&def, 0, sizeof(def)); if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index a08ca19..478f60b 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -339,7 +339,7 @@ esxUtil_ResolveHostname(const char *hostname, struct addrinfo *result = NULL; int errcode; - memset(&hints, 0, sizeof (hints)); + memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_ADDRCONFIG; hints.ai_family = AF_INET; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 6004aac..42e0976 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4089,7 +4089,7 @@ esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, const char *name[4] = { "eax", "ebx", "ecx", "edx" }; int r, i, o; - memset(parsedHostCpuIdInfo, 0, sizeof (*parsedHostCpuIdInfo)); + memset(parsedHostCpuIdInfo, 0, sizeof(*parsedHostCpuIdInfo)); parsedHostCpuIdInfo->level = hostCpuIdInfo->level->value; diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 2332fde..bcc310f 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -43,7 +43,7 @@ int \ esxVI_##__type##_Alloc(esxVI_##__type **ptrptr) \ { \ - if (esxVI_Alloc((void **)ptrptr, sizeof (esxVI_##__type)) < 0) { \ + if (esxVI_Alloc((void **)ptrptr, sizeof(esxVI_##__type)) < 0) { \ return -1; \ } \ \ diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 05fce4f..3b15292 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -286,7 +286,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) Win32_Processor *processor = NULL; char *tmp; - memset(info, 0, sizeof (*info)); + memset(info, 0, sizeof(*info)); virBufferAddLit(&query, WIN32_COMPUTERSYSTEM_WQL_SELECT); @@ -341,7 +341,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) /* Fill struct */ if (virStrncpy(info->model, processorList->data->Name, - sizeof (info->model) - 1, sizeof (info->model)) == NULL) { + sizeof(info->model) - 1, sizeof(info->model)) == NULL) { HYPERV_ERROR(VIR_ERR_INTERNAL_ERROR, _("CPU model %s too long for destination"), processorList->data->Name); @@ -679,7 +679,7 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) Msvm_ProcessorSettingData *processorSettingData = NULL; Msvm_MemorySettingData *memorySettingData = NULL; - memset(info, 0, sizeof (*info)); + memset(info, 0, sizeof(*info)); virUUIDFormat(domain->uuid, uuid_string); diff --git a/src/internal.h b/src/internal.h index 3408541..ef81cda 100644 --- a/src/internal.h +++ b/src/internal.h @@ -83,7 +83,7 @@ # define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) -# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) +# define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array))) /* C99 uses __func__. __FUNCTION__ is legacy. */ # ifndef __GNUC__ @@ -205,7 +205,7 @@ * Use this when passing possibly-NULL strings to printf-a-likes. */ # define NULLSTR(s) \ - ((void)verify_true(sizeof *(s) == sizeof (char)), \ + ((void)verify_true(sizeof(*(s)) == sizeof(char)), \ (s) ? (s) : "(null)") /** diff --git a/src/libvirt.c b/src/libvirt.c index 53b485a..8bca16d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -45,6 +45,8 @@ #include "virrandom.h" #include "viruri.h" +#include <ctype.h> + #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST # include "test/test_driver.h" @@ -7165,7 +7167,7 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, virDispatchError(NULL); return -1; } - if (!disk || !stats || size > sizeof stats2) { + if (!disk || !stats || size > sizeof(stats2)) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -7305,7 +7307,7 @@ virDomainInterfaceStats (virDomainPtr dom, const char *path, virDispatchError(NULL); return -1; } - if (!path || !stats || size > sizeof stats2) { + if (!path || !stats || size > sizeof(stats2)) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -18625,13 +18627,13 @@ error: * * getting total stats: set start_cpu as -1, ncpus 1 * virDomainGetCPUStats(dom, NULL, 0, -1, 1, 0) => nparams - * params = calloc(nparams, sizeof (virTypedParameter)) + * params = calloc(nparams, sizeof(virTypedParameter)) * virDomainGetCPUStats(dom, params, nparams, -1, 1, 0) => total stats. * * getting per-cpu stats: * virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0) => ncpus * virDomainGetCPUStats(dom, NULL, 0, 0, 1, 0) => nparams - * params = calloc(ncpus * nparams, sizeof (virTypedParameter)) + * params = calloc(ncpus * nparams, sizeof(virTypedParameter)) * virDomainGetCPUStats(dom, params, nparams, 0, ncpus, 0) => per-cpu stats * * Returns -1 on failure, or the number of statistics that were diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index fb18948..45bf1f8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -895,22 +895,22 @@ libxlStartup(int privileged) { if (virFileMakePath(libxl_driver->logDir) < 0) { VIR_ERROR(_("Failed to create log dir '%s': %s"), - libxl_driver->logDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->logDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(libxl_driver->stateDir) < 0) { VIR_ERROR(_("Failed to create state dir '%s': %s"), - libxl_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->stateDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(libxl_driver->libDir) < 0) { VIR_ERROR(_("Failed to create lib dir '%s': %s"), - libxl_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->libDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(libxl_driver->saveDir) < 0) { VIR_ERROR(_("Failed to create save dir '%s': %s"), - libxl_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->saveDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 0755b3c..9bb6218 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1517,7 +1517,7 @@ int lxcContainerAvailable(int features) if (cpid < 0) { char ebuf[1024] ATTRIBUTE_UNUSED; VIR_DEBUG("clone call returned %s, container support is not enabled", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } else if (virPidWait(cpid, NULL) < 0) { return -1; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3ead648..909b8e8 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1897,7 +1897,7 @@ static int lxcVmStart(virConnectPtr conn, if (safewrite(logfd, timestamp, strlen(timestamp)) < 0 || safewrite(logfd, START_POSTFIX, strlen(START_POSTFIX)) < 0) { VIR_WARN("Unable to write timestamp to logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); } VIR_FREE(timestamp); @@ -1905,7 +1905,7 @@ static int lxcVmStart(virConnectPtr conn, virCommandWriteArgLog(cmd, logfd); if ((pos = lseek(logfd, 0, SEEK_END)) < 0) VIR_WARN("Unable to seek to end of logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); if (virCommandRun(cmd, NULL) < 0) goto cleanup; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 9112c96..438c2eb 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1623,7 +1623,7 @@ static int udevDeviceMonitorStartup(int privileged) if (errno != ENOENT && (privileged || errno != EACCES)) { char ebuf[256]; VIR_ERROR(_("Failed to initialize libpciaccess: %s"), - virStrerror(pciret, ebuf, sizeof ebuf)); + virStrerror(pciret, ebuf, sizeof(ebuf))); ret = -1; goto out; } diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 61a5925..26f8dc1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -803,9 +803,9 @@ nodeCapsInitNUMA(virCapsPtr caps) return 0; int mask_n_bytes = max_n_cpus / 8; - if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof *mask) < 0) + if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof(*mask)) < 0) goto cleanup; - if (VIR_ALLOC_N(allonesmask, mask_n_bytes / sizeof *mask) < 0) + if (VIR_ALLOC_N(allonesmask, mask_n_bytes / sizeof(*mask)) < 0) goto cleanup; memset(allonesmask, 0xff, mask_n_bytes); diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index a17d025..79704bc 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -866,7 +866,7 @@ qemuAgentCommand(qemuAgentPtr mon, *reply = NULL; - memset(&msg, 0, sizeof msg); + memset(&msg, 0, sizeof(msg)); if (!(cmdstr = virJSONValueToString(cmd))) { virReportOOMError(); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d3b0bd..7e6d59c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -550,32 +550,32 @@ qemudStartup(int privileged) { if (virFileMakePath(qemu_driver->stateDir) < 0) { VIR_ERROR(_("Failed to create state dir '%s': %s"), - qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(qemu_driver->libDir) < 0) { VIR_ERROR(_("Failed to create lib dir '%s': %s"), - qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->libDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(qemu_driver->cacheDir) < 0) { VIR_ERROR(_("Failed to create cache dir '%s': %s"), - qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(qemu_driver->saveDir) < 0) { VIR_ERROR(_("Failed to create save dir '%s': %s"), - qemu_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->saveDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(qemu_driver->snapshotDir) < 0) { VIR_ERROR(_("Failed to create save dir '%s': %s"), - qemu_driver->snapshotDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->snapshotDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } if (virFileMakePath(qemu_driver->autoDumpPath) < 0) { VIR_ERROR(_("Failed to create dump dir '%s': %s"), - qemu_driver->autoDumpPath, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->autoDumpPath, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } @@ -4591,7 +4591,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, virDomainActualNetDefFree(net->data.network.actual); - memset(net, 0, sizeof *net); + memset(net, 0, sizeof(*net)); net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = NULL; @@ -4602,7 +4602,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, * case, the best we can do is NULL everything out. */ virDomainActualNetDefFree(net->data.network.actual); - memset(net, 0, sizeof *net); + memset(net, 0, sizeof(*net)); net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = NULL; @@ -4613,7 +4613,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, VIR_FREE(net->data.direct.linkdev); VIR_FREE(net->data.direct.virtPortProfile); - memset(net, 0, sizeof *net); + memset(net, 0, sizeof(*net)); net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = NULL; @@ -4624,7 +4624,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, char *brname = net->data.bridge.brname; char *ipaddr = net->data.bridge.ipaddr; - memset(net, 0, sizeof *net); + memset(net, 0, sizeof(*net)); net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = script; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 38163ba..55ec547 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2241,11 +2241,11 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, if (auth->expires) { time_t lifetime = auth->validTo - now; if (lifetime <= 0) - snprintf(expire_time, sizeof (expire_time), "now"); + snprintf(expire_time, sizeof(expire_time), "now"); else - snprintf(expire_time, sizeof (expire_time), "%lu", (long unsigned)auth->validTo); + snprintf(expire_time, sizeof(expire_time), "%lu", (long unsigned)auth->validTo); } else { - snprintf(expire_time, sizeof (expire_time), "never"); + snprintf(expire_time, sizeof(expire_time), "never"); } ret = qemuMonitorExpirePassword(priv->mon, type, expire_time); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 49a260d..ff6f273 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1522,7 +1522,7 @@ qemuMigrationPrepareDirect(struct qemud_driver *driver, VIR_DEBUG("Generated uri_out=%s", *uri_out); /* QEMU will be started with -incoming tcp:0.0.0.0:port */ - snprintf(migrateFrom, sizeof (migrateFrom), "tcp:0.0.0.0:%d", this_port); + snprintf(migrateFrom, sizeof(migrateFrom), "tcp:0.0.0.0:%d", this_port); ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8c028b9..7093e1d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -214,7 +214,7 @@ qemuMonitorJSONCommandWithFd(qemuMonitorPtr mon, *reply = NULL; - memset(&msg, 0, sizeof msg); + memset(&msg, 0, sizeof(msg)); exe = virJSONValueObjectGet(cmd, "execute"); if (exe) { diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 30a0416..9e2991b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -226,7 +226,7 @@ qemuMonitorTextCommandWithHandler(qemuMonitorPtr mon, *reply = NULL; - memset(&msg, 0, sizeof msg); + memset(&msg, 0, sizeof(msg)); if (virAsprintf(&msg.txBuffer, "%s\r", cmd) < 0) { virReportOOMError(); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 060e091..7725563 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1598,7 +1598,7 @@ closelog: if (VIR_CLOSE(logfd) < 0) { char ebuf[1024]; VIR_WARN("Unable to close logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); } VIR_FREE(buf); @@ -3523,7 +3523,7 @@ int qemuProcessStart(virConnectPtr conn, if (safewrite(logfile, timestamp, strlen(timestamp)) < 0 || safewrite(logfile, START_POSTFIX, strlen(START_POSTFIX)) < 0) { VIR_WARN("Unable to write timestamp to logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); } VIR_FREE(timestamp); @@ -3535,7 +3535,7 @@ int qemuProcessStart(virConnectPtr conn, if ((pos = lseek(logfile, 0, SEEK_END)) < 0) VIR_WARN("Unable to seek to end of logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); VIR_DEBUG("Clear emulator capabilities: %d", driver->clearEmulatorCapabilities); @@ -3794,7 +3794,7 @@ qemuProcessKill(struct qemud_driver *driver, char ebuf[1024]; VIR_WARN("Failed to terminate process %d with SIG%s: %s", vm->pid, signame, - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); goto cleanup; } ret = 0; @@ -3864,7 +3864,7 @@ void qemuProcessStop(struct qemud_driver *driver, /* To not break the normal domain shutdown process, skip the * timestamp log writing if failed on opening log file. */ VIR_WARN("Unable to open logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); } else { if ((timestamp = virTimeStringNow()) == NULL) { virReportOOMError(); @@ -3873,7 +3873,7 @@ void qemuProcessStop(struct qemud_driver *driver, safewrite(logfile, SHUTDOWN_POSTFIX, strlen(SHUTDOWN_POSTFIX)) < 0) { VIR_WARN("Unable to write timestamp to logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); } VIR_FREE(timestamp); @@ -3881,7 +3881,7 @@ void qemuProcessStop(struct qemud_driver *driver, if (VIR_CLOSE(logfile) < 0) VIR_WARN("Unable to close logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); } /* This method is routinely used in clean up paths. Disable error @@ -4160,7 +4160,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, if (safewrite(logfile, timestamp, strlen(timestamp)) < 0 || safewrite(logfile, ATTACH_POSTFIX, strlen(ATTACH_POSTFIX)) < 0) { VIR_WARN("Unable to write timestamp to logfile: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); } VIR_FREE(timestamp); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 30ca6a5..7ebc916 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -719,7 +719,7 @@ doRemoteOpen (virConnectPtr conn, remote_get_uri_ret uriret; VIR_DEBUG("Trying to query remote URI"); - memset (&uriret, 0, sizeof uriret); + memset (&uriret, 0, sizeof(uriret)); if (call (conn, priv, 0, REMOTE_PROC_GET_URI, (xdrproc_t) xdr_void, (char *) NULL, @@ -974,7 +974,7 @@ remoteType (virConnectPtr conn) goto done; } - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_GET_TYPE, (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_remote_get_type_ret, (char *) &ret) == -1) @@ -995,7 +995,7 @@ static int remoteIsSecure(virConnectPtr conn) remote_is_secure_ret ret; remoteDriverLock(priv); - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_IS_SECURE, (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1) @@ -1024,7 +1024,7 @@ static int remoteIsEncrypted(virConnectPtr conn) remote_is_secure_ret ret; remoteDriverLock(priv); - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_IS_SECURE, (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1) @@ -1066,7 +1066,7 @@ remoteNodeGetCPUStats (virConnectPtr conn, args.cpuNum = cpuNum; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_CPU_STATS, (xdrproc_t) xdr_remote_node_get_cpu_stats_args, (char *) &args, @@ -1132,7 +1132,7 @@ remoteNodeGetMemoryStats (virConnectPtr conn, args.cellNum = cellNum; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_MEMORY_STATS, (xdrproc_t) xdr_remote_node_get_memory_stats_args, (char *) &args, (xdrproc_t) xdr_remote_node_get_memory_stats_ret, (char *) &ret) == -1) @@ -1202,7 +1202,7 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn, args.startCell = startCell; args.maxcells = maxCells; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY, (xdrproc_t) xdr_remote_node_get_cells_free_memory_args, (char *)&args, (xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) == -1) @@ -1239,7 +1239,7 @@ remoteListDomains (virConnectPtr conn, int *ids, int maxids) } args.maxids = maxids; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_LIST_DOMAINS, (xdrproc_t) xdr_remote_list_domains_args, (char *) &args, (xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret) == -1) @@ -1481,7 +1481,7 @@ remoteDomainBlockStatsFlags(virDomainPtr domain, args.path = (char *) path; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS, (xdrproc_t) xdr_remote_domain_block_stats_flags_args, (char *) &args, (xdrproc_t) xdr_remote_domain_block_stats_flags_ret, (char *) &ret) == -1) @@ -1541,7 +1541,7 @@ remoteDomainGetMemoryParameters (virDomainPtr domain, args.nparams = *nparams; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_MEMORY_PARAMETERS, (xdrproc_t) xdr_remote_domain_get_memory_parameters_args, (char *) &args, (xdrproc_t) xdr_remote_domain_get_memory_parameters_ret, (char *) &ret) == -1) @@ -1589,7 +1589,7 @@ remoteDomainGetNumaParameters (virDomainPtr domain, args.nparams = *nparams; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_NUMA_PARAMETERS, (xdrproc_t) xdr_remote_domain_get_numa_parameters_args, (char *) &args, (xdrproc_t) xdr_remote_domain_get_numa_parameters_ret, (char *) &ret) == -1) @@ -1637,7 +1637,7 @@ remoteDomainGetBlkioParameters (virDomainPtr domain, args.nparams = *nparams; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_BLKIO_PARAMETERS, (xdrproc_t) xdr_remote_domain_get_blkio_parameters_args, (char *) &args, (xdrproc_t) xdr_remote_domain_get_blkio_parameters_ret, (char *) &ret) == -1) @@ -1704,7 +1704,7 @@ remoteDomainGetVcpuPinInfo (virDomainPtr domain, args.maplen = maplen; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO, (xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_args, @@ -1775,7 +1775,7 @@ remoteDomainGetVcpus (virDomainPtr domain, args.maxinfo = maxinfo; args.maplen = maplen; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPUS, (xdrproc_t) xdr_remote_domain_get_vcpus_args, (char *) &args, (xdrproc_t) xdr_remote_domain_get_vcpus_ret, (char *) &ret) == -1) @@ -1794,7 +1794,7 @@ remoteDomainGetVcpus (virDomainPtr domain, goto cleanup; } - memset (info, 0, sizeof (virVcpuInfo) * maxinfo); + memset (info, 0, sizeof(virVcpuInfo) * maxinfo); memset (cpumaps, 0, maxinfo * maplen); for (i = 0; i < ret.info.info_len; ++i) { @@ -1828,8 +1828,8 @@ remoteDomainGetSecurityLabel (virDomainPtr domain, virSecurityLabelPtr seclabel) remoteDriverLock(priv); make_nonnull_domain (&args.dom, domain); - memset (&ret, 0, sizeof ret); - memset (seclabel, 0, sizeof (*seclabel)); + memset (&ret, 0, sizeof(ret)); + memset (seclabel, 0, sizeof(*seclabel)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SECURITY_LABEL, (xdrproc_t) xdr_remote_domain_get_security_label_args, (char *)&args, @@ -1838,9 +1838,9 @@ remoteDomainGetSecurityLabel (virDomainPtr domain, virSecurityLabelPtr seclabel) } if (ret.label.label_val != NULL) { - if (strlen (ret.label.label_val) >= sizeof seclabel->label) { + if (strlen (ret.label.label_val) >= sizeof(seclabel->label)) { remoteError(VIR_ERR_RPC, _("security label exceeds maximum: %zu"), - sizeof seclabel->label - 1); + sizeof(seclabel->label) - 1); goto cleanup; } strcpy (seclabel->label, ret.label.label_val); @@ -1873,7 +1873,7 @@ remoteDomainGetState(virDomainPtr domain, make_nonnull_domain(&args.dom, domain); args.flags = flags; - memset(&ret, 0, sizeof ret); + memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_STATE, (xdrproc_t) xdr_remote_domain_get_state_args, (char *) &args, (xdrproc_t) xdr_remote_domain_get_state_ret, (char *) &ret) == -1) @@ -1899,8 +1899,8 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel) remoteDriverLock(priv); - memset (&ret, 0, sizeof ret); - memset (secmodel, 0, sizeof (*secmodel)); + memset (&ret, 0, sizeof(ret)); + memset (secmodel, 0, sizeof(*secmodel)); if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_SECURITY_MODEL, (xdrproc_t) xdr_void, NULL, @@ -1909,18 +1909,18 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel) } if (ret.model.model_val != NULL) { - if (strlen (ret.model.model_val) >= sizeof secmodel->model) { + if (strlen (ret.model.model_val) >= sizeof(secmodel->model)) { remoteError(VIR_ERR_RPC, _("security model exceeds maximum: %zu"), - sizeof secmodel->model - 1); + sizeof(secmodel->model) - 1); goto cleanup; } strcpy (secmodel->model, ret.model.model_val); } if (ret.doi.doi_val != NULL) { - if (strlen (ret.doi.doi_val) >= sizeof secmodel->doi) { + if (strlen (ret.doi.doi_val) >= sizeof(secmodel->doi)) { remoteError(VIR_ERR_RPC, _("security doi exceeds maximum: %zu"), - sizeof secmodel->doi - 1); + sizeof(secmodel->doi) - 1); goto cleanup; } strcpy (secmodel->doi, ret.doi.doi_val); @@ -1955,7 +1955,7 @@ remoteDomainMigratePrepare (virConnectPtr dconn, args.dname = dname == NULL ? NULL : (char **) &dname; args.resource = resource; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE, (xdrproc_t) xdr_remote_domain_migrate_prepare_args, (char *) &args, (xdrproc_t) xdr_remote_domain_migrate_prepare_ret, (char *) &ret) == -1) @@ -1997,7 +1997,7 @@ remoteDomainMigratePrepare2 (virConnectPtr dconn, args.resource = resource; args.dom_xml = (char *) dom_xml; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE2, (xdrproc_t) xdr_remote_domain_migrate_prepare2_args, (char *) &args, (xdrproc_t) xdr_remote_domain_migrate_prepare2_ret, (char *) &ret) == -1) @@ -2058,7 +2058,7 @@ remoteDomainCreate (virDomainPtr domain) * it returned. */ memcpy (args2.uuid, domain->uuid, VIR_UUID_BUFLEN); - memset (&ret2, 0, sizeof ret2); + memset (&ret2, 0, sizeof(ret)2); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_LOOKUP_BY_UUID, (xdrproc_t) xdr_remote_domain_lookup_by_uuid_args, (char *) &args2, (xdrproc_t) xdr_remote_domain_lookup_by_uuid_ret, (char *) &ret2) == -1) @@ -2086,7 +2086,7 @@ remoteDomainGetSchedulerType (virDomainPtr domain, int *nparams) make_nonnull_domain (&args.dom, domain); - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SCHEDULER_TYPE, (xdrproc_t) xdr_remote_domain_get_scheduler_type_args, (char *) &args, (xdrproc_t) xdr_remote_domain_get_scheduler_type_ret, (char *) &ret) == -1) @@ -2125,7 +2125,7 @@ remoteDomainMemoryStats (virDomainPtr domain, } args.maxStats = nr_stats; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MEMORY_STATS, (xdrproc_t) xdr_remote_domain_memory_stats_args, @@ -2174,7 +2174,7 @@ remoteDomainBlockPeek (virDomainPtr domain, args.size = size; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_BLOCK_PEEK, (xdrproc_t) xdr_remote_domain_block_peek_args, (char *) &args, @@ -2225,7 +2225,7 @@ remoteDomainMemoryPeek (virDomainPtr domain, args.size = size; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MEMORY_PEEK, (xdrproc_t) xdr_remote_domain_memory_peek_args, (char *) &args, @@ -2569,7 +2569,7 @@ remoteFindStoragePoolSources (virConnectPtr conn, args.srcSpec = srcSpec ? (char **)&srcSpec : (char **)&emptyString; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_FIND_STORAGE_POOL_SOURCES, (xdrproc_t) xdr_remote_find_storage_pool_sources_args, (char *) &args, (xdrproc_t) xdr_remote_find_storage_pool_sources_ret, (char *) &ret) == -1) @@ -2700,7 +2700,7 @@ remoteAuthenticate (virConnectPtr conn, struct private_data *priv, struct remote_auth_list_ret ret; int err, type = REMOTE_AUTH_NONE; - memset(&ret, 0, sizeof ret); + memset(&ret, 0, sizeof(ret)); err = call (conn, priv, 0, REMOTE_PROC_AUTH_LIST, (xdrproc_t) xdr_void, (char *) NULL, @@ -3160,7 +3160,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, goto cleanup; /* First call is to inquire about supported mechanisms in the server */ - memset (&iret, 0, sizeof iret); + memset (&iret, 0, sizeof(iret)); if (call (conn, priv, 0, REMOTE_PROC_AUTH_SASL_INIT, (xdrproc_t) xdr_void, (char *)NULL, (xdrproc_t) xdr_remote_auth_sasl_init_ret, (char *) &iret) != 0) @@ -3206,7 +3206,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, goto cleanup; } /* NB, distinction of NULL vs "" is *critical* in SASL */ - memset(&sargs, 0, sizeof sargs); + memset(&sargs, 0, sizeof(sargs)); sargs.nil = clientout ? 0 : 1; sargs.data.data_val = (char*)clientout; sargs.data.data_len = clientoutlen; @@ -3215,7 +3215,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, mech, clientoutlen, clientout); /* Now send the initial auth data to the server */ - memset (&sret, 0, sizeof sret); + memset (&sret, 0, sizeof(sret)); if (call (conn, priv, 0, REMOTE_PROC_AUTH_SASL_START, (xdrproc_t) xdr_remote_auth_sasl_start_args, (char *) &sargs, (xdrproc_t) xdr_remote_auth_sasl_start_ret, (char *) &sret) != 0) @@ -3260,14 +3260,14 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, /* Not done, prepare to talk with the server for another iteration */ /* NB, distinction of NULL vs "" is *critical* in SASL */ - memset(&pargs, 0, sizeof pargs); + memset(&pargs, 0, sizeof(pargs)); pargs.nil = clientout ? 0 : 1; pargs.data.data_val = (char*)clientout; pargs.data.data_len = clientoutlen; VIR_DEBUG("Server step with %zu bytes %p", clientoutlen, clientout); - memset (&pret, 0, sizeof pret); + memset (&pret, 0, sizeof(pret)); if (call (conn, priv, 0, REMOTE_PROC_AUTH_SASL_STEP, (xdrproc_t) xdr_remote_auth_sasl_step_args, (char *) &pargs, (xdrproc_t) xdr_remote_auth_sasl_step_ret, (char *) &pret) != 0) @@ -3328,7 +3328,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, remote_auth_polkit_ret ret; VIR_DEBUG("Client initialize PolicyKit-1 authentication"); - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_AUTH_POLKIT, (xdrproc_t) xdr_void, (char *)NULL, (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) != 0) { @@ -3358,7 +3358,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, VIR_DEBUG("Client initialize PolicyKit-0 authentication"); /* Check auth first and if it succeeds we are done. */ - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_AUTH_POLKIT, (xdrproc_t) xdr_void, (char *)NULL, (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) == 0) @@ -3389,7 +3389,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, return -1; } - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (conn, priv, 0, REMOTE_PROC_AUTH_POLKIT, (xdrproc_t) xdr_void, (char *)NULL, (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) != 0) { @@ -3859,7 +3859,7 @@ remoteSecretGetValue (virSecretPtr secret, size_t *value_size, make_nonnull_secret (&args.secret, secret); args.flags = flags; - memset (&ret, 0, sizeof (ret)); + memset (&ret, 0, sizeof(ret)); if (call (secret->conn, priv, 0, REMOTE_PROC_SECRET_GET_VALUE, (xdrproc_t) xdr_remote_secret_get_value_args, (char *) &args, (xdrproc_t) xdr_remote_secret_get_value_ret, (char *) &ret) == -1) @@ -4209,7 +4209,7 @@ remoteQemuDomainMonitorCommand (virDomainPtr domain, const char *cmd, args.cmd = (char *)cmd; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, REMOTE_CALL_QEMU, QEMU_PROC_MONITOR_COMMAND, (xdrproc_t) xdr_qemu_monitor_command_args, (char *) &args, (xdrproc_t) xdr_qemu_monitor_command_ret, (char *) &ret) == -1) @@ -4315,7 +4315,7 @@ remoteDomainMigratePrepare3(virConnectPtr dconn, args.resource = resource; args.dom_xml = (char *) dom_xml; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE3, (xdrproc_t) xdr_remote_domain_migrate_prepare3_args, (char *) &args, (xdrproc_t) xdr_remote_domain_migrate_prepare3_ret, (char *) &ret) == -1) @@ -4673,7 +4673,7 @@ remoteDomainGetDiskErrors(virDomainPtr dom, args.maxerrors = maxerrors; args.flags = flags; - memset(&ret, 0, sizeof ret); + memset(&ret, 0, sizeof(ret)); if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_DISK_ERRORS, (xdrproc_t) xdr_remote_domain_get_disk_errors_args, @@ -4773,7 +4773,7 @@ remoteDomainGetInterfaceParameters (virDomainPtr domain, args.nparams = *nparams; args.flags = flags; - memset (&ret, 0, sizeof ret); + memset (&ret, 0, sizeof(ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_INTERFACE_PARAMETERS, (xdrproc_t) xdr_remote_domain_get_interface_parameters_args, (char *) &args, (xdrproc_t) xdr_remote_domain_get_interface_parameters_ret, (char *) &ret) == -1) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index ef369b9..f161ee0 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -518,7 +518,7 @@ elsif ($opt_b) { die "legacy [u]long hyper arrays aren't supported"; } - push(@ret_list, "memcpy(ret->$3, tmp.$3, sizeof ret->$3);"); + push(@ret_list, "memcpy(ret->$3, tmp.$3, sizeof(ret->$3));"); } elsif ($ret_member =~ m/^(unsigned )?(char|short|int|hyper) (\S+);/) { push(@ret_list, "ret->$3 = tmp.$3;"); } else { @@ -731,7 +731,7 @@ elsif ($opt_b) { # have a 'Struct' suffix on the actual struct name # and take the struct size as additional argument $struct_name .= "Struct"; - splice(@args_list, $call->{ret_offset} + 1, 0, ("sizeof tmp")); + splice(@args_list, $call->{ret_offset} + 1, 0, ("sizeof(tmp)")); } push(@vars_list, "vir$struct_name tmp"); @@ -1213,7 +1213,7 @@ elsif ($opt_k) { die "legacy [u]long hyper arrays aren't supported"; } - push(@ret_list, "memcpy(result->$3, ret.$3, sizeof result->$3);"); + push(@ret_list, "memcpy(result->$3, ret.$3, sizeof(result->$3));"); } elsif ($ret_member =~ m/<\S+>;/ or $ret_member =~ m/\[\S+\];/) { # just make all other array types fail die "unhandled type for multi-return-value for " . @@ -1465,7 +1465,7 @@ elsif ($opt_k) { if ($rettype ne "void") { print "\n"; - print " memset(&ret, 0, sizeof ret);\n"; + print " memset(&ret, 0, sizeof(ret));\n"; } my $callflags = "0"; diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 99ab800..33b7701 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1469,7 +1469,7 @@ static void virNetClientIOUpdateCallback(virNetClientPtr client, * which come from the user). It does however free any intermediate * results, eg. the error structure if there is one. * - * NB(2). Make sure to memset (&ret, 0, sizeof ret) before calling, + * NB(2). Make sure to memset (&ret, 0, sizeof(ret)) before calling, * else Bad Things will happen in the XDR code. * * NB(3) You must have the client lock before calling this diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index d4e7bf2..8db0e15 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -364,7 +364,7 @@ int virNetSASLSessionSecProps(virNetSASLSessionPtr sasl, minSSF, maxSSF, allowAnonymous, sasl->maxbufsize); virMutexLock(&sasl->lock); - memset(&secprops, 0, sizeof secprops); + memset(&secprops, 0, sizeof(secprops)); secprops.min_ssf = minSSF; secprops.max_ssf = maxSSF; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index af3f9ac..fa16d31 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -203,7 +203,7 @@ int virNetSocketNewListenTCP(const char *nodename, *retsocks = NULL; *nretsocks = 0; - memset(&hints, 0, sizeof hints); + memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; hints.ai_socktype = SOCK_STREAM; @@ -228,7 +228,7 @@ int virNetSocketNewListenTCP(const char *nodename, } int opt = 1; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt) < 0) { + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { virReportSystemError(errno, "%s", _("Unable to enable port reuse")); goto error; } @@ -244,7 +244,7 @@ int virNetSocketNewListenTCP(const char *nodename, * we force it to only listen on IPv6 */ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, - (void*)&on, sizeof on) < 0) { + (void*)&on, sizeof(on)) < 0) { virReportSystemError(errno, "%s", _("Unable to force bind to IPv6 only")); goto error; @@ -400,7 +400,7 @@ int virNetSocketNewConnectTCP(const char *nodename, memset(&localAddr, 0, sizeof(localAddr)); memset(&remoteAddr, 0, sizeof(remoteAddr)); - memset(&hints, 0, sizeof hints); + memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; hints.ai_socktype = SOCK_STREAM; @@ -422,7 +422,7 @@ int virNetSocketNewConnectTCP(const char *nodename, goto error; } - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt); + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); if (connect(fd, runp->ai_addr, runp->ai_addrlen) >= 0) break; @@ -830,7 +830,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, pid_t *pid) { struct ucred cr; - socklen_t cr_len = sizeof (cr); + socklen_t cr_len = sizeof(cr); virMutexLock(&sock->lock); if (getsockopt(sock->fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) < 0) { diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 3c9e541..a5cb85c 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -577,14 +577,14 @@ valid_path(const char *path, const bool readonly) } } - opaths = sizeof(override)/sizeof *(override); + opaths = sizeof(override)/sizeof(*(override)); - npaths = sizeof(restricted)/sizeof *(restricted); + npaths = sizeof(restricted)/sizeof(*(restricted)); if (array_starts_with(path, restricted, npaths) == 0 && array_starts_with(path, override, opaths) != 0) return 1; - npaths = sizeof(restricted_rw)/sizeof *(restricted_rw); + npaths = sizeof(restricted_rw)/sizeof(*(restricted_rw)); if (!readonly) { if (array_starts_with(path, restricted_rw, npaths) == 0) return 1; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 6ebc6e1..f04473d 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -55,7 +55,7 @@ virStorageBackendISCSITargetIP(const char *hostname, struct addrinfo *result = NULL; int ret; - memset(&hints, 0, sizeof hints); + memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_ADDRCONFIG; hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; @@ -207,7 +207,7 @@ virStorageBackendIQNFound(const char *initiatoriqn, virStorageReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open stream for file descriptor " "when reading output from '%s': '%s'"), - ISCSIADM, virStrerror(errno, ebuf, sizeof ebuf)); + ISCSIADM, virStrerror(errno, ebuf, sizeof(ebuf))); ret = IQN_ERROR; goto out; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 66811ce..f23ec7e 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -652,7 +652,7 @@ storagePoolUndefine(virStoragePoolPtr obj) { if (unlink(pool->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { char ebuf[1024]; VIR_ERROR(_("Failed to delete autostart link '%s': %s"), - pool->autostartLink, virStrerror(errno, ebuf, sizeof ebuf)); + pool->autostartLink, virStrerror(errno, ebuf, sizeof(ebuf))); } VIR_FREE(pool->configFile); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index d86652c..f2d0368 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -472,7 +472,7 @@ umlStartup(int privileged) if (virFileMakePath(uml_driver->monitorDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), - uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); + uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } @@ -788,7 +788,7 @@ static int umlMonitorAddress(const struct uml_driver *driver, return -1; } - memset(addr, 0, sizeof *addr); + memset(addr, 0, sizeof(*addr)); addr->sun_family = AF_UNIX; if (virStrcpyStatic(addr->sun_path, sockname) == NULL) { umlReportError(VIR_ERR_INTERNAL_ERROR, @@ -826,11 +826,11 @@ restat: return -1; } - memset(addr.sun_path, 0, sizeof addr.sun_path); + memset(addr.sun_path, 0, sizeof(addr.sun_path)); snprintf(addr.sun_path + 1, sizeof(addr.sun_path) - 1, "libvirt-uml-%u", vm->pid); VIR_DEBUG("Reply address for monitor is '%s'", addr.sun_path+1); - if (bind(priv->monitor, (struct sockaddr *)&addr, sizeof addr) < 0) { + if (bind(priv->monitor, (struct sockaddr *)&addr, sizeof(addr)) < 0) { virReportSystemError(errno, "%s", _("cannot bind socket")); VIR_FORCE_CLOSE(priv->monitor); @@ -896,8 +896,8 @@ static int umlMonitorCommand(const struct uml_driver *driver, return -1; } - if (sendto(priv->monitor, &req, sizeof req, 0, - (struct sockaddr *)&addr, sizeof addr) != (sizeof req)) { + if (sendto(priv->monitor, &req, sizeof(req), 0, + (struct sockaddr *)&addr, sizeof(addr)) != sizeof(req)) { virReportSystemError(errno, _("cannot send command %s"), cmd); @@ -907,7 +907,7 @@ static int umlMonitorCommand(const struct uml_driver *driver, do { ssize_t nbytes; addrlen = sizeof(addr); - nbytes = recvfrom(priv->monitor, &res, sizeof res, 0, + nbytes = recvfrom(priv->monitor, &res, sizeof(res), 0, (struct sockaddr *)&addr, &addrlen); if (nbytes < 0) { if (errno == EAGAIN || errno == EINTR) diff --git a/src/util/buf.h b/src/util/buf.h index 6648b23..d6bc8f3 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -59,7 +59,7 @@ void virBufferEscapeShell(virBufferPtr buf, const char *str); void virBufferURIEncodeString(virBufferPtr buf, const char *str); # define virBufferAddLit(buf_, literal_string_) \ - virBufferAdd(buf_, "" literal_string_ "", sizeof literal_string_ - 1) + virBufferAdd(buf_, "" literal_string_ "", sizeof(literal_string_) - 1) void virBufferAdjustIndent(virBufferPtr buf, int indent); int virBufferGetIndent(const virBufferPtr buf, bool dynamic); diff --git a/src/util/command.c b/src/util/command.c index b752b2a..2837450 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1594,7 +1594,7 @@ virCommandWriteArgLog(virCommandPtr cmd, int logfd) if (ioError) { char ebuf[1024]; VIR_WARN("Unable to write command %s args to logfile: %s", - cmd->args[0], virStrerror(ioError, ebuf, sizeof ebuf)); + cmd->args[0], virStrerror(ioError, ebuf, sizeof(ebuf))); } } diff --git a/src/util/ebtables.c b/src/util/ebtables.c index d1afff0..dcb3eb9 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -114,7 +114,7 @@ ebtRulesRemove(ebtRules *rules, memmove(&rules->rules[i], &rules->rules[i+1], - (rules->nrules - i - 1) * sizeof (ebtRule)); + (rules->nrules - i - 1) * sizeof(ebtRule)); rules->nrules--; diff --git a/src/util/memory.h b/src/util/memory.h index d77a295..9b6da39 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -35,12 +35,12 @@ calculations, so the conservative dividend to use here is SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value. However, malloc (SIZE_MAX) fails on all known hosts where - sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for + sizeof(ptrdiff_t) <= sizeof(size_t), so do not bother to test for exactly-SIZE_MAX allocations on such hosts; this avoids a test and branch when S is known to be 1. */ # ifndef xalloc_oversized # define xalloc_oversized(n, s) \ - ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) + ((size_t) (sizeof(ptrdiff_t) <= sizeof(size_t) ? -1 : -2) / (s) < (n)) # endif diff --git a/src/util/pci.c b/src/util/pci.c index 7beeaee..b3be405 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -863,7 +863,7 @@ recheck: virRun(stubprobe, NULL) < 0) { char ebuf[1024]; VIR_WARN("failed to load pci-stub or pciback drivers: %s", - virStrerror(errno, ebuf, sizeof ebuf)); + virStrerror(errno, ebuf, sizeof(ebuf))); return NULL; } diff --git a/src/util/stats_linux.c b/src/util/stats_linux.c index 72318e3..725a2d0 100644 --- a/src/util/stats_linux.c +++ b/src/util/stats_linux.c @@ -57,7 +57,7 @@ linuxDomainInterfaceStats(const char *path, path_len = strlen (path); - while (fgets (line, sizeof line, fp)) { + while (fgets (line, sizeof(line), fp)) { long long dummy; long long rx_bytes; long long rx_packets; diff --git a/src/util/storage_file.c b/src/util/storage_file.c index cd1c142..530071e 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -833,7 +833,7 @@ virStorageFileGetMetadataFromFD(const char *path, int ret = -1; struct stat sb; - memset(meta, 0, sizeof (*meta)); + memset(meta, 0, sizeof(*meta)); if (fstat(fd, &sb) < 0) { virReportSystemError(errno, diff --git a/src/util/util.c b/src/util/util.c index d91ab4f..81d9e3a 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -83,8 +83,8 @@ # define NSIG 32 #endif -verify(sizeof(gid_t) <= sizeof (unsigned int) && - sizeof(uid_t) <= sizeof (unsigned int)); +verify(sizeof(gid_t) <= sizeof(unsigned int) && + sizeof(uid_t) <= sizeof(unsigned int)); #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/uuid.c b/src/util/uuid.c index a84fd94..d9ff348 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -108,7 +108,7 @@ virUUIDGenerate(unsigned char *uuid) char ebuf[1024]; VIR_WARN("Falling back to pseudorandom UUID," " failed to generate random bytes: %s", - virStrerror(err, ebuf, sizeof ebuf)); + virStrerror(err, ebuf, sizeof(ebuf))); err = virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN); } diff --git a/src/util/viraudit.c b/src/util/viraudit.c index d0f9cc4..df58edf 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -129,7 +129,7 @@ void virAuditSend(const char *file ATTRIBUTE_UNUSED, const char *func, clientaddr, clienttty, success) < 0) { char ebuf[1024]; VIR_WARN("Failed to send audit message %s: %s", - NULLSTR(str), virStrerror(errno, ebuf, sizeof ebuf)); + NULLSTR(str), virStrerror(errno, ebuf, sizeof(ebuf))); } VIR_FREE(str); } diff --git a/src/util/virauth.c b/src/util/virauth.c index 940686f..c59c55a 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -164,7 +164,7 @@ virAuthGetUsername(virConnectPtr conn, if (ret != NULL) return ret; - memset(&cred, 0, sizeof (virConnectCredential)); + memset(&cred, 0, sizeof(virConnectCredential)); if (defaultUsername != NULL) { if (virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, @@ -220,7 +220,7 @@ virAuthGetPassword(virConnectPtr conn, if (ret != NULL) return ret; - memset(&cred, 0, sizeof (virConnectCredential)); + memset(&cred, 0, sizeof(virConnectCredential)); if (virAsprintf(&prompt, _("Enter %s's password for %s"), username, hostname) < 0) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 37891b4..17ea883 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -555,11 +555,11 @@ virNetDevMacVLanVPortProfileCallback(unsigned char *msg, /* DEBUG end */ /* Parse netlink message assume a setlink with vfports */ - memcpy(&ifinfo, NLMSG_DATA(hdr), sizeof ifinfo); + memcpy(&ifinfo, NLMSG_DATA(hdr), sizeof(ifinfo)); VIR_DEBUG("family:%#x type:%#x index:%d flags:%#x change:%#x", ifinfo.ifi_family, ifinfo.ifi_type, ifinfo.ifi_index, ifinfo.ifi_flags, ifinfo.ifi_change); - if (nlmsg_parse(hdr, sizeof ifinfo, + if (nlmsg_parse(hdr, sizeof(ifinfo), (struct nlattr **)&tb, IFLA_MAX, NULL)) { VIR_DEBUG("error parsing request..."); return; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 83083c0..1934341 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -367,7 +367,7 @@ int virPidFileAcquirePath(const char *path, if (stat(path, &a) < 0) { char ebuf[1024] ATTRIBUTE_UNUSED; VIR_DEBUG("Pid file '%s' disappeared: %s", - path, virStrerror(errno, ebuf, sizeof ebuf)); + path, virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FORCE_CLOSE(fd); /* Someone else must be racing with us, so try agin */ continue; diff --git a/src/util/virterror.c b/src/util/virterror.c index d41bf37..ff9a36f 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1355,7 +1355,7 @@ void virReportSystemErrorFull(int domcode, va_end(args); size_t len = strlen(errnoDetail); - if (0 <= n && n + 2 + len < sizeof (msgDetailBuf)) { + if (0 <= n && n + 2 + len < sizeof(msgDetailBuf)) { char *p = msgDetailBuf + n; stpcpy (stpcpy (p, ": "), errnoDetail); msgDetail = msgDetailBuf; diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 31e14a1..b07d6a7 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -621,7 +621,7 @@ vboxComUninitialize(void) static VBOXXPCOMC_v1 vboxXPCOMC_v1 = { - sizeof (VBOXXPCOMC_v1), /* cb */ + sizeof(VBOXXPCOMC_v1), /* cb */ 0x00010000U, /* uVersion */ vboxGetVersion, /* pfnGetVersion */ vboxComInitialize_v1, /* pfnComInitialize */ @@ -635,7 +635,7 @@ static VBOXXPCOMC_v1 vboxXPCOMC_v1 = { }; static VBOXXPCOMC_v2 vboxXPCOMC_v2 = { - sizeof (VBOXXPCOMC_v2), /* cb */ + sizeof(VBOXXPCOMC_v2), /* cb */ 0x00020000U, /* uVersion */ vboxGetVersion, /* pfnGetVersion */ vboxComInitialize_v2, /* pfnComInitialize */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 7769b0c..68e3b05 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -381,7 +381,7 @@ vboxIIDFromUUID_v2_x_WIN32(vboxGlobalData *data, vboxIID_v2_x_WIN32 *iid, static bool vboxIIDIsEqual_v2_x_WIN32(vboxIID_v2_x_WIN32 *iid1, vboxIID_v2_x_WIN32 *iid2) { - return memcmp(&iid1->value, &iid2->value, sizeof (GUID)) == 0; + return memcmp(&iid1->value, &iid2->value, sizeof(GUID)) == 0; } static void @@ -392,7 +392,7 @@ vboxIIDFromArrayItem_v2_x_WIN32(vboxGlobalData *data, vboxIID_v2_x_WIN32 *iid, vboxIIDUnalloc_v2_x_WIN32(data, iid); - memcpy(&iid->value, &items[idx], sizeof (GUID)); + memcpy(&iid->value, &items[idx], sizeof(GUID)); } # define vboxIIDUnalloc(iid) vboxIIDUnalloc_v2_x_WIN32(data, iid) @@ -454,7 +454,7 @@ vboxIIDFromUUID_v2_x(vboxGlobalData *data, vboxIID_v2_x *iid, static bool vboxIIDIsEqual_v2_x(vboxIID_v2_x *iid1, vboxIID_v2_x *iid2) { - return memcmp(iid1->value, iid2->value, sizeof (nsID)) == 0; + return memcmp(iid1->value, iid2->value, sizeof(nsID)) == 0; } static void @@ -465,7 +465,7 @@ vboxIIDFromArrayItem_v2_x(vboxGlobalData *data, vboxIID_v2_x *iid, iid->value = &iid->backing; - memcpy(iid->value, array->items[idx], sizeof (nsID)); + memcpy(iid->value, array->items[idx], sizeof(nsID)); } # define vboxIIDUnalloc(iid) vboxIIDUnalloc_v2_x(data, iid) diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index 0bb8098..50ace86 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -76,7 +76,7 @@ read_stat (const char *path) return -1; /* read, but don't bail out before closing */ - i = fread (str, 1, sizeof str - 1, fp); + i = fread (str, 1, sizeof(str) - 1, fp); if (VIR_FCLOSE(fp) != 0 /* disk error */ || i < 1) /* ensure we read at least one byte */ @@ -136,9 +136,9 @@ check_bd_connected (xenUnifiedPrivatePtr priv, int device, int domid) * xenstore, etc. */ if (!priv->xshandle) return 1; - snprintf (s, sizeof s, "/local/domain/0/backend/vbd/%d/%d/state", + snprintf (s, sizeof(s), "/local/domain/0/backend/vbd/%d/%d/state", domid, device); - s[sizeof s - 1] = '\0'; + s[sizeof(s) - 1] = '\0'; rs = xs_read (priv->xshandle, 0, s, &len); if (!rs) return 1; diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index eb8b67e..0dae8d9 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -566,7 +566,7 @@ struct xen_v2s3_getdomaininfolistop { uint32_t max_domains; #ifdef __BIG_ENDIAN__ struct { - int __pad[(sizeof (long long) - sizeof (struct xen_v2d5_getdomaininfo *)) / sizeof (int)]; + int __pad[(sizeof(long long) - sizeof(struct xen_v2d5_getdomaininfo *)) / sizeof(int)]; struct xen_v2d5_getdomaininfo *v; } buffer; #else @@ -681,7 +681,7 @@ typedef struct xen_v2_setvcpumap xen_v2_setvcpumap; struct xen_v2d5_cpumap { #ifdef __BIG_ENDIAN__ struct { - int __pad[(sizeof (long long) - sizeof (uint8_t *)) / sizeof (int)]; + int __pad[(sizeof(long long) - sizeof(uint8_t *)) / sizeof(int)]; uint8_t *v; } bitmap; #else @@ -1996,7 +1996,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) errcode = regcomp (&flags_hvm_rec, flags_hvm_re, REG_EXTENDED); if (errcode != 0) { char error[100]; - regerror (errcode, &flags_hvm_rec, error, sizeof error); + regerror (errcode, &flags_hvm_rec, error, sizeof(error)); regfree (&flags_hvm_rec); virXenError(VIR_ERR_INTERNAL_ERROR, "%s", error); in_init = 0; @@ -2005,7 +2005,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) errcode = regcomp (&flags_pae_rec, flags_pae_re, REG_EXTENDED); if (errcode != 0) { char error[100]; - regerror (errcode, &flags_pae_rec, error, sizeof error); + regerror (errcode, &flags_pae_rec, error, sizeof(error)); regfree (&flags_pae_rec); regfree (&flags_hvm_rec); virXenError(VIR_ERR_INTERNAL_ERROR, "%s", error); @@ -2015,7 +2015,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) errcode = regcomp (&xen_cap_rec, xen_cap_re, REG_EXTENDED); if (errcode != 0) { char error[100]; - regerror (errcode, &xen_cap_rec, error, sizeof error); + regerror (errcode, &xen_cap_rec, error, sizeof(error)); regfree (&xen_cap_rec); regfree (&flags_pae_rec); regfree (&flags_hvm_rec); @@ -2470,7 +2470,7 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) *hvm = ""; if (STREQLEN((const char *)&regs.r_ebx, "AuthcAMDenti", 12)) { - if (pread(fd, &regs, sizeof (regs), 0x80000001) == sizeof (regs)) { + if (pread(fd, &regs, sizeof(regs), 0x80000001) == sizeof(regs)) { /* Read secure virtual machine bit (bit 2 of ECX feature ID) */ if ((regs.r_ecx >> 2) & 1) { *hvm = "svm"; @@ -2479,7 +2479,7 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) *pae = 1; } } else if (STREQLEN((const char *)&regs.r_ebx, "GenuntelineI", 12)) { - if (pread(fd, &regs, sizeof (regs), 0x00000001) == sizeof (regs)) { + if (pread(fd, &regs, sizeof(regs), 0x00000001) == sizeof(regs)) { /* Read VMXE feature bit (bit 5 of ECX feature ID) */ if ((regs.r_ecx >> 5) & 1) *hvm = "vmx"; @@ -2591,7 +2591,7 @@ xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn, * architectures and non-Linux. (XXX) */ if (cpuinfo) { - while (fgets (line, sizeof line, cpuinfo)) { + while (fgets (line, sizeof(line), cpuinfo)) { if (regexec (&flags_hvm_rec, line, sizeof(subs)/sizeof(regmatch_t), subs, 0) == 0 && subs[0].rm_so != -1) { if (virStrncpy(hvm_type, @@ -2629,16 +2629,16 @@ xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn, */ /* Expecting one line in this file - ignore any more. */ - if ((capabilities) && (fgets (line, sizeof line, capabilities))) { + if ((capabilities) && (fgets (line, sizeof(line), capabilities))) { /* Split the line into tokens. strtok_r is OK here because we "own" * this buffer. Parse out the features from each token. */ for (str = line, nr_guest_archs = 0; - nr_guest_archs < sizeof guest_archs / sizeof guest_archs[0] + nr_guest_archs < sizeof(guest_archs) / sizeof(guest_archs[0]) && (token = strtok_r (str, " ", &saveptr)) != NULL; str = NULL) { - if (regexec (&xen_cap_rec, token, sizeof subs / sizeof subs[0], + if (regexec (&xen_cap_rec, token, sizeof(subs) / sizeof(subs[0]), subs, 0) == 0) { int hvm = STRPREFIX(&token[subs[1].rm_so], "hvm"); const char *model; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 831c3d4..6526af4 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -671,7 +671,7 @@ xenDaemonOpen_tcp(virConnectPtr conn, const char *host, const char *port) memset(&priv->addr, 0, sizeof(priv->addr)); /* http://people.redhat.com/drepper/userapi-ipv6.html */ - memset (&hints, 0, sizeof hints); + memset (&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_ADDRCONFIG; @@ -3249,7 +3249,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, return -1; } if (uriptr->port) - snprintf (port, sizeof port, "%d", uriptr->port); + snprintf (port, sizeof(port), "%d", uriptr->port); virURIFree (uriptr); } else if ((p = strrchr (uri, ':')) != NULL) { /* "hostname:port" */ @@ -3260,7 +3260,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, "%s", _("xenDaemonDomainMigrate: invalid port number")); return -1; } - snprintf (port, sizeof port, "%d", port_nr); + snprintf (port, sizeof(port), "%d", port_nr); /* Get the hostname. */ n = p - uri; /* n = Length of hostname in bytes. */ diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 516cf8f..3471b6a 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -60,7 +60,7 @@ xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username, virConnectCredential cred; char *prompt; - memset(&cred, 0, sizeof (virConnectCredential)); + memset(&cred, 0, sizeof(virConnectCredential)); if (virAsprintf(&prompt, "Enter %s password for %s", username, hostname) < 0) { diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index 57379b7..37e3749 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -39,7 +39,7 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion) if (virtTestLoadFile(sexpr, &sexprData) < 0) goto fail; - memset(&priv, 0, sizeof priv); + memset(&priv, 0, sizeof(priv)); /* Many puppies died to bring you this code. */ priv.xendConfigVersion = xendConfigVersion; priv.caps = caps; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index f0d1968..204113e 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -54,7 +54,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, int i; int ret = -1; - memset(&hints, 0, sizeof hints); + memset(&hints, 0, sizeof(hints)); *hasIPv4 = *hasIPv6 = false; *freePort = 0; diff --git a/tools/virsh.c b/tools/virsh.c index 8ee25c3..810fdd7 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1485,7 +1485,7 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) last_error = NULL; if (virDomainBlockStats(dom, device, &stats, - sizeof stats) == -1) { + sizeof(stats)) == -1) { vshError(ctl, _("Failed to get block stats %s %s"), name, device); goto cleanup; @@ -1597,7 +1597,7 @@ cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) return false; } - if (virDomainInterfaceStats (dom, device, &stats, sizeof stats) == -1) { + if (virDomainInterfaceStats (dom, device, &stats, sizeof(stats)) == -1) { vshError(ctl, _("Failed to get interface stats %s %s"), name, device); virDomainFree(dom); return false; @@ -4578,7 +4578,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) has_managed_save ? _("yes") : _("no")); /* Security model and label information */ - memset(&secmodel, 0, sizeof secmodel); + memset(&secmodel, 0, sizeof(secmodel)); if (virNodeGetSecurityModel(ctl->conn, &secmodel) == -1) { if (last_error->code != VIR_ERR_NO_SUPPORT) { virDomainFree(dom); @@ -13045,7 +13045,7 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virNodeDeviceFree(dev); } for (i = 0 ; i < num_devices ; i++) { - memset(indentBuf, '\0', sizeof indentBuf); + memset(indentBuf, '\0', sizeof(indentBuf)); if (parents[i] == NULL) cmdNodeListDevicesPrint(ctl, devices, @@ -16501,7 +16501,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (tree) { char indentBuf[INDENT_BUFLEN]; for (i = 0 ; i < actual ; i++) { - memset(indentBuf, '\0', sizeof indentBuf); + memset(indentBuf, '\0', sizeof(indentBuf)); if (ctl->useSnapshotOld ? STREQ(names[i], from) : !parents[i]) cmdNodeListDevicesPrint(ctl, names, @@ -19615,7 +19615,7 @@ vshReadlineDeinit (vshControl *ctl) if (mkdir(ctl->historydir, 0755) < 0 && errno != EEXIST) { char ebuf[1024]; vshError(ctl, _("Failed to create '%s': %s"), - ctl->historydir, virStrerror(errno, ebuf, sizeof ebuf)); + ctl->historydir, virStrerror(errno, ebuf, sizeof(ebuf))); } else write_history(ctl->historyfile); } @@ -19653,7 +19653,7 @@ vshReadline (vshControl *ctl, const char *prompt) int len; fputs (prompt, stdout); - r = fgets (line, sizeof line, stdin); + r = fgets (line, sizeof(line), stdin); if (r == NULL) return NULL; /* EOF */ /* Chomp trailing \n */ -- 1.7.7.6

2 2

[libvirt] [PATCH] libvirt: Fix build err
by ailvpeng25＠gmail.com 29 Mar '12

29 Mar '12

From: Zhou Peng <ailvpeng25(a)gmail.com> virNetDevMacVLanRestartWithVPortProfile is omitted in src/libvirt_private.syms, which causes link err. --- src/libvirt_private.syms | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c50940b..97fec2f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1288,6 +1288,7 @@ virNetDevMacVLanCreate; virNetDevMacVLanDelete; virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDeleteWithVPortProfile; +virNetDevMacVLanRestartWithVPortProfile; # virnetdevopenvswitch.h -- 1.7.7.6

2 1

Re: [libvirt] Java API for libvirit
by Eric Blake 29 Mar '12

29 Mar '12

[please keep the list in the loop, avoid html mail, and avoid top-posting] On 03/29/2012 08:04 AM, Yaniv Hadad wrote: > Hi Eric. > Did you use it already ?? No, I have not personally used the Java bindings. Which is why keeping the list in the loop is a wise idea; you're more likely to reach someone that has. > What do you mean have not had active maintenance in a while ? The last commit to libvirt-java.git was in Feb 2011, so it's lagging libvirt.git by a few releases. > Which scope of information may I get ? Ultimately, if someone were to contribute patches to bring the bindings up-to-date, then you could use Java to access everything that libvirt provides to other language bindings, such as C, python, and perl. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [test-API PATCH] log_output: Fix whitespace in log output XSL
by Peter Krempa 29 Mar '12

29 Mar '12

The XSL file that converts the log xml into a html file contains some strange whitespace characters that output in the HTML as squares. This patch fixes the whitespace and reformats the indetation to two spaces as used in libvirt XML files. *log.css: -make test name field wider *log.xsl: -fix whitespace and indentation -remove '@' from test headers --- log.css | 2 +- log.xsl | 341 +++++++++++++++++++++++++++++++-------------------------------- 2 files changed, 170 insertions(+), 173 deletions(-) diff --git a/log.css b/log.css index d5fe3e6..84f3ea6 100644 --- a/log.css +++ b/log.css @@ -75,7 +75,7 @@ table td{ } .li-tit{ - width:150px; + width:250px; } .statu-list{ diff --git a/log.xsl b/log.xsl index 4ebf030..84ad5fa 100644 --- a/log.xsl +++ b/log.xsl @@ -1,179 +1,176 @@ <?xml version='1.0'?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> -<xsl:output method="html" indent="yes" /> +<xsl:output method="html" indent="yes" /> <xsl:template match="/"> <html> - <head> - <title>Libvirt testing log</title> - <link rel="stylesheet" href="log.css" type="text/css" media="screen" /> - <script language="javascript"> - <![CDATA[ - var xmlDOc; - var xslDoc; - var active_result; - var active_div_id; - - - function init(logname) { - var xmlDoc; - var xslDoc; - - active_result = "TOTAL"; - expand_last_div(); - } - - function expand_last_div() { - divs = document.getElementsByTagName('div'); - last_div = divs[divs.length - 1]; - last_div.style.display = "block"; - active_div_id = last_div.attributes['id'].value; - } - - function on_result_clicked(div_id, result){ - if (result == active_result && active_div_id == div_id) - return; - - active_result = result; - active_div_id = div_id; - - var table = document.getElementById(div_id + "tb"); - var trs = table.childNodes[1].childNodes; - - if (result == "TOTAL") { - for (var i = 0; i < trs.length; i++) { - trs[i].style.display = "table-row"; - } - - return; - } - - for (var i = 0; i < trs.length; i++) { - var cels = trs[i].childNodes; - var is_result = false; - - for (var j = 0; j < cels.length; j++) { - - if(cels[j].innerHTML == result) { - is_result = true; - trs[i].style.display = "table-row"; - break; - } - } - - if (!is_result) { - trs[i].style.display = "none"; - } - } - } - - function fold_unfold(id) { - div = document.getElementById(id); - - if (div.style.display == "block") { - div.style.display = "none"; - } else { - div.style.display = "block"; - } - - /* fold all other divs */ - /* - divs = document.getElementsByTagName('div'); - for (var i = 0; i < divs.length; i++) { - if (divs[i].attributes['id'].value == id) { - continue; - } else { - divs[i].style.display = "none"; - } - } - */ - } - ]]> - </script> - </head> -　 <body onload="init()"> -  - <center><img src="icon.png" alt=""/></center> -　　　 <xsl:for-each select="log/testrun"> - <xsl:variable name="div_id" select="@name"/> - <h2><b><a href="#{$div_id}" onclick="fold_unfold({$div_id})">Testrun@<xsl:value-of select="@name"/></a></b></h2> - <DIV id="{$div_id}" style="display: none;"> - <table border="0" class="statu-list" cellspan="0" cellspacing="0"> - <tr> - <th><a href="#{$div_id}" onclick="on_result_clicked({$div_id}, 'TOTAL')">Total</a></th> - <th><a href="#{$div_id}" onclick="on_result_clicked({$div_id}, 'PASS')">PASS</a></th> - <th><a href="#{$div_id}" onclick="on_result_clicked({$div_id}, 'FAIL')">FAIL</a></th> -  - <th>Start</th> - <th>End</th> - </tr> - <tr> - <td><xsl:value-of select="total"/></td> - <td><xsl:value-of select="pass"/></td> - <td><xsl:value-of select="fail"/></td> -  - <td><xsl:value-of select="start_time"/></td> - <td><xsl:value-of select="end_time"/></td> - </tr> - </table> - - <table id="{$div_id}tb" class="list" cellspan="0" cellspacing="0"> - <thead> - <tr> - <th width="5%">No.</th> - <th width="5%">Result</th> - <th width="12%">Start</th> - <th width="12%">End</th> - <th width="66%">Test Procedure</th> - </tr> - </thead> - - <tbody> - <xsl:for-each select="test"> - <tr> - <td> - <xsl:variable name="link" select="path"/> - <a href="{$link}"><xsl:value-of select="@id"/> </a> - </td> - <xsl:choose> - <xsl:when test="result = 'PASS'"> - <td class="pass"><xsl:value-of select="result"/></td> - </xsl:when> - <xsl:when test="result = 'FAIL'"> - <td class="fail"><xsl:value-of select="result"/></td> - </xsl:when> - <xsl:otherwise> - <td></td> - </xsl:otherwise> - </xsl:choose> - <td><xsl:value-of select="start_time"/></td> - <td><xsl:value-of select="end_time"/></td> - <td> - <table class="pro" cellspacing="1" cellspan="0" > - <xsl:for-each select="test_procedure"> - <tr> - <td class="li-tit"> - <xsl:value-of select="action/@name"/><br/> - </td> - <td> - <xsl:for-each select="action/arg"> - <span> - <xsl:value-of select="@name"/> - <xsl:text>=</xsl:text> - <xsl:value-of select="."/> - </span> - </xsl:for-each> - </td> - </tr> - </xsl:for-each> - </table> - </td> - </tr> - </xsl:for-each> - </tbody> - </table> - </DIV> -　　　　 </xsl:for-each> -　 </body> + <head> + <title>Libvirt testing log</title> + <link rel="stylesheet" href="log.css" type="text/css" media="screen" /> + <script language="javascript"> + <![CDATA[ + var xmlDOc; + var xslDoc; + var active_result; + var active_div_id; + + function init(logname) { + var xmlDoc; + var xslDoc; + + active_result = "TOTAL"; + expand_last_div(); + } + + function expand_last_div() { + divs = document.getElementsByTagName('div'); + last_div = divs[divs.length - 1]; + last_div.style.display = "block"; + active_div_id = last_div.attributes['id'].value; + } + + function on_result_clicked(div_id, result){ + if (result== active_result && active_div_id == div_id) + return; + + active_result = result; + active_div_id = div_id; + + var table = document.getElementById(div_id + "tb"); + var trs = table.childNodes[1].childNodes; + + if (result == "TOTAL") { + for (var i = 0; i < trs.length; i++) { + trs[i].style.display = "table-row"; + } + + return; + } + + for (var i = 0; i < trs.length; i++) { + var cels = trs[i].childNodes; + var is_result = false; + + for (var j = 0; j < cels.length; j++) { + if(cels[j].innerHTML == result) { + is_result = true; + trs[i].style.display = "table-row"; + break; + } + } + + if (!is_result) { + trs[i].style.display = "none"; + } + } + } + + function fold_unfold(id) { + div = document.getElementById(id); + + if (div.style.display == "block") { + div.style.display = "none"; + } else { + div.style.display = "block"; + } + + /* fold all other divs */ + /* + divs = document.getElementsByTagName('div'); + for (var i = 0; i < divs.length; i++) { + if (divs[i].attributes['id'].value == id) { + continue; + } else { + divs[i].style.display = "none"; + } + } + */ + } + ]]> + </script> + </head> + <body onload="init()"> +  + <center><img src="icon.png" alt=""/></center> + <xsl:for-each select="log/testrun"> + <xsl:variable name="div_id" select="@name"/> + <h2><b><a href="#{$div_id}" onclick="fold_unfold({$div_id})">Testrun <xsl:value-of select="@name"/></a></b></h2> + <DIV id="{$div_id}" style="display: none;"> + <table border="0" class="statu-list" cellspan="0" cellspacing="0"> + <tr> + <th><a href="#{$div_id}" onclick="on_result_clicked({$div_id}, 'TOTAL')">Total</a></th> + <th><a href="#{$div_id}" onclick="on_result_clicked({$div_id}, 'PASS')">PASS</a></th> + <th><a href="#{$div_id}" onclick="on_result_clicked({$div_id}, 'FAIL')">FAIL</a></th> +  + <th>Start</th> + <th>End</th> + </tr> + <tr> + <td><xsl:value-of select="total"/></td> + <td><xsl:value-of select="pass"/></td> + <td><xsl:value-of select="fail"/></td> +  + <td><xsl:value-of select="start_time"/></td> + <td><xsl:value-of select="end_time"/></td> + </tr> + </table> + + <table id="{$div_id}tb" class="list" cellspan="0" cellspacing="0"> + <thead> + <tr> + <th width="5%">No.</th> + <th width="5%">Result</th> + <th width="12%">Start</th> + <th width="12%">End</th> + <th width="66%">Test Procedure</th> + </tr> + </thead> + <tbody> + <xsl:for-each select="test"> + <tr> + <td> + <xsl:variable name="link" select="path"/> + <a href="{$link}"><xsl:value-of select="@id"/> </a> + </td> + <xsl:choose> + <xsl:when test="result = 'PASS'"> + <td class="pass"><xsl:value-of select="result"/></td> + </xsl:when> + <xsl:when test="result = 'FAIL'"> + <td class="fail"><xsl:value-of select="result"/></td> + </xsl:when> + <xsl:otherwise> + <td></td> + </xsl:otherwise> + </xsl:choose> + <td><xsl:value-of select="start_time"/></td> + <td><xsl:value-of select="end_time"/></td> + <td> + <table class="pro" cellspacing="1" cellspan="0" > + <xsl:for-each select="test_procedure"> + <tr> + <td class="li-tit"> + <xsl:value-of select="action/@name"/> + </td> + <td> + <xsl:for-each select="action/arg"> + <span> + <xsl:value-of select="@name"/> + <xsl:text>=</xsl:text> + <xsl:value-of select="."/> + </span> + </xsl:for-each> + </td> + </tr> + </xsl:for-each> + </table> + </td> + </tr> + </xsl:for-each> + </tbody> + </table> + </DIV> + </xsl:for-each> + </body> </html> </xsl:template> </xsl:stylesheet> -- 1.7.3.4

3 2

[libvirt] [PATCH 0/4] Fix problems in test suite on Win32
by Daniel P. Berrange 29 Mar '12

29 Mar '12

Since we enable the test suite by default now for all git checkouts, we need to make sure it actually builds on Win32. This series fixes it

3 10

[libvirt] Java API for libvirit
by Yaniv Hadad 29 Mar '12

29 Mar '12

Hello, Recently I found it useful to use your product for cross platform Hyperviscous in target to investigate guests and hosts os\state\version.. details . I am develop under Web-sphere environment. For saying the truth I didn't find any Java API for this target May you help me with this goal ?? What is your suggestion ? Many Thanks Yaniv. (Embedded image moved to file: pic63134.jpg) Yaniv Hadad , (Embedded image moved to file: pic57918.jpg)+972 4 8296594 (Embedded image moved to file: pic19510.jpg)+972 50-40-78-908

2 1

[libvirt] [PATCH test-API 0/2] add modules search path in main executable file
by Guannan Ren 29 Mar '12

29 Mar '12

repos/domain/attach_disk.py | 11 ----------- repos/domain/attach_interface.py | 11 ----------- repos/domain/autostart.py | 11 ----------- repos/domain/balloon_memory.py | 11 ----------- repos/domain/blkstats.py | 5 ----- repos/domain/cpu_affinity.py | 11 ----------- repos/domain/cpu_topology.py | 11 ----------- repos/domain/create.py | 11 ----------- repos/domain/define.py | 11 ----------- repos/domain/destroy.py | 11 ----------- repos/domain/detach_disk.py | 11 ----------- repos/domain/detach_interface.py | 11 ----------- repos/domain/domain_blkinfo.py | 11 ----------- repos/domain/domain_id.py | 11 ----------- repos/domain/domain_list.py | 13 ------------- repos/domain/domain_name.py | 11 ----------- repos/domain/domain_uuid.py | 11 ----------- repos/domain/dump.py | 11 ----------- repos/domain/eventhandler.py | 11 ----------- repos/domain/hostname.py | 11 ----------- repos/domain/ifstats.py | 11 ----------- repos/domain/install_image.py | 12 ------------ repos/domain/install_linux_cdrom.py | 12 ------------ repos/domain/install_linux_check.py | 12 ------------ repos/domain/install_linux_net.py | 12 ------------ repos/domain/install_windows_cdrom.py | 12 ------------ repos/domain/migrate.py | 11 ----------- repos/domain/ownership_test.py | 15 +++------------ repos/domain/reboot.py | 11 ----------- repos/domain/restore.py | 11 ----------- repos/domain/resume.py | 14 +------------- repos/domain/save.py | 11 ----------- repos/domain/sched_params.py | 5 ----- repos/domain/shutdown.py | 13 +------------ repos/domain/start.py | 13 +------------ repos/domain/suspend.py | 14 +------------- repos/domain/undefine.py | 11 ----------- repos/domain/update_devflag.py | 12 ------------ repos/interface/create.py | 11 ----------- repos/interface/define.py | 11 ----------- repos/interface/destroy.py | 11 ----------- repos/interface/iface_list.py | 11 ----------- repos/interface/iface_mac.py | 11 ----------- repos/interface/iface_name.py | 11 ----------- repos/interface/undefine.py | 12 ------------ repos/libvirtd/qemu_hang.py | 9 --------- repos/libvirtd/restart.py | 9 --------- repos/libvirtd/upstart.py | 9 --------- repos/network/autostart.py | 12 ------------ repos/network/create.py | 11 ----------- repos/network/define.py | 12 ------------ repos/network/destroy.py | 11 ----------- repos/network/network_list.py | 11 ----------- repos/network/network_name.py | 11 ----------- repos/network/network_uuid.py | 11 ----------- repos/network/start.py | 11 ----------- repos/network/undefine.py | 11 ----------- repos/nodedevice/detach.py | 11 ----------- repos/nodedevice/reattach.py | 12 ------------ repos/nodedevice/reset.py | 11 ----------- repos/npiv/create_virtual_hba.py | 12 ------------ .../multiple_thread_block_on_domain_create.py | 12 ------------ repos/remoteAccess/tcp_setup.py | 11 ----------- repos/remoteAccess/tls_setup.py | 11 ----------- repos/remoteAccess/unix_perm_sasl.py | 14 +------------- repos/sVirt/domain_nfs_start.py | 11 +---------- repos/snapshot/delete.py | 11 ----------- repos/snapshot/file_flag.py | 11 ----------- repos/snapshot/flag_check.py | 11 ----------- repos/snapshot/internal_create.py | 11 ----------- repos/snapshot/revert.py | 11 ----------- repos/snapshot/snapshot_list.py | 11 ----------- repos/storage/activate_pool.py | 12 ------------ repos/storage/build_dir_pool.py | 11 ----------- repos/storage/build_disk_pool.py | 11 ----------- repos/storage/build_logical_pool.py | 12 ------------ repos/storage/build_netfs_pool.py | 12 ------------ repos/storage/create_dir_pool.py | 11 ----------- repos/storage/create_dir_volume.py | 11 ----------- repos/storage/create_fs_pool.py | 11 ----------- repos/storage/create_iscsi_pool.py | 11 ----------- repos/storage/create_logical_volume.py | 11 ----------- repos/storage/create_netfs_pool.py | 11 ----------- repos/storage/create_netfs_volume.py | 11 ----------- repos/storage/create_partition_volume.py | 11 ----------- repos/storage/define_dir_pool.py | 11 ----------- repos/storage/define_disk_pool.py | 11 ----------- repos/storage/define_iscsi_pool.py | 12 ------------ repos/storage/define_logical_pool.py | 11 ----------- repos/storage/define_mpath_pool.py | 11 ----------- repos/storage/define_netfs_pool.py | 12 ------------ repos/storage/define_scsi_pool.py | 11 ----------- repos/storage/delete_dir_volume.py | 12 ------------ repos/storage/delete_logical_pool.py | 12 ------------ repos/storage/delete_logical_volume.py | 12 ------------ repos/storage/delete_netfs_volume.py | 12 ------------ repos/storage/delete_partition_volume.py | 11 ----------- repos/storage/destroy_pool.py | 11 ----------- repos/storage/pool_name.py | 11 ----------- repos/storage/pool_uuid.py | 11 ----------- repos/storage/undefine_pool.py | 12 ------------ 101 files changed, 9 insertions(+), 1125 deletions(-)

2 6

[libvirt] [PATCH test-API 0/2]Use encapsulated python APIs in testcases
by Guannan Ren 29 Mar '12

29 Mar '12

These two patches modify library modules and exsiting testcases for disallowing the use of the objects of subclasses in libvirt.py directly. The files in lib directory are the layer of encapsulated python APIs. we should use methods in it for good error catching. 93 files changed, 292 insertions(+), 293 deletions(-) repos/domain/attach_disk.py | 6 +++--- repos/domain/attach_interface.py | 6 +++--- repos/domain/autostart.py | 6 +++--- repos/domain/balloon_memory.py | 6 +++--- repos/domain/blkstats.py | 6 +++--- repos/domain/cpu_affinity.py | 6 +++--- repos/domain/cpu_topology.py | 6 +++--- repos/domain/create.py | 6 +++--- repos/domain/define.py | 6 +++--- repos/domain/destroy.py | 6 +++--- repos/domain/detach_disk.py | 6 +++--- repos/domain/detach_interface.py | 6 +++--- repos/domain/domain_blkinfo.py | 6 +++--- repos/domain/domain_id.py | 6 +++--- repos/domain/domain_uuid.py | 6 +++--- repos/domain/dump.py | 6 +++--- repos/domain/eventhandler.py | 6 +++--- repos/domain/ifstats.py | 6 +++--- repos/domain/install_image.py | 6 +++--- repos/domain/install_linux_cdrom.py | 6 +++--- repos/domain/install_linux_check.py | 6 +++--- repos/domain/install_linux_net.py | 6 +++--- repos/domain/install_windows_cdrom.py | 6 +++--- repos/domain/migrate.py | 11 +++++------ repos/domain/ownership_test.py | 6 +++--- repos/domain/reboot.py | 6 +++--- repos/domain/restore.py | 6 +++--- repos/domain/resume.py | 6 +++--- repos/domain/save.py | 6 +++--- repos/domain/sched_params.py | 6 +++--- repos/domain/shutdown.py | 6 +++--- repos/domain/start.py | 6 +++--- repos/domain/suspend.py | 6 +++--- repos/domain/undefine.py | 6 +++--- repos/domain/update_devflag.py | 6 +++--- repos/interface/create.py | 6 +++--- repos/interface/define.py | 6 +++--- repos/interface/destroy.py | 6 +++--- repos/interface/undefine.py | 6 +++--- repos/libvirtd/qemu_hang.py | 6 +++--- repos/libvirtd/restart.py | 6 +++--- repos/network/autostart.py | 6 +++--- repos/network/create.py | 6 +++--- repos/network/define.py | 6 +++--- repos/network/destroy.py | 6 +++--- repos/network/network_list.py | 6 +++--- repos/network/network_name.py | 6 +++--- repos/network/network_uuid.py | 6 +++--- repos/network/start.py | 6 +++--- repos/network/undefine.py | 6 +++--- repos/nodedevice/detach.py | 6 +++--- repos/nodedevice/reattach.py | 6 +++--- repos/nodedevice/reset.py | 6 +++--- repos/npiv/create_virtual_hba.py | 6 +++--- .../multiple_thread_block_on_domain_create.py | 6 +++--- repos/remoteAccess/tcp_setup.py | 6 +++--- repos/remoteAccess/tls_setup.py | 6 +++--- repos/remoteAccess/unix_perm_sasl.py | 10 +++++----- repos/sVirt/domain_nfs_start.py | 18 +++++++++--------- repos/snapshot/delete.py | 8 ++++---- repos/snapshot/file_flag.py | 6 +++--- repos/snapshot/flag_check.py | 6 +++--- repos/snapshot/internal_create.py | 8 ++++---- repos/snapshot/revert.py | 8 ++++---- repos/storage/activate_pool.py | 6 +++--- repos/storage/build_dir_pool.py | 6 +++--- repos/storage/build_disk_pool.py | 6 +++--- repos/storage/build_logical_pool.py | 6 +++--- repos/storage/build_netfs_pool.py | 6 +++--- repos/storage/create_dir_pool.py | 6 +++--- repos/storage/create_dir_volume.py | 6 +++--- repos/storage/create_fs_pool.py | 6 +++--- repos/storage/create_iscsi_pool.py | 6 +++--- repos/storage/create_logical_volume.py | 6 +++--- repos/storage/create_netfs_pool.py | 6 +++--- repos/storage/create_netfs_volume.py | 6 +++--- repos/storage/create_partition_volume.py | 6 +++--- repos/storage/define_dir_pool.py | 6 +++--- repos/storage/define_disk_pool.py | 6 +++--- repos/storage/define_iscsi_pool.py | 6 +++--- repos/storage/define_logical_pool.py | 6 +++--- repos/storage/define_mpath_pool.py | 6 +++--- repos/storage/define_netfs_pool.py | 6 +++--- repos/storage/define_scsi_pool.py | 6 +++--- repos/storage/delete_dir_volume.py | 6 +++--- repos/storage/delete_logical_pool.py | 6 +++--- repos/storage/delete_logical_volume.py | 6 +++--- repos/storage/delete_netfs_volume.py | 6 +++--- repos/storage/delete_partition_volume.py | 6 +++--- repos/storage/destroy_pool.py | 6 +++--- repos/storage/pool_name.py | 6 +++--- repos/storage/pool_uuid.py | 6 +++--- repos/storage/undefine_pool.py | 6 +++---

2 6

Re: [libvirt] Constantly changing USB product ID
by Doug Goldstein 29 Mar '12

29 Mar '12

On Tue, Mar 27, 2012 at 10:48 AM, Jaap Winius <jwinius(a)umrk.nl> wrote: > Hi folks, > > Recently I learned how to configure KVM with USB pass-though functionality. > In my case I configured my guest domain with this block of code: > > <hostdev mode='subsystem' type='usb' managed='yes'> > <source> > <vendor id='0x0c93'/> > <product id='0x1772'/> > <address bus='1' device='4'/> > </source> > </hostdev> > > At first this worked fine, but then later the guest domain refused to start > because the USB device was absent. When I checked, I found that its product > ID had mysteriously changed to 1771. Later it was back at 1772. Now it > appears that the USB device I am dealing with has a product ID that changes > back and forth between 1771 and 1772 at random. > > Apparently, the Windows program running on the guest domain is designed to > deal with this nonsense, but the question is, Can KVM be configured to deal > with it? Something like <product id='0x177*'/> would be useful, but that > doesn't work. > > Any ideas would be much appreciated. > > Thanks, > > Jaap > FWIW, if someone needs a device to test a potential patch with just take any rooted Android phone. e.g. an HTC at the HBOOT menu presents itself as a different product ID than when the phone is normally booted. You can also do this with an iPhone, just hold down the power and the home button to boot it into a "recovery" mode where it'll have a different product ID than normal. -- Doug Goldstein

3 2

[libvirt] [PATCH] qemu: eliminate nested switch, simplify code
by Laine Stump 28 Mar '12

28 Mar '12

qemuBuildHostNetStr had a switch-within-a-switch where both were looking at the same variable. This was apparently to take advantage of code common to three different cases (while also taking care of some code that was different). However, there were only 2 lines common to all, one of those can be eliminated by merging it into the virAsprintfs that are in each case. On top of that, all the extra empty cases cause Coverity complaints (because they are unreachable), but absence of the empty cases causes a compile error due to "enumeration value not handled in switch". The solution is to just make each toplevel case independent, folding in the common code to each. --- src/qemu/qemu_command.c | 55 ++++++++++++++++++----------------------------- 1 files changed, 21 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3d2bb6b..6b246d6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2721,8 +2721,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_DIRECT: - virBufferAddLit(&buf, "tap"); - virBufferAsprintf(&buf, "%cfd=%s", type_sep, tapfd); + virBufferAsprintf(&buf, "tap%cfd=%s", type_sep, tapfd); type_sep = ','; is_tap = true; break; @@ -2742,40 +2741,28 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_CLIENT: + virBufferAsprintf(&buf, "socket%cconnect=%s:%d", + type_sep, + net->data.socket.address, + net->data.socket.port); + type_sep = ','; + break; + case VIR_DOMAIN_NET_TYPE_SERVER: + virBufferAsprintf(&buf, "socket%clisten=%s:%d", + type_sep, + net->data.socket.address, + net->data.socket.port); + type_sep = ','; + break; + case VIR_DOMAIN_NET_TYPE_MCAST: - virBufferAddLit(&buf, "socket"); - switch (netType) { - case VIR_DOMAIN_NET_TYPE_CLIENT: - virBufferAsprintf(&buf, "%cconnect=%s:%d", - type_sep, - net->data.socket.address, - net->data.socket.port); - break; - case VIR_DOMAIN_NET_TYPE_SERVER: - virBufferAsprintf(&buf, "%clisten=%s:%d", - type_sep, - net->data.socket.address, - net->data.socket.port); - break; - case VIR_DOMAIN_NET_TYPE_MCAST: - virBufferAsprintf(&buf, "%cmcast=%s:%d", - type_sep, - net->data.socket.address, - net->data.socket.port); - break; - case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_ETHERNET: - case VIR_DOMAIN_NET_TYPE_NETWORK: - case VIR_DOMAIN_NET_TYPE_BRIDGE: - case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_DIRECT: - case VIR_DOMAIN_NET_TYPE_HOSTDEV: - case VIR_DOMAIN_NET_TYPE_LAST: - break; - } - type_sep = ','; - break; + virBufferAsprintf(&buf, "socket%cmcast=%s:%d", + type_sep, + net->data.socket.address, + net->data.socket.port); + type_sep = ','; + break; case VIR_DOMAIN_NET_TYPE_USER: default: -- 1.7.7.6

2 1

Re: [libvirt] [PATCH] qemu: live change of the bridge used by a guest network device
by Laine Stump 28 Mar '12

28 Mar '12

Is this patch too much "new code" to push now? https://www.redhat.com/archives/libvir-list/2012-March/msg01228.html The reasons I ask are two-fold - 1) it sat for a long time before anybody reviewed it. 2) I just noticed that there is a bug in the existing code that fails to flag a change in bridge name as an error (although it does nothing with it), and this patch would remedy that, so in one way it could be considered a bugfix.

2 1

[libvirt] [libvirt-glib] Do not encode entities in XML attributes
by Christophe Fergeau 28 Mar '12

28 Mar '12

libxml2 will properly escape < > and " in XML attribute content. If we use xmlEncodeEntitiesReentrant for attributes, this causes issues with UTF8 filenames (gvir_config_domain_disk_set_source for example): the filename UTF8 characters will be substituted with entities (é -> é), but when it uses this filename, libvirt will use it as is and will fail to find the file. I've tested that with this change gnome-boxes can open ISOs in directories with 'é' in their names, and in directories with '&foo;xx<' in their names. --- libvirt-gconfig/libvirt-gconfig-object.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 9a142c9..ee3584a 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -711,7 +711,6 @@ gvir_config_object_set_attribute(GVirConfigObject *object, ...) while (TRUE) { const char *name; const char *value; - xmlChar *encoded_value; name = va_arg(args, const char *); if (name == NULL) { @@ -723,9 +722,7 @@ gvir_config_object_set_attribute(GVirConfigObject *object, ...) g_warn_if_reached(); break; } - encoded_value = xmlEncodeEntitiesReentrant(doc, (xmlChar*)value); - xmlNewProp(object->priv->node, (xmlChar *)name, encoded_value); - xmlFree(encoded_value); + xmlNewProp(object->priv->node, (xmlChar *)name, (xmlChar *)value); } va_end(args); } @@ -780,17 +777,11 @@ gvir_config_object_set_attribute_with_type(GVirConfigObject *object, ...) str = g_strdup_printf("%d", val); break; } - case G_TYPE_STRING: { - xmlDocPtr doc; - xmlChar *enc_str; - + case G_TYPE_STRING: str = va_arg(args, char *); - g_object_get(G_OBJECT(object->priv->doc), "doc", &doc, NULL); - enc_str = xmlEncodeEntitiesReentrant(doc, (xmlChar*)str); - str = g_strdup((char *)enc_str); - xmlFree(enc_str); + xmlNewProp(object->priv->node, (xmlChar *)name, (xmlChar *)str); + str = NULL; break; - } case G_TYPE_BOOLEAN: { gboolean val; val = va_arg(args, gboolean); -- 1.7.9.3

2 1

[libvirt] [PATCH] qemu: Make migration fail when port profile association fails on the dst host
by Christian Benvenuti (benve) 28 Mar '12

28 Mar '12

In the current V3 migration protocol, Libvirt does not check the result of the function qemuMigrationVPAssociatePortProfiles This means that it is possible for a migration to complete successfully even when the VM loses network connectivity on the destination host. With this change libvirt aborts the migration (during the "finish" step) when the above function fails, that is to say when at least one of the port profile associations fails. Signed-off by: Christian Benvenuti <benve(a)cisco.com>

2 2

[libvirt] [PATCHv2] virsh: plug memory leaks on failure path
by Alex Jia 28 Mar '12

28 Mar '12

Leaks are introduced in commit 1cf0e3d and fe383bb. Fixing memory leaks, in addition, the patch also fixs a potential missing return value issue in 'if (from)' statement, without the fixing, although the programming met a error, the subsequent codes will be executed continually. * tools/virsh.c (cmdSnapshotList): fix memory leaks and missing return value. * How to reproduce? % virsh snapshot-list <domain> --parent --roots % virsh snapshot-list <domain> --parent --tree % virsh snapshot-list <domain> --roots --tree actual result: error: --parent and --roots are mutually exclusive error: Failed to disconnect from the hypervisor, 1 leaked reference(s) error: --parent and --tree are mutually exclusive error: Failed to disconnect from the hypervisor, 1 leaked reference(s) error: --roots and --tree are mutually exclusive error: Failed to disconnect from the hypervisor, 1 leaked reference(s) ...... % virsh snapshot-create-as <domain> --name "hello" % virsh snapshot-create-as <domain> --name "libvirt" % virsh snapshot-list <domain> --roots --from "hello" actual result: error: --roots and --from are mutually exclusive Name Creation Time State ------------------------------------------------------------ libvirt 2012-03-28 13:46:51 +0800 running 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 5009b6b..8ee25c3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -16357,23 +16357,24 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "roots")) { vshError(ctl, "%s", _("--parent and --roots are mutually exclusive")); - return false; + goto cleanup; } if (tree) { vshError(ctl, "%s", _("--parent and --tree are mutually exclusive")); - return false; + goto cleanup; } parent_filter = 1; } else if (vshCommandOptBool(cmd, "roots")) { if (tree) { vshError(ctl, "%s", _("--roots and --tree are mutually exclusive")); - return false; + goto cleanup; } if (from) { vshError(ctl, "%s", _("--roots and --from are mutually exclusive")); + goto cleanup; } flags |= VIR_DOMAIN_SNAPSHOT_LIST_ROOTS; } @@ -16381,7 +16382,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (tree) { vshError(ctl, "%s", _("--leaves and --tree are mutually exclusive")); - return false; + goto cleanup; } flags |= VIR_DOMAIN_SNAPSHOT_LIST_LEAVES; } -- 1.7.1

2 2

[libvirt] [PATCH 1/2] python: Add new helper functions for python to C integral conversion
by Guannan Ren 28 Mar '12

28 Mar '12

int libvirt_intUnwrap(PyObject *obj, int *val); int libvirt_uintUnwrap(PyObject *obj, unsigned int *val); int libvirt_longUnwrap(PyObject *obj, long *val); int libvirt_ulongUnwrap(PyObject *obj, unsigned long *val); int libvirt_longlongUnwrap(PyObject *obj, long long *val); int libvirt_ulonglongUnwrap(PyObject *obj, unsigned long long *val); int libvirt_doubleUnwrap(PyObject *obj, double *val); int libvirt_boolUnwrap(PyObject *obj, bool *val); --- python/typewrappers.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++++ python/typewrappers.h | 9 +++ 2 files changed, 151 insertions(+), 0 deletions(-) diff --git a/python/typewrappers.c b/python/typewrappers.c index 3f200b3..6ad01df 100644 --- a/python/typewrappers.c +++ b/python/typewrappers.c @@ -119,6 +119,148 @@ libvirt_constcharPtrWrap(const char *str) return (ret); } +int +libvirt_intUnwrap(PyObject *obj, int *val) +{ + long long_val; + + /* If obj is type of PyInt_Type, PyInt_AsLong converts it + * to C long type directly. If it is of PyLong_Type, PyInt_AsLong + * will call PyLong_AsLong() to deal with it automatically. + */ + long_val = PyInt_AsLong(obj); + if ((long_val == -1) && PyErr_Occurred()) + return -1; + + if ((int)long_val == long_val) { + *val = long_val; + } else { + PyErr_SetString(PyExc_OverflowError, + "Python int too large to convert to C int"); + return -1; + } + return 0; +} + +int +libvirt_uintUnwrap(PyObject *obj, unsigned int *val) +{ + long long_val; + + long_val = PyInt_AsLong(obj); + if ((long_val == -1) && PyErr_Occurred()) + return -1; + + if ((unsigned int)long_val == long_val) { + *val = long_val; + } else { + PyErr_SetString(PyExc_OverflowError, + "Python int too large to convert to C unsigned int"); + return -1; + } + return 0; +} + +int +libvirt_longUnwrap(PyObject *obj, long *val) +{ + long long_val; + + long_val = PyInt_AsLong(obj); + if ((long_val == -1) && PyErr_Occurred()) + return -1; + + *val = long_val; + return 0; +} + +int +libvirt_ulongUnwrap(PyObject *obj, unsigned long *val) +{ + long long_val; + + long_val = PyInt_AsLong(obj); + if ((long_val == -1) && PyErr_Occurred()) + return -1; + + *val = long_val; + return 0; +} + +int +libvirt_longlongUnwrap(PyObject *obj, long long *val) +{ + long long llong_val; + + /* If obj is of PyInt_Type, PyLong_AsLongLong + * will call PyInt_AsLong() to handle it automatically. + */ + llong_val = PyLong_AsLongLong(obj); + if ((llong_val == -1) && PyErr_Occurred()) + return -1; + + *val = llong_val; + return 0; +} + +int +libvirt_ulonglongUnwrap(PyObject *obj, unsigned long long *val) +{ + unsigned long long ullong_val = -1; + + /* The PyLong_AsUnsignedLongLong doesn't check the type of + * obj, only accept argument of PyLong_Type, so we check it instead. + */ + if (PyInt_Check(obj)) { + ullong_val = PyInt_AsLong(obj); + } else if (PyLong_Check(obj)) { + ullong_val = PyLong_AsUnsignedLongLong(obj); + } else { + PyErr_SetString(PyExc_TypeError, "an integer is required"); + } + + if ((ullong_val == -1) && PyErr_Occurred()) + return -1; + + *val = ullong_val; + return 0; +} + +int +libvirt_doubleUnwrap(PyObject *obj, double *val) +{ + double double_val; + + double_val = PyFloat_AsDouble(obj); + if ((double_val == -1) && PyErr_Occurred()) + return -1; + + *val = double_val; + return 0; +} + +int +libvirt_boolUnwrap(PyObject *obj, bool *val) +{ + int ret = -1; + + /* We only accept PyInt_Type, PyLong_Type and PyBool_Type + * as the boolean representation. + */ + if (PyInt_Check(obj) || + PyLong_Check(obj) || PyBool_Check(obj)) { + ret = PyObject_IsTrue(obj); + if (ret < 0) + return ret; + + *val = ret > 0; + return 0; + } else { + PyErr_SetString(PyExc_TypeError, "an integer or bool is required"); + } + return ret; +} + PyObject * libvirt_virDomainPtrWrap(virDomainPtr node) { diff --git a/python/typewrappers.h b/python/typewrappers.h index 1e34dfa..af68bce 100644 --- a/python/typewrappers.h +++ b/python/typewrappers.h @@ -7,6 +7,7 @@ */ #include <Python.h> +#include <stdbool.h> #include "libvirt/libvirt.h" #include "libvirt/virterror.h" @@ -163,6 +164,14 @@ PyObject * libvirt_ulonglongWrap(unsigned long long val); PyObject * libvirt_charPtrWrap(char *str); PyObject * libvirt_charPtrSizeWrap(char *str, Py_ssize_t size); PyObject * libvirt_constcharPtrWrap(const char *str); +int libvirt_intUnwrap(PyObject *obj, int *val); +int libvirt_uintUnwrap(PyObject *obj, unsigned int *val); +int libvirt_longUnwrap(PyObject *obj, long *val); +int libvirt_ulongUnwrap(PyObject *obj, unsigned long *val); +int libvirt_longlongUnwrap(PyObject *obj, long long *val); +int libvirt_ulonglongUnwrap(PyObject *obj, unsigned long long *val); +int libvirt_doubleUnwrap(PyObject *obj, double *val); +int libvirt_boolUnwrap(PyObject *obj, bool *val); PyObject * libvirt_virConnectPtrWrap(virConnectPtr node); PyObject * libvirt_virDomainPtrWrap(virDomainPtr node); PyObject * libvirt_virNetworkPtrWrap(virNetworkPtr node); -- 1.7.7.5

2 11

Re: [libvirt] Constantly changing USB product ID
by Avi Kivity 28 Mar '12

28 Mar '12

On 03/28/2012 02:41 PM, Avi Kivity wrote: > On 03/27/2012 05:48 PM, Jaap Winius wrote: > > Hi folks, > > > > Recently I learned how to configure KVM with USB pass-though > > functionality. In my case I configured my guest domain with this block > > of code: > > > > <hostdev mode='subsystem' type='usb' managed='yes'> > > <source> > > <vendor id='0x0c93'/> > > <product id='0x1772'/> > > <address bus='1' device='4'/> > > </source> > > </hostdev> > > > > At first this worked fine, but then later the guest domain refused to > > start because the USB device was absent. When I checked, I found that > > its product ID had mysteriously changed to 1771. Later it was back at > > 1772. Now it appears that the USB device I am dealing with has a > > product ID that changes back and forth between 1771 and 1772 at random. > > > > Apparently, the Windows program running on the guest domain is > > designed to deal with this nonsense, but the question is, Can KVM be > > configured to deal with it? Something like <product id='0x177*'/> > > would be useful, but that doesn't work. > > > > Any ideas would be much appreciated. > > > > This is really strange. What kind of device is this? > > I've filed an RFE [1] for virt-manager for assigning USB host devices > opportunistically, that is if they're plugged they're assigned, and if > not the guest starts without them. If it were implemented, you could > assign both 0x1771 and 0x1772 and whichever ID the device is today would > get assigned. > > > [1] https://bugzilla.redhat.com/show_bug.cgi?id=804432 > btw, the correct place for this discussion is likely the libvirt mailing list, or maybe the virt-manager list if it exists. -- error compiling committee.c: too many arguments to function

1 0

[libvirt] Modern CPU models cannot be used with libvirt
by Jiri Denemark 28 Mar '12

28 Mar '12

Hi, Recently I realized that all modern CPU models defined in /etc/qemu/target-x86_64.conf are useless when qemu is used through libvirt. That's because we start qemu with -nodefconfig which results in qemu ignoring that file with CPU model definitions. We have a very good reason for using -nodefconfig because we need to control the ABI presented to a guest OS and we don't want any configuration file that can contain lots of things including device definitions to be read by qemu. However, we would really like the new CPU models to be understood by qemu even if used through libvirt. What would be the best way to solve this? I suspect this could have been already discussed in the past but obviously a workable solution was either not found or just not implemented. Jirka

15 103

[libvirt] RFC: storage migration via pre-copy and streaming mirrors
by Eric Blake 28 Mar '12

28 Mar '12

This is the counter-proposal to my earlier RFC for storage migration via snapshot mirrors[1], resulting from a NACK on the code review for that earlier proposal[2]. In particular, this proposal fleshes out some of Paolo's design overview on the qemu wiki[3]. [1] https://www.redhat.com/archives/libvir-list/2012-March/msg00578.html [2] https://www.redhat.com/archives/libvir-list/2012-March/msg01033.html [3] http://wiki.qemu.org/Features/SnapshotsMultipleDevices My plan is to have everything in this RFC coded up in the next couple of days (hopefully no later than Thursday); this has missed the feature freeze for 0.9.11, so it should not be applied upstream until after the weekend release, as one of the first patches for 0.9.12. Backport-wise, the new flags can be backported as far back as the 0.9.10 .so API, but the new virDomainBlockCopy() API cannot be exported when doing a backport without breaking .so versions (although it's implemenation can be used internally). Additions ========= The following new error code will be added: VIR_ERR_BLOCK_COPY_IN_PROGRESS The following new API will be added: int virDomainBlockCopy(virDomainPtr dom, const char *disk, const char *base, const char *dest, const char *format, unsigned long bandwidth, unsigned int flags); The following new named values will be added: enum virDomainBlockJobType (used in virDomainBlockJobInfo): VIR_DOMAIN_BLOCK_JOB_TYPE_COPY = 2 The following new flags will be added: for virDomainBlockRebase: VIR_DOMAIN_BLOCK_REBASE_SHALLOW = 1 << 0 VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT = 1 << 1 VIR_DOMAIN_BLOCK_REBASE_COPY = 1 << 2 for virDomainBlockCopy: VIR_DOMAIN_BLOCK_COPY_SHALLOW = 1 << 0 VIR_DOMAIN_BLOCK_COPY_REUSE_EXT = 1 << 1 for virDomainBlockJobAbort: VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT Add some XML: Under //domain/drivers/disk, next to <source file='...'/>, add <mirror file='...'/> Semantics ========= virDomainBlockCopy sets up a BLOCK_JOB_TYPE_COPY job. 'disk' names the disk to be copied (can be 'vda' or '/path/to/source', as with other block commands) and must not be NULL. 'base' names the path to the backing file in the chain of the source that will be the new backing file of the destination; if this parameter is NULL, then the destination file defaults to a complete block pull, but the COPY_SHALLOW flag instead requests a pull of just the top file in the source backing chain. 'dest' names the copy being created and must not be NULL; normally, this file is created by the hypervisor/libvirt, but the COPY_REUSE_EXT flag lets an application pass in a pre-created file (allowing metadata to include a relative instead of absolute backing file name). 'format' gives the format of the copy, or NULL to either probe the format of a COPY_REUSE_EXT dest or to reuse the same format as the source. flags cannot contain COPY_SHALLOW unless 'base' is NULL. Once a block copy job is started, calls to virDomainGetBlockJobInfo() for the same 'disk' will report an info with VIR_DOMAIN_BLOCK_JOB_TYPE_COPY as the type. This job never completes on its own, but must be stopped by the user (this enables mirroring to continue until the user informs libvirt that any backing files, perhaps located at different locations as specified by relative path names using REUSE_EXT, have been externally copied into place). There are two phases to a TYPE_COPY job. In the first phase, cur < end when querying progress, calls to virDomainBlockJobAbort(dom, disk, 0) will cancel the operation and revert to the source, and calls to virDomainBlockJobAbort(dom, disk, VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT) will fail with VIR_ERR_BLOCK_COPY_IN_PROGRESS. In the second phase, cur == end when querying progress, calls to virDomainBlockJobAbort(dom, disk, 0) will break the mirroring and revert to the source, while calls to virDomainBlockJobAbort(dom, disk, VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT) will break the mirroring and pivot to the destination. Use of VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT on a non-copy block job will fail with VIR_ERR_INVALID_ARG. virDomainBlockRebase(dom, disk, dest, bandwidth, VIR_DOMAIN_BLOCK_REBASE_COPY | (flags & 3)) is shorthand for virDomainBlockCopy(dom, disk, NULL, dest, NULL, bandwidth, (flags & 3)) - that is, use of the REBASE_COPY flag treats the BlockRebase 'base' argument as the BlockCopy 'dest' argument, creates the destination with the same file format as the source (or probes the backing file format if REBASE_REUSE_EXT is used), and passes the COPY_SHALLOW and COPY_REUSE_EXT flags through (note that the similarly named flags were conveniently chosen to be the same values). Attempts to use REBASE_SHALLOW or REBASE_REUSE_EXT without also using REBASE_COPY will fail with VIR_ERR_INVALID_ARG. While a copy operation is in place, virDomainGetXMLDesc (dumpxml) will show the <mirror> element for that <disk>. Initial Implementation ====================== When virDomainBlockCopy is called (perhaps via the virDomainBlockRebase alias), it first sets up a mirror using the 'drive-mirror' monitor command and the destination file name. The mirror is opened with the 'existing' mode if _REUSE_EXT is present; otherwise it is opened with the 'absolute-paths' mode if _SHALLOW is present or 'no-backing-file' mode if no flags are present. Next, the function calls the 'block_stream' monitor command to start the streaming. The streaming command uses 'base' as its starting point, except that when _SHALLOW was specified, libvirt will use the backing file of the source disk, rather than NULL (this can be obtained by the 'query-block' monitor command; although someday libvirt should start tracking this information in <domain> XML rather than relying on qemu). At this point, control returns to the user, and the stream proceeds in the background; virDomainBlockJobSetSpeed can tune the speed of the block streaming. At least in the initial implementation, as long as the block job is active, libvirt will prevent 'virDomainMigrate', 'virDomainSave', 'virDomainSnapshotCreateXML' in general, and 'virDomainDetachDevice' of the disk being mirrored, all with the new VIR_ERR_BLOCK_COPY_IN_PROGRESS error. This is because I don't have an easy way to resume mirroring when restarting a new qemu process; preventing these actions until the user first cancels the ongoing mirroring will result in fewer corner cases that libvirt has to worry about. This also implies that the initial implementation will fail for persistent domains, and only be useful for transient domains. Attempts to define a domain with a <mirror> element are rejected, leaving <mirror> as output-only XML useful in restoring state when restarting libvirtd. It may be possible to add persistent support in the future, once we determine how to make qemu resume a mirrored block device; at that point, it would be possible to specify <mirror> in domain xml during domain creation or during device hotplug. When the block stream finishes, qemu will send an event to libvirt (libvirt will also have to manually check for completion on a libvirtd restart, based on whether cur == end in the block job info). I'm not yet sure whether to expose this event to the user so that they do not have to poll the block job info, or whether to consume it internally. At any rate, before this event occurs, the BLOCK_JOB_ABORT_PIVOT flag is rejected, and virDomainBlockJobAbort without flags uses the 'block_job_cancel' monitor command to stop the streaming early, then the 'drive-reopen' monitor command to break the mirroring back to the source; it is feasible that there is a race where a 'block_job_cancel' can be called after the pull is complete but before the completion event has been processed, so the code must proceed on to the 'drive-reopen' even if the job cancel fails. After the event occurs, virDomainBlockJobAbort only needs to use the 'drive-reopen' monitor command, with either the source or the destination file depending on the BLOCK_JOB_ABORT_PIVOT flag. Until 'drive-reopen' is made atomic in qemu (by adding code to support it inside 'transaction'), the user risks a block job abort rendering the disk unusable, because the source was closed before the destination was opened; hopefully this situation is rare, in part because libvirt will do stat() checks and SELinux labeling on destination files before starting qemu monitor commands, as a sanity check that qemu will be able to use the specified files. If qemu ever adds atomic 'drive-reopen' support, we can add a new flag BLOCK_JOB_ABORT_ATOMIC that fails on older qemu, and ensures the use of 'transaction' on the newer qemu that supports an atomic reopen. If a block mirror is aborted (whether by the user calling virDomainBlockJobAbort with no flag, or by the qemu process ending due to things like a guest-initiated shutdown), then the mirror can be safely discarded, and restarting the domain will be unmirrored where the virDomainBlockRebase can be called again from scratch. Examples ======== For some examples, starting with base <- snap1 <- snap2 <- snap3 as the backing chain for disk 'vda', virDomainBlockCopy(dom, "vda", NULL, "/path/to/copy", NULL, 0) would set up a job that results in /path/to/copy being the same file format as snap3, but containing the entire chain virDomainBlockCopy(dom, "vda", "/path/to/snap1", "/path/to/copy", "qed", 0) would set up a job that results in base <- snap1 <- copy as the mirrored backing chain, and ensuring that copy is formatted as qed regardless of the format of snap3 virDomainBlockCopy(dom, "vda", NULL, "/path/to/copy", NULL, VIR_DOMAIN_BLOCK_COPY_SHALLOW) is shorthand for virDomainBlockCopy(dom, "vda", "/path/to/snap2", "/path/to/copy", NULL, 0) and results in base <- snap1 <- snap2 <- copy creates copy using the same format as snap3 virDomainBlockCopy(dom, "vda", "/path/to/snap2", "/path/to/copy", NULL, VIR_DOMAIN_BLOCK_COPY_REUSE_EXT) requires /path/to/copy to already exist, probes it for existing format (which might be different from snap3), and proceeds to mirror everything so that snap2 is the base of copy (and the user is at fault if the pre-existing file doesn't call out a backing file that happens to be identical in content to snap2) oVirt will probably use the sequence: - use qemu-img to create an empty qcow2 file with relative backing name to the destination storage - call virDomainBlockRebase(dom, disk, "/path/to/copy", VIR_DOMAIN_BLOCK_REBASE_COPY | VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT) - copy the base files from source to destination storage (this can be done in parallel, either before or after the virDomainBlockRebase call) - wait for the block pull to finish (either by waiting for an event if I propagate the event, or by polling virDomainBlockJobInfo, or even by polling virDomainBlockJobAbort(VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT) and checking for VIR_ERR_BLOCK_COPY_IN_PROGRESS - once both the base files are in place and the block pull half of the copy job is complete (and without regard to whether the block stream or the external base file copying completed first), call virDomainBlockJobAbort(,VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT) to reopen to the new storage domain chain Comparison to first RFC ======================= This proposal exposes only one disk at a time, while the earlier virDomainSnapshotCreateXML <mirror> approach could atomically set up mirroring on multiple disks. However, the nature of block jobs being a background process means that parallel jobs can be run on independent disks, so the user can do the overall block migration with the time cost of the slowest disk, rather than having to do things serially with the time cost of all disks added together. This proposal avoids having to create an intermediate snapshot, so the pull is more efficient and the source chain does not get longer, no matter how many times the process is aborted and restarted. This proposal can expose the no-backing-file mode, while the snapshot approach did not. To survive across libvirtd restarts, the snapshot approach was using <domainsnapshot> to store the mirroring status in a user-visible location; this approach has to modify the internal live xml (alongside other internal data, such as the qemu pid). Or perhaps I can add a <mirror> subelement to <disk> of a domain and make it user-visible after all, and treat that as an output-only parameter for now. Both approaches face the dilemma of how to start a new qemu process with mirroring intact, and my solution in both patch series will be to prevent any action that would force libvirt to save domain state until after the user has first canceled all current mirroring jobs. This limitation is not permanent - if future qemu provides better ways to restart mirroring, and as libvirt is taught to store the full backing chain in <domain> xml instead of probing it on the fly, we can relax this restriction in the future. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] libvirt starts QEMU with bad CPU based on its XML
by Doug Goldstein 28 Mar '12

28 Mar '12

My XML configs for my VM machines have it set to AMD Opteron G3s, but libvirt is creating QEMU with a core2duo. This is not correct at all. I've included the setup and config of one machine that does this. But another machine that does this matches danpb's AMD Quad Core Dual NUMA system he posted on the mailing list recently. That machine is using a stock qemu-0.15.1 from upstream's git and libvirt git a few commits shy of the 0.9.11 rc1. The machine below is using libvirt 0.9.10 and qemu-kvm-1.0. Here's the setup: The host is: processor : 63 vendor_id : AuthenticAMD cpu family : 21 model : 1 model name : AMD Opteron(TM) Processor 6272 stepping : 2 microcode : 0x6000613 cpu MHz : 2099.875 cache size : 2048 KB physical id : 2 siblings : 16 core id : 7 cpu cores : 8 apicid : 79 initial apicid : 79 fpu : yes fpu_exception : yes cpuid level : 13 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm aperfmperf pni pclmulqdq monitor ssse3 cx16 sse4_1 sse4_2 popcnt aes xsave avx lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs xop skinit wdt lwp fma4 nodeid_msr topoext perfctr_core arat cpb npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold bogomips : 4200.08 TLB size : 1536 4K pages clflush size : 64 cache_alignment : 64 address sizes : 48 bits physical, 48 bits virtual power management: ts ttp tm 100mhzsteps hwpstate [9] The guest is: processor : 1 vendor_id : AuthenticAMD cpu family : 6 model : 15 model name : Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz stepping : 11 cpu MHz : 2100.397 cache size : 512 KB fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx mmxext fxsr_opt pdpe1gb lm pni cx16 popcnt lahf_lm cmp_legacy svm cr8legacy abm sse4a misalignsse 3dnowprefetch bogomips : 4200.01 The QEMU command line contains the following: -cpu core2duo,+wdt,+skinit,+osvw,+3dnowprefetch,+misalignsse,+sse4a,+abm,+cr8legacy,+extapic,+svm,+cmp_legacy,+lahf_lm,+rdtscp,+pdpe1gb,+fxsr_opt,+mmxext,+aes,+popcnt,+sse4.2,+sse4.1,+cx16,+ht While libvirt's XML contains: <cpu match='exact'> <model>Opteron_G3</model> <vendor>AMD</vendor> <feature policy='require' name='aes'/> <feature policy='require' name='skinit'/> <feature policy='require' name='vme'/> <feature policy='require' name='mmxext'/> <feature policy='require' name='fxsr_opt'/> <feature policy='require' name='cr8legacy'/> <feature policy='require' name='ht'/> <feature policy='require' name='3dnowprefetch'/> <feature policy='require' name='ssse3'/> <feature policy='require' name='wdt'/> <feature policy='require' name='extapic'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='osvw'/> <feature policy='require' name='sse4.1'/> <feature policy='require' name='cmp_legacy'/> <feature policy='require' name='sse4.2'/> </cpu> -- Doug Goldstein

2 1

[libvirt] [PATCH] virsh: plug memory leaks on failure path
by Alex Jia 28 Mar '12

28 Mar '12

Leaks are introduced in commit 1cf0e3d and fe383bb. * tools/virsh.c (cmdSnapshotList): fix memory leaks. * How to reproduce? % virsh snapshot-list foo --parent --roots error: --parent and --roots are mutually exclusive error: Failed to disconnect from the hypervisor, 1 leaked reference(s) % virsh snapshot-list foo --parent --tree error: --parent and --tree are mutually exclusive error: Failed to disconnect from the hypervisor, 1 leaked reference(s) % virsh snapshot-list foo --roots --tree error: --roots and --tree are mutually exclusive error: Failed to disconnect from the hypervisor, 1 leaked reference(s) ...... Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5009b6b..f5c3b60 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -16357,11 +16357,13 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "roots")) { vshError(ctl, "%s", _("--parent and --roots are mutually exclusive")); + virDomainFree(dom); return false; } if (tree) { vshError(ctl, "%s", _("--parent and --tree are mutually exclusive")); + virDomainFree(dom); return false; } parent_filter = 1; @@ -16369,11 +16371,13 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (tree) { vshError(ctl, "%s", _("--roots and --tree are mutually exclusive")); + virDomainFree(dom); return false; } if (from) { vshError(ctl, "%s", _("--roots and --from are mutually exclusive")); + virDomainFree(dom); } flags |= VIR_DOMAIN_SNAPSHOT_LIST_ROOTS; } @@ -16381,6 +16385,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (tree) { vshError(ctl, "%s", _("--leaves and --tree are mutually exclusive")); + virDomainFree(dom); return false; } flags |= VIR_DOMAIN_SNAPSHOT_LIST_LEAVES; -- 1.7.1

2 2

[libvirt] [PATCH] virsh: add error return value
by Alex Jia 28 Mar '12

28 Mar '12

* tools/virsh.c (cmdSnapshotList): Avoiding to continue to execute subsequent codes, the programming should return false when meeting a error. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=807545 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5009b6b..7e74744 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -16374,6 +16374,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (from) { vshError(ctl, "%s", _("--roots and --from are mutually exclusive")); + return false; } flags |= VIR_DOMAIN_SNAPSHOT_LIST_ROOTS; } -- 1.7.1

2 2

[libvirt] Coverity automatic detection
by Alex Jia 28 Mar '12

28 Mar '12

This email is automatically generated. The test result is based on the following git commit: 851117b Enable all warnings permanently & default to -Werror for GIT builds Analysis summary report: ------------------------ Files analyzed : 306 Total LoC input to cov-analyze : 362576 Functions analyzed : 8807 Paths analyzed : 1075505 Defect occurrences found : 105 Total 7 ATOMICITY 15 CHECKED_RETURN 14 DEADCODE 1 EVALUATION_ORDER 9 FORWARD_NULL 13 LOCK 3 NEGATIVE_RETURNS 1 NO_EFFECT 3 NULL_RETURNS 1 OVERRUN_STATIC 16 RESOURCE_LEAK 1 RETURN_LOCAL 12 REVERSE_INULL 1 SIZEOF_MISMATCH 6 UNINIT 2 UNUSED_VALUE Exceeded path limit of 5000 paths in 0.55% of functions (normally up to 5% of functions encounter this limitation) For details, please see attachment. Regards, Alex

1 0

[libvirt] [PATCH] snapshot: fix virsh docs
by Eric Blake 28 Mar '12

28 Mar '12

Commit d42a2ff forgot to touch up virsh documentation, and commit 4e9953a mis-spelled the option name. * tools/virsh.pod (snapshot-create, snapshot-create-as): Fix typo and match recent change in flag meaning. --- tools/virsh.pod | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 390bcec..76d2ea4 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2347,7 +2347,7 @@ metadata again). If I<--reuse-external> is specified, and the snapshot XML requests an external snapshot with a destination of an existing file, then the -existing file is truncated and reused; otherwise, a snapshot is refused +destination must exist, and is reused; otherwise, a snapshot is refused to avoid losing contents of the existing files. If I<--quiesce> is specified, libvirt will try to use guest agent @@ -2367,7 +2367,7 @@ metadata is silently lost when the domain quits running (whether by command such as B<destroy> or by internal guest action). =item B<snapshot-create-as> I<domain> {[I<--print-xml>] -| [I<--no-metadata>] [I<--halt>] [I<--reuse-existing>]} [I<name>] +| [I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I<name>] [I<description>] [I<--disk-only> [I<--quiesce>] [I<--atomic>] [[I<--diskspec>] B<diskspec>]...] @@ -2394,7 +2394,7 @@ results in the following XML: If I<--reuse-external> is specified, and the domain XML or I<diskspec> option requests an external snapshot with a destination of an existing -file, then the existing file is truncated and reused; otherwise, a +file, then the destination must exist, and is reused; otherwise, a snapshot is refused to avoid losing contents of the existing files. If I<--quiesce> is specified, libvirt will try to use guest agent -- 1.7.7.6

2 2

[libvirt] Turning off libvirtd mdns by default
by Stef Walter 27 Mar '12

27 Mar '12

In the GNOME UI we'd like to make use of Avahi discovery and name resolution "out of the box". A typical use case is for discovery of printers that are advertised using MDNS. This should work even on potentially 'hostile' networks such as a wireless access point in a print shop or airport. It should work without user configuration. https://fedoraproject.org/wiki/Desktop/Whiteboards/AvahiDefault In order to turn on Avahi by default, and make it work by default, we'd like to make it possible to use Avahi without advertising any information to the network by default. Advertising information to the network (even the host name) without the user's configuration or consent is a privacy issue. libvirtd advertises itself via MDNS on the network by default. I understand that MDNS discovery of libvirtd is really handy in many cases. However since one has to configure network access in libvirtd anyway -- none of the access methods work "out of the box" to my understanding -- I'd like to suggest turning off libvirtd's MDNS publishing by default. As part of setting up libvirtd for network access, the user would turn on mdns_adv. I hope that makes sense. Let me know if I've gotten something wrong. Would you accept a patch to do this? Or would you suggest that we try and do this downstream in the Fedora/RHEL packages instead? Cheers, Stef

5 10

[libvirt] [PATCH] qemu: Make migration fail when port profile association fails on the dst host
by Christian Benvenuti (benve) 27 Mar '12

27 Mar '12

In the current V3 migration protocol, Libvirt does not check the result of the function qemuMigrationVPAssociatePortProfiles This means that it is possible for a migration to complete successfully even when the VM loses network connectivity on the destination host. With this change libvirt aborts the migration (during the "finish" step) when the above function fails, that is to say when at least one of the port profile associations fails. Signed-off by: Christian Benvenuti <benve(a)cisco.com> --- src/qemu/qemu_migration.c | 24 ++++++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 802785f..38fbf83 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2716,7 +2716,7 @@ qemuMigrationPerform(struct qemud_driver *driver, } } -static void +static int qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { int i; int last_good_net = -1; @@ -2731,13 +2731,17 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { virDomainNetGetActualDirectDev(net), -1, def->uuid, - VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH, false) < 0) + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH, + false) < 0) { + VIR_ERROR("Port profile Associate failed for %s", net->ifname); goto err_exit; + } + VIR_DEBUG("Port profile Associate succeeded for %s", net->ifname); } last_good_net = i; } - return; + return 0; err_exit: for (i = 0; i < last_good_net; i++) { @@ -2751,6 +2755,7 @@ err_exit: VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH)); } } + return -1; } @@ -2805,7 +2810,18 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } - qemuMigrationVPAssociatePortProfiles(vm->def); + if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) { + qemuProcessStop(driver, vm, 1, VIR_DOMAIN_SHUTOFF_FAILED); + virDomainAuditStop(vm, "failed"); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); + goto endjob; + } if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; -- 1.7.1

2 1

[libvirt] [PATCH] Enable all warnings permanently & default to -Werror for GIT builds
by Daniel P. Berrange 27 Mar '12

27 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Given that we auto-detect whether each -Wxxxx flag is supported by GCC, and we are warning-free and use automake silent rules, there is no compelling reason to allow compile warnings to be disabled. Replace the --enable-compile-warnings flag with a simpler --enable-werror flag, which defaults to 'yes' if building from GIT, or 'no' if building from tar.gz This helps ensure that everyone writing patches for libvirt will take care to fix their warning problems before submitting for review * autobuild.sh: Force -Werror * configure.ac: Update for LIBVIRT_COMPILE_WARNINGS macro change * m4/virt-compile-warnings.m4: Permanently enable all warnings, auto-enable Werror for GIT builds --- autobuild.sh | 4 +- configure.ac | 4 +- m4/virt-compile-warnings.m4 | 258 +++++++++++++++++++++---------------------- 3 files changed, 130 insertions(+), 136 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 1c289b4..7e8f645 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -20,7 +20,7 @@ cd build ../autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \ --enable-test-coverage \ --disable-nls \ - --enable-compile-warnings=error + --enable-werror # If the MAKEFLAGS envvar does not yet include a -j option, # add -jN where N depends on the number of processors. @@ -74,7 +74,7 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --build=$(uname -m)-pc-linux \ --host=i686-pc-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \ - --enable-compile-warnings=error \ + --enable-werror \ --without-libvirtd \ --without-python diff --git a/configure.ac b/configure.ac index 740129c..32cc8d0 100644 --- a/configure.ac +++ b/configure.ac @@ -106,7 +106,7 @@ VERSION_SCRIPT_FLAGS=-Wl,--version-script= VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) -LIBVIRT_COMPILE_WARNINGS([maximum]) +LIBVIRT_COMPILE_WARNINGS AC_MSG_CHECKING([for CPUID instruction]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM( @@ -2820,7 +2820,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Debug: $enable_debug]) -AC_MSG_NOTICE([ Warnings: $enable_compile_warnings]) +AC_MSG_NOTICE([ Use -Werror: $set_werror]) AC_MSG_NOTICE([Warning Flags: $WARN_CFLAGS]) AC_MSG_NOTICE([ Readline: $lv_use_readline]) AC_MSG_NOTICE([ Python: $with_python]) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 3a428c3..5527bff 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -7,139 +7,133 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl More compiler warnings dnl ****************************** - AC_ARG_ENABLE(compile-warnings, - [AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@], - [Turn on compiler warnings])],, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - case "$enable_compile_warnings" in - no) - try_compiler_flags="" - ;; - yes|minimum|maximum|error) - - # List of warnings that are not relevant / wanted - - # Don't care about C++ compiler compat - dontwarn="$dontwarn -Wc++-compat" - dontwarn="$dontwarn -Wabi" - dontwarn="$dontwarn -Wdeprecated" - # Don't care about ancient C standard compat - dontwarn="$dontwarn -Wtraditional" - # Don't care about ancient C standard compat - dontwarn="$dontwarn -Wtraditional-conversion" - # Ignore warnings in /usr/include - dontwarn="$dontwarn -Wsystem-headers" - # Happy for compiler to add struct padding - dontwarn="$dontwarn -Wpadded" - # GCC very confused with -O2 - dontwarn="$dontwarn -Wunreachable-code" - # Too many to deal with - dontwarn="$dontwarn -Wconversion" - # Too many to deal with - dontwarn="$dontwarn -Wsign-conversion" - # GNULIB gettext.h violates - dontwarn="$dontwarn -Wvla" - # Many GNULIB header violations - dontwarn="$dontwarn -Wundef" - # Need to allow bad cast for execve() - dontwarn="$dontwarn -Wcast-qual" - # We need to use long long in many places - dontwarn="$dontwarn -Wlong-long" - # We allow manual list of all enum cases without default: - dontwarn="$dontwarn -Wswitch-default" - # We allow optional default: instead of listing all enum values - dontwarn="$dontwarn -Wswitch-enum" - # Not a problem since we don't use -fstrict-overflow - dontwarn="$dontwarn -Wstrict-overflow" - # Not a problem since we don't use -funsafe-loop-optimizations - dontwarn="$dontwarn -Wunsafe-loop-optimizations" - # Things like virAsprintf mean we can't use this - dontwarn="$dontwarn -Wformat-nonliteral" - - # We might fundamentally need some of these disabled forever, but - # ideally we'd turn many of them on - dontwarn="$dontwarn -Wfloat-equal" - dontwarn="$dontwarn -Wdeclaration-after-statement" - dontwarn="$dontwarn -Wcast-qual" - dontwarn="$dontwarn -Wconversion" - dontwarn="$dontwarn -Wsign-conversion" - dontwarn="$dontwarn -Wpacked" - dontwarn="$dontwarn -Wunused-macros" - dontwarn="$dontwarn -Woverlength-strings" - dontwarn="$dontwarn -Wstack-protector" - - # Get all possible GCC warnings - gl_MANYWARN_ALL_GCC([maybewarn]) - - # Remove the ones we don't want, blacklisted earlier - gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn]) - - # Check for $CC support of each warning - for w in $wantwarn; do - gl_WARN_ADD([$w]) - done - - # GNULIB uses '-W' (aka -Wextra) which includes a bunch of stuff. - # Unfortunately, this means you can't simply use '-Wsign-compare' - # with gl_MANYWARN_COMPLEMENT - # So we have -W enabled, and then have to explicitly turn off... - gl_WARN_ADD([-Wno-sign-compare]) - - # GNULIB expects this to be part of -Wc++-compat, but we turn - # that one off, so we need to manually enable this again - gl_WARN_ADD([-Wjump-misses-init]) - - # GNULIB turns on -Wformat=2 which implies -Wformat-nonliteral, - # so we need to manually re-exclude it. - gl_WARN_ADD([-Wno-format-nonliteral]) - - # This should be < 256 really. Currently we're down to 4096, - # but using 1024 bytes sized buffers (mostly for virStrerror) - # stops us from going down further - gl_WARN_ADD([-Wframe-larger-than=4096]) - dnl gl_WARN_ADD([-Wframe-larger-than=256]) - - # Silence certain warnings in gnulib, and use improved glibc headers - AC_DEFINE([lint], [1], - [Define to 1 if the compiler is checking for lint.]) - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) - - # Extra special flags - dnl -fstack-protector stuff passes gl_WARN_ADD with gcc - dnl on Mingw32, but fails when actually used - case $host in - *-*-linux*) - dnl Fedora only uses -fstack-protector, but doesn't seem to - dnl be great overhead in adding -fstack-protector-all instead - dnl gl_WARN_ADD([-fstack-protector]) - gl_WARN_ADD([-fstack-protector-all]) - gl_WARN_ADD([--param=ssp-buffer-size=4]) - ;; - esac - gl_WARN_ADD([-fexceptions]) - gl_WARN_ADD([-fasynchronous-unwind-tables]) - gl_WARN_ADD([-fdiagnostics-show-option]) - gl_WARN_ADD([-funit-at-a-time]) - - # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure - # fire even without -O. - gl_WARN_ADD([-fipa-pure-const]) - # We should eventually enable this, but right now there are at - # least 75 functions triggering warnings. - gl_WARN_ADD([-Wno-suggest-attribute=pure]) - gl_WARN_ADD([-Wno-suggest-attribute=const]) - - if test "$enable_compile_warnings" = "error" - then - gl_WARN_ADD([-Werror]) - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; + AC_ARG_ENABLE([werror], + AS_HELP_STRING([--enable-werror], [Use -Werror (if supported)]), + [set_werror="$enableval"], + [if test -d $srcdir/.git; then + is_git_version=true + set_werror=yes + else + set_werror=no + fi]) + + # List of warnings that are not relevant / wanted + + # Don't care about C++ compiler compat + dontwarn="$dontwarn -Wc++-compat" + dontwarn="$dontwarn -Wabi" + dontwarn="$dontwarn -Wdeprecated" + # Don't care about ancient C standard compat + dontwarn="$dontwarn -Wtraditional" + # Don't care about ancient C standard compat + dontwarn="$dontwarn -Wtraditional-conversion" + # Ignore warnings in /usr/include + dontwarn="$dontwarn -Wsystem-headers" + # Happy for compiler to add struct padding + dontwarn="$dontwarn -Wpadded" + # GCC very confused with -O2 + dontwarn="$dontwarn -Wunreachable-code" + # Too many to deal with + dontwarn="$dontwarn -Wconversion" + # Too many to deal with + dontwarn="$dontwarn -Wsign-conversion" + # GNULIB gettext.h violates + dontwarn="$dontwarn -Wvla" + # Many GNULIB header violations + dontwarn="$dontwarn -Wundef" + # Need to allow bad cast for execve() + dontwarn="$dontwarn -Wcast-qual" + # We need to use long long in many places + dontwarn="$dontwarn -Wlong-long" + # We allow manual list of all enum cases without default: + dontwarn="$dontwarn -Wswitch-default" + # We allow optional default: instead of listing all enum values + dontwarn="$dontwarn -Wswitch-enum" + # Not a problem since we don't use -fstrict-overflow + dontwarn="$dontwarn -Wstrict-overflow" + # Not a problem since we don't use -funsafe-loop-optimizations + dontwarn="$dontwarn -Wunsafe-loop-optimizations" + # Things like virAsprintf mean we can't use this + dontwarn="$dontwarn -Wformat-nonliteral" + + # We might fundamentally need some of these disabled forever, but + # ideally we'd turn many of them on + dontwarn="$dontwarn -Wfloat-equal" + dontwarn="$dontwarn -Wdeclaration-after-statement" + dontwarn="$dontwarn -Wcast-qual" + dontwarn="$dontwarn -Wconversion" + dontwarn="$dontwarn -Wsign-conversion" + dontwarn="$dontwarn -Wpacked" + dontwarn="$dontwarn -Wunused-macros" + dontwarn="$dontwarn -Woverlength-strings" + dontwarn="$dontwarn -Wstack-protector" + + # Get all possible GCC warnings + gl_MANYWARN_ALL_GCC([maybewarn]) + + # Remove the ones we don't want, blacklisted earlier + gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn]) + + # Check for $CC support of each warning + for w in $wantwarn; do + gl_WARN_ADD([$w]) + done + + # GNULIB uses '-W' (aka -Wextra) which includes a bunch of stuff. + # Unfortunately, this means you can't simply use '-Wsign-compare' + # with gl_MANYWARN_COMPLEMENT + # So we have -W enabled, and then have to explicitly turn off... + gl_WARN_ADD([-Wno-sign-compare]) + + # GNULIB expects this to be part of -Wc++-compat, but we turn + # that one off, so we need to manually enable this again + gl_WARN_ADD([-Wjump-misses-init]) + + # GNULIB turns on -Wformat=2 which implies -Wformat-nonliteral, + # so we need to manually re-exclude it. + gl_WARN_ADD([-Wno-format-nonliteral]) + + # This should be < 256 really. Currently we're down to 4096, + # but using 1024 bytes sized buffers (mostly for virStrerror) + # stops us from going down further + gl_WARN_ADD([-Wframe-larger-than=4096]) + dnl gl_WARN_ADD([-Wframe-larger-than=256]) + + # Silence certain warnings in gnulib, and use improved glibc headers + AC_DEFINE([lint], [1], + [Define to 1 if the compiler is checking for lint.]) + AC_DEFINE([_FORTIFY_SOURCE], [2], + [enable compile-time and run-time bounds-checking, and some warnings]) + + # Extra special flags + dnl -fstack-protector stuff passes gl_WARN_ADD with gcc + dnl on Mingw32, but fails when actually used + case $host in + *-*-linux*) + dnl Fedora only uses -fstack-protector, but doesn't seem to + dnl be great overhead in adding -fstack-protector-all instead + dnl gl_WARN_ADD([-fstack-protector]) + gl_WARN_ADD([-fstack-protector-all]) + gl_WARN_ADD([--param=ssp-buffer-size=4]) + ;; esac + gl_WARN_ADD([-fexceptions]) + gl_WARN_ADD([-fasynchronous-unwind-tables]) + gl_WARN_ADD([-fdiagnostics-show-option]) + gl_WARN_ADD([-funit-at-a-time]) + + # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure + # fire even without -O. + gl_WARN_ADD([-fipa-pure-const]) + # We should eventually enable this, but right now there are at + # least 75 functions triggering warnings. + gl_WARN_ADD([-Wno-suggest-attribute=pure]) + gl_WARN_ADD([-Wno-suggest-attribute=const]) + + if test "$set_werror" = "yes" + then + gl_WARN_ADD([-Werror]) + fi WARN_LDFLAGS=$WARN_CFLAGS AC_SUBST([WARN_CFLAGS]) -- 1.7.7.6

2 1

[libvirt] [PATCH] qemu_monitor: Don't output snapshot format argument if type is NULL
by Peter Krempa 27 Mar '12

27 Mar '12

If the snapshot format type string was NULL, the JSON framework created an invalid JSON string. --- The other option would be to fix qemuMonitorJSONMakeCommandRaw that string arguments with a NULL argument would suppress outputing the complete option, but I'm afraid of breaking something. Background: http://www.redhat.com/archives/libvir-list/2012-March/msg01198.html src/qemu/qemu_monitor_json.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index eeeb6a6..6fce58a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3112,14 +3112,25 @@ qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; - cmd = qemuMonitorJSONMakeCommandRaw(actions != NULL, - "blockdev-snapshot-sync", - "s:device", device, - "s:snapshot-file", file, - "s:format", format, - reuse ? "s:mode" : NULL, - reuse ? "existing" : NULL, - NULL); + if (format) { + cmd = qemuMonitorJSONMakeCommandRaw(actions != NULL, + "blockdev-snapshot-sync", + "s:device", device, + "s:snapshot-file", file, + "s:format", format, + reuse ? "s:mode" : NULL, + reuse ? "existing" : NULL, + NULL); + } else { + cmd = qemuMonitorJSONMakeCommandRaw(actions != NULL, + "blockdev-snapshot-sync", + "s:device", device, + "s:snapshot-file", file, + reuse ? "s:mode" : NULL, + reuse ? "existing" : NULL, + NULL); + } + if (!cmd) return -1; -- 1.7.3.4

2 4

[libvirt] [PATCH] Enable build of test suite programs by default for GIT checkouts
by Daniel P. Berrange 27 Mar '12

27 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add a new flag '--with-test-suite' to configure to control whether the test suite binaries are built by default. ie built with a plain 'make', as opposed to delayed until 'make check' For builds from tar.gz tests will not be built by default. For builds from GIT, tests with be on by default, to try and ensure that patch developers don't accidentally break the test suites without noticing. * configure.ac: Add --with-test-suite * tests/Makefile.am: Use noinst_PROGRAMS instead of check_PROGRAMS if building tests by default. Consolidate setting of TESTS and {noinst,check}_PROGRAMS to avoid duplication --- configure.ac | 19 ++++++++ tests/Makefile.am | 119 +++++++++++++--------------------------------------- 2 files changed, 49 insertions(+), 89 deletions(-) diff --git a/configure.ac b/configure.ac index c1f9f45..740129c 100644 --- a/configure.ac +++ b/configure.ac @@ -2162,6 +2162,25 @@ AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) AC_SUBST([PYTHON_VERSION]) AC_SUBST([PYTHON_INCLUDES]) +AC_ARG_ENABLE([with-test-suite], + AC_HELP_STRING([--with-test-suite], [build test suite by default @<:@default=check@:>@]), + [case "${withval}" in + yes|no|check) ;; + *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; + esac], + [withval=check]) + +AC_MSG_CHECKING([Whether to build test suite by default]) +if test "$withval" = "check" ; then + if test -d $srcdir/.git ; then + withval=yes + else + withval=no + fi +fi +AC_MSG_RESULT([$withval]) +AM_CONDITIONAL([WITH_TESTS], [test "$withval" = "yes"]) + AC_ARG_ENABLE([test-coverage], AC_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation @<:@default=no@:>@]), [case "${enableval}" in diff --git a/tests/Makefile.am b/tests/Makefile.am index 4a0686f..dd8bf4f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -92,69 +92,68 @@ EXTRA_DIST = \ xml2vmxdata \ .valgrind.supp -check_PROGRAMS = virshtest conftest sockettest \ +test_helpers = commandhelper ssh conftest +test_programs = virshtest sockettest \ nodeinfotest virbuftest \ - commandtest commandhelper seclabeltest \ - virhashtest virnetmessagetest virnetsockettest ssh \ + commandtest seclabeltest \ + virhashtest virnetmessagetest virnetsockettest \ utiltest virnettlscontexttest shunloadtest \ virtimetest viruritest virkeyfiletest \ virauthconfigtest -check_LTLIBRARIES = libshunload.la - # This is a fake SSH we use from virnetsockettest ssh_SOURCES = ssh.c ssh_LDADD = $(COVERAGE_LDFLAGS) if WITH_XEN -check_PROGRAMS += xml2sexprtest sexpr2xmltest \ +test_programs += xml2sexprtest sexpr2xmltest \ xmconfigtest xencapstest statstest reconnect endif if WITH_QEMU -check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ +test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ qemumonitortest endif if WITH_LXC -check_PROGRAMS += lxcxml2xmltest +test_programs += lxcxml2xmltest endif if WITH_OPENVZ -check_PROGRAMS += openvzutilstest +test_programs += openvzutilstest endif if WITH_ESX -check_PROGRAMS += esxutilstest +test_programs += esxutilstest endif if WITH_VMX -check_PROGRAMS += vmx2xmltest xml2vmxtest +test_programs += vmx2xmltest xml2vmxtest endif if WITH_CIL -check_PROGRAMS += object-locking +test_programs += object-locking endif if HAVE_YAJL -check_PROGRAMS += jsontest +test_programs += jsontest endif -check_PROGRAMS += networkxml2xmltest +test_programs += networkxml2xmltest if WITH_NETWORK -check_PROGRAMS += networkxml2argvtest +test_programs += networkxml2argvtest endif -check_PROGRAMS += nwfilterxml2xmltest +test_programs += nwfilterxml2xmltest -check_PROGRAMS += storagevolxml2xmltest storagepoolxml2xmltest +test_programs += storagevolxml2xmltest storagepoolxml2xmltest -check_PROGRAMS += nodedevxml2xmltest +test_programs += nodedevxml2xmltest -check_PROGRAMS += interfacexml2xmltest +test_programs += interfacexml2xmltest -check_PROGRAMS += cputest +test_programs += cputest test_scripts = \ capabilityschematest \ @@ -185,6 +184,8 @@ test_scripts += \ virsh-optparse \ virsh-schedinfo \ virsh-synopsis + +test_programs += eventtest else EXTRA_DIST += \ test_conf.sh \ @@ -213,77 +214,16 @@ endif EXTRA_DIST += $(test_scripts) -TESTS = virshtest \ - nodeinfotest \ - virbuftest \ - sockettest \ - commandtest \ - seclabeltest \ - virhashtest \ - virnetmessagetest \ - virnetsockettest \ - virnettlscontexttest \ - virtimetest \ - viruritest \ - virkeyfiletest \ - virauthconfigtest \ - shunloadtest \ - utiltest \ - $(test_scripts) - -if HAVE_YAJL -TESTS += jsontest -endif - -if WITH_XEN -TESTS += xml2sexprtest \ - sexpr2xmltest \ - xmconfigtest \ - xencapstest \ - reconnect \ - statstest -endif - -if WITH_QEMU -TESTS += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest qemuargv2xmltest \ - qemuhelptest domainsnapshotxml2xmltest nwfilterxml2xmltest \ - qemumonitortest -endif - -if WITH_LXC -TESTS += lxcxml2xmltest -endif - -if WITH_OPENVZ -TESTS += openvzutilstest -endif - -if WITH_ESX -TESTS += esxutilstest -endif - -if WITH_VMX -TESTS += vmx2xmltest xml2vmxtest -endif - -if WITH_LIBVIRTD -check_PROGRAMS += eventtest -TESTS += eventtest -endif - -TESTS += networkxml2xmltest - -if WITH_NETWORK -TESTS += networkxml2argvtest +if WITH_TESTS +noinst_PROGRAMS = $(test_programs) $(test_helpers) +noinst_LTLIBRARIES = libshunload.la +else +check_PROGRAMS = $(test_programs) $(test_helpers) +check_LTLIBRARIES = libshunload.la endif -TESTS += storagevolxml2xmltest storagepoolxml2xmltest - -TESTS += nodedevxml2xmltest - -TESTS += interfacexml2xmltest - -TESTS += cputest +TESTS = $(test_programs) \ + $(test_scripts) # NB, automake < 1.10 does not provide the real # abs_top_{src/build}dir or builddir variables, so don't rely @@ -306,6 +246,7 @@ TESTS_ENVIRONMENT = \ LC_ALL=C \ $(VG) + valgrind: $(MAKE) check VG="valgrind --quiet --leak-check=full --suppressions=$(srcdir)/.valgrind.supp" -- 1.7.7.6

2 1

[libvirt] [libvirt PATCHv7 1/1] add DHCP snooping
by David L Stevens 27 Mar '12

27 Mar '12

This patch adds DHCP snooping support to libvirt. The learning method for IP addresses is specified by setting the "ip_learning" variable to one of "any" [default] (existing IP learning code), "none" (static only addresses) or "dhcp" (DHCP snooping). Active leases are saved in a lease file and reloaded on restart or HUP. Changes since v6: - replace pthread_cancel() with synchronous cancelation method Signed-off-by: David L Stevens <dlstevens(a)us.ibm.com> --- docs/formatnwfilter.html.in | 17 + src/Makefile.am | 2 + src/nwfilter/nwfilter_dhcpsnoop.c | 1139 ++++++++++++++++++++++++++++++++ src/nwfilter/nwfilter_dhcpsnoop.h | 38 ++ src/nwfilter/nwfilter_driver.c | 6 + src/nwfilter/nwfilter_gentech_driver.c | 59 ++- 6 files changed, 1248 insertions(+), 13 deletions(-) create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.c create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.h diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 9cb7644..ad10765 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -2189,6 +2189,23 @@ <br/><br/> In case a VM is resumed after suspension or migrated, IP address detection will be restarted. + <br/><br/> + Variable <i>ip_learning</i> may be used to specify + the IP address learning method. Valid values are <i>any</i>, <i>dhcp</i>, + or <i>none</i>. The default value is <i>any</i>, meaning that libvirt + may use any packet to determine the address in use by a VM. A value of + <i>dhcp</i> specifies that libvirt should only honor DHCP server-assigned + addresses with valid leases. If <i>ip_learning</i> is set to <i>none</i>, + libvirt does not do address learning and referencing <i>IP</i> without + assigning it an explicit value is an error. + <br/><br/> + Use of <i>ip_learning=dhcp</i> (DHCP snooping) provides additional + anti-spoofing security, especially when combined with a filter allowing + only trusted DHCP servers to assign addresses. If the DHCP lease expires, + the VM will no longer be able to use the IP address until it acquires a + new, valid lease from a DHCP server. If the VM is migrated, it must get + a new valid DHCP lease to use an IP address (e.g., by + bringing the VM interface down and up again). </p> <h3><a name="nwflimitsmigr">VM Migration</a></h3> diff --git a/src/Makefile.am b/src/Makefile.am index a2aae9d..4382caf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -509,6 +509,8 @@ NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ nwfilter/nwfilter_gentech_driver.c \ nwfilter/nwfilter_gentech_driver.h \ + nwfilter/nwfilter_dhcpsnoop.c \ + nwfilter/nwfilter_dhcpsnoop.h \ nwfilter/nwfilter_ebiptables_driver.c \ nwfilter/nwfilter_ebiptables_driver.h \ nwfilter/nwfilter_learnipaddr.c \ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c new file mode 100644 index 0000000..8e5dcc5 --- /dev/null +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -0,0 +1,1139 @@ +/* + * nwfilter_dhcpsnoop.c: support for DHCP snooping used by a VM + * on an interface + * + * Copyright (C) 2011 IBM Corp. + * Copyright (C) 2011 David L Stevens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: David L Stevens <dlstevens(a)us.ibm.com> + * Based in part on work by Stefan Berger <stefanb(a)us.ibm.com> + */ + +#include <config.h> + +#ifdef HAVE_LIBPCAP +#include <pcap.h> +#endif + +#include <fcntl.h> +#include <sys/ioctl.h> +#include <signal.h> + +#include <arpa/inet.h> +#include <net/ethernet.h> +#include <netinet/ip.h> +#include <netinet/udp.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <intprops.h> + +#include "internal.h" + +#include "buf.h" +#include "memory.h" +#include "logging.h" +#include "datatypes.h" +#include "virterror_internal.h" +#include "threads.h" +#include "conf/nwfilter_params.h" +#include "conf/domain_conf.h" +#include "nwfilter_gentech_driver.h" +#include "nwfilter_ebiptables_driver.h" +#include "nwfilter_dhcpsnoop.h" +#include "virnetdev.h" +#include "virfile.h" +#include "configmake.h" + +#define VIR_FROM_THIS VIR_FROM_NWFILTER + +#ifdef HAVE_LIBPCAP + +#define LEASEFILE LOCALSTATEDIR "/run/libvirt/network/nwfilter.leases" +#define TMPLEASEFILE LOCALSTATEDIR "/run/libvirt/network/nwfilter.ltmp" +static int lease_fd = -1; +static int nleases = 0; /* number of active leases */ +static int wleases = 0; /* number of written leases */ + +static virHashTablePtr SnoopReqs; +static virHashTablePtr IfnameToKey; +static pthread_mutex_t SnoopLock = PTHREAD_MUTEX_INITIALIZER; + +/* snooper thread management */ + +static virHashTablePtr Active; +static pthread_mutex_t ActiveLock = PTHREAD_MUTEX_INITIALIZER; + +#define active_lock() { pthread_mutex_lock(&ActiveLock); } +#define active_unlock() { pthread_mutex_unlock(&ActiveLock); } + +static char * +SnoopActivate(pthread_t thread) +{ + int len; + char *key; + + len = sizeof(thread)*2 + 3; /* "0x"+'\0' */ + if (VIR_ALLOC_N(key, len)) { + virReportOOMError(); + return NULL; + } + (void) snprintf(key, len, "0x%0*lX", sizeof(thread)*2, + (unsigned long int)thread); + key[len-1] = '\0'; + + active_lock(); + if (virHashAddEntry(Active, key, strdup("1"))) + VIR_FREE(key); + active_unlock(); + return key; +} + +static void +SnoopCancel(char **ThreadKey) +{ + if (*ThreadKey == NULL) + return; + + active_lock(); + (void) virHashRemoveEntry(Active, *ThreadKey); + *ThreadKey = NULL; + active_unlock(); +} + +static bool +SnoopIsActive(char *ThreadKey) +{ + void *entry; + + if (ThreadKey == NULL) + return 0; + active_lock(); + entry = virHashLookup(Active, ThreadKey); + active_unlock(); + return entry != NULL; +} + +#define snoop_lock() { pthread_mutex_lock(&SnoopLock); } +#define snoop_unlock() { pthread_mutex_unlock(&SnoopLock); } + +#define VIR_IFKEY_LEN ((VIR_UUID_STRING_BUFLEN) + (VIR_MAC_STRING_BUFLEN)) + +struct virNWFilterSnoopReq { + virNWFilterTechDriverPtr techdriver; + const char *ifname; + int ifindex; + const char *linkdev; + enum virDomainNetType nettype; + char ifkey[VIR_IFKEY_LEN]; + unsigned char macaddr[VIR_MAC_BUFLEN]; + const char *filtername; + virNWFilterHashTablePtr vars; + virNWFilterDriverStatePtr driver; + /* start and end of lease list, ordered by lease time */ + struct iplease *start; + struct iplease *end; + char *threadkey; +}; + +#define POLL_INTERVAL 10*1000 /* 10 secs */ +#define MAXERRS 25 /* retries on failing device */ + +struct iplease { + uint32_t ipl_ipaddr; + uint32_t ipl_server; + struct virNWFilterSnoopReq *ipl_req; + unsigned int ipl_timeout; + /* timer list */ + struct iplease *ipl_prev; + struct iplease *ipl_next; +}; + +static struct iplease *ipl_getbyip(struct iplease *start, uint32_t ipaddr); +static void ipl_update(struct iplease *pl, uint32_t timeout); + +static struct virNWFilterSnoopReq *newreq(const char *ifkey); + +static void lease_open(void); +static void lease_close(void); +static void lease_load(void); +static void lease_save(struct iplease *ipl); +static void lease_restore(struct virNWFilterSnoopReq *req); +static void lease_refresh(void); + +/* + * ipl_ladd - add an IP lease to a list + */ +static void +ipl_ladd(struct iplease *plnew, struct iplease **start, struct iplease **end) +{ + struct iplease *pl; + + plnew->ipl_next = plnew->ipl_prev = 0; + if (!*start) { + *start = *end = plnew; + return; + } + for (pl = *end; pl && plnew->ipl_timeout < pl->ipl_timeout; + pl = pl->ipl_prev) + /* empty */ ; + if (!pl) { + plnew->ipl_next = *start; + *start = plnew; + } else { + plnew->ipl_next = pl->ipl_next; + pl->ipl_next = plnew; + } + plnew->ipl_prev = pl; + if (plnew->ipl_next) + plnew->ipl_next->ipl_prev = plnew; + else + *end = plnew; +} + +/* + * ipl_tadd - add an IP lease to the timer list + */ +static void +ipl_tadd(struct iplease *plnew) +{ + struct virNWFilterSnoopReq *req = plnew->ipl_req; + + ipl_ladd(plnew, &req->start, &req->end); +} + +/* + * ipl_install - install rule for a lease + */ +static int +ipl_install(struct iplease *ipl) +{ + char ipbuf[20]; /* dotted decimal IP addr string */ + int rc; + virNWFilterVarValuePtr ipVar; + + if (!inet_ntop(AF_INET, &ipl->ipl_ipaddr, ipbuf, sizeof(ipbuf))) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ipl_install inet_ntop " "failed (0x%08X)"), + ipl->ipl_ipaddr); + return -1; + } + ipVar = virNWFilterVarValueCreateSimpleCopyValue(ipbuf); + if (!ipVar) { + virReportOOMError(); + return -1; + } + if (virNWFilterHashTablePut(ipl->ipl_req->vars, "IP", ipVar, 1)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not add variable \"IP\" to hashmap")); + virNWFilterVarValueFree(ipVar); + return -1; + } + rc = virNWFilterInstantiateFilterLate(NULL, + ipl->ipl_req->ifname, + ipl->ipl_req->ifindex, + ipl->ipl_req->linkdev, + ipl->ipl_req->nettype, + ipl->ipl_req->macaddr, + ipl->ipl_req->filtername, + ipl->ipl_req->vars, + ipl->ipl_req->driver); + if (rc) + return -1; + return 0; +} + +/* + * ipl_add - create or update an IP lease + */ +static void +ipl_add(struct iplease *plnew, bool update_leasefile) +{ + struct iplease *pl; + struct virNWFilterSnoopReq *req = plnew->ipl_req; + + pl = ipl_getbyip(req->start, plnew->ipl_ipaddr); + if (pl) { + ipl_update(pl, plnew->ipl_timeout); + if (update_leasefile) + lease_save(pl); + return; + } + /* support for multiple addresses requires the ability to add filters + * to existing chains, or to instantiate address lists via + * virNWFilterInstantiateFilterLate(). Until one of those capabilities + * is added, don't allow a new address when one is already assigned to + * this interface. + */ + if (req->start) + return; /* silently ignore multiple addresses */ + + if (VIR_ALLOC(pl) < 0) { + virReportOOMError(); + return; + } + *pl = *plnew; + + if (req->threadkey && ipl_install(pl) < 0) { + VIR_FREE(pl); + return; + } + ipl_tadd(pl); + nleases++; + if (update_leasefile) + lease_save(pl); +} + +/* + * ipl_tdel - remove an IP lease from a list + */ +static void +ipl_ldel(struct iplease *ipl, struct iplease **start, struct iplease **end) +{ + if (ipl->ipl_prev) + ipl->ipl_prev->ipl_next = ipl->ipl_next; + else + *start = ipl->ipl_next; + if (ipl->ipl_next) + ipl->ipl_next->ipl_prev = ipl->ipl_prev; + else + *end = ipl->ipl_prev; + ipl->ipl_next = ipl->ipl_prev = 0; +} + +/* + * ipl_tdel - remove an IP lease from the timer list + */ +static void +ipl_tdel(struct iplease *ipl) +{ + struct virNWFilterSnoopReq *req = ipl->ipl_req; + + ipl_ldel(ipl, &req->start, &req->end); + ipl->ipl_timeout = 0; +} + +/* + * ipl_del - delete an IP lease + */ +static void +ipl_del(struct virNWFilterSnoopReq *req, uint32_t ipaddr, bool update_leasefile) +{ + struct iplease *ipl; + + ipl = ipl_getbyip(req->start, ipaddr); + if (ipl == NULL) + return; + + ipl_tdel(ipl); + + if (update_leasefile) { + lease_save(ipl); + + /* + * for multiple address support, this needs to remove those rules + * referencing "IP" with ipl's ip value. + */ + if (req->techdriver->applyDHCPOnlyRules(req->ifname, req->macaddr, + NULL, false)) + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "ipl_ldel failed"); + } + VIR_FREE(ipl); + nleases--; +} + +/* + * ipl_update - update the timeout on an IP lease + */ +static void +ipl_update(struct iplease *ipl, uint32_t timeout) +{ + if (timeout < ipl->ipl_timeout) + return; /* no take-backs */ + ipl_tdel(ipl); + ipl->ipl_timeout = timeout; + ipl_tadd(ipl); + return; +} + +/* + * ipl_getbyip - lookup IP lease by IP address + */ +static struct iplease * +ipl_getbyip(struct iplease *start, uint32_t ipaddr) +{ + struct iplease *pl; + + for (pl = start; pl && pl->ipl_ipaddr != ipaddr; pl = pl->ipl_next) + /* empty */ ; + return pl; +} + +/* + * ipl_trun - run the IP lease timeout list + */ +static unsigned int +ipl_trun(struct virNWFilterSnoopReq *req) +{ + uint32_t now; + + now = time(0); + while (req->start && req->start->ipl_timeout <= now) + ipl_del(req, req->start->ipl_ipaddr, 1); + return 0; +} + +typedef unsigned char Eaddr[6]; + +struct eth { + Eaddr eh_dst; + Eaddr eh_src; + unsigned short eh_type; + union { + unsigned char eu_data[0]; + struct vlan_hdr { + unsigned short ev_flags; + unsigned short ev_type; + unsigned char ev_data[0]; + } eu_vlh; + } eth_un; +} ATTRIBUTE_PACKED; + +#define eh_data eth_un.eu_data +#define ehv_data eth_un.eu_vlh.ev_data +#define ehv_type eth_un.eu_vlh.ev_type + +struct dhcp { + unsigned char d_op; + unsigned char d_htype; + unsigned char d_hlen; + unsigned char d_hops; + unsigned int d_xid; + unsigned short d_secs; + unsigned short d_flags; + unsigned int d_ciaddr; + unsigned int d_yiaddr; + unsigned int d_siaddr; + unsigned int d_giaddr; + unsigned char d_chaddr[16]; + char d_sname[64]; + char d_file[128]; + unsigned char d_opts[0]; +}; + +/* DHCP options */ + +#define DHCPO_PAD 0 +#define DHCPO_LEASE 51 /* lease time in secs */ +#define DHCPO_MTYPE 53 /* message type */ +#define DHCPO_END 255 /* end of options */ + +/* DHCP message types */ +#define DHCPDECLINE 4 +#define DHCPACK 5 +#define DHCPRELEASE 7 + +unsigned char dhcp_magic[4] = { 99, 130, 83, 99 }; + +static int +dhcp_getopt(struct dhcp *pd, int len, int *pmtype, int *pleasetime) +{ + int oind, olen; + int oend; + + olen = len - sizeof *pd; + oind = 0; + + if (olen < 4) /* bad magic */ + return -1; + if (memcmp(dhcp_magic, pd->d_opts, sizeof dhcp_magic) != 0) + return -1; /* bad magic */ + oind += sizeof dhcp_magic; + + oend = 0; + + *pmtype = *pleasetime = 0; + + while (oind < olen) { + switch (pd->d_opts[oind]) { + case DHCPO_LEASE: + if (olen - oind < 6) + goto malformed; + if (*pleasetime) + return -1; /* duplicate lease time */ + *pleasetime = + ntohl(*(unsigned int *) (pd->d_opts + oind + 2)); + break; + case DHCPO_MTYPE: + if (olen - oind < 3) + goto malformed; + if (*pmtype) + return -1; /* duplicate message type */ + *pmtype = pd->d_opts[oind + 2]; + break; + case DHCPO_PAD: + oind++; + continue; + + case DHCPO_END: + oend = 1; + break; + default: + if (olen - oind < 2) + goto malformed; + } + if (oend) + break; + oind += pd->d_opts[oind + 1] + 2; + } + return 0; + malformed: + VIR_WARN("got lost in the options!"); + return -1; +} + +static void +dhcpdecode(struct virNWFilterSnoopReq *req, struct eth *pep, int len) +{ + struct iphdr *pip; + struct udphdr *pup; + struct dhcp *pd; + struct iplease ipl; + int mtype, leasetime; + + /* go through the protocol headers */ + switch (ntohs(pep->eh_type)) { + case ETHERTYPE_IP: + pip = (struct iphdr *) pep->eh_data; + len -= offsetof(struct eth, eh_data); + break; + case ETHERTYPE_VLAN: + if (ntohs(pep->ehv_type) != ETHERTYPE_IP) + return; + pip = (struct iphdr *) pep->ehv_data; + len -= offsetof(struct eth, ehv_data); + break; + default: + return; + } + pip = (struct iphdr *) pep->eh_data; + len -= sizeof(*pep); + pup = (struct udphdr *) ((char *) pip + (pip->ihl << 2)); + len -= pip->ihl << 2; + pd = (struct dhcp *) ((char *) pup + sizeof(*pup)); + len -= sizeof(*pup); + if (len < 0) + return; /* dhcpdecode: invalid packet length */ + if (dhcp_getopt(pd, len, &mtype, &leasetime) < 0) + return; + + memset(&ipl, 0, sizeof(ipl)); + ipl.ipl_ipaddr = pd->d_yiaddr; + ipl.ipl_server = pd->d_siaddr; + if (leasetime == ~0) + ipl.ipl_timeout = ~0; + else + ipl.ipl_timeout = time(0) + leasetime; + ipl.ipl_req = req; + + switch (mtype) { + case DHCPACK: + ipl_add(&ipl, 1); + break; + case DHCPDECLINE: + case DHCPRELEASE: + ipl_del(req, ipl.ipl_ipaddr, 1); + break; + default: + break; + } +} + +#define PBUFSIZE 576 /* >= IP/TCP/DHCP headers */ +#define TIMEOUT 30 /* secs */ + +static pcap_t * +dhcpopen(const char *intf) +{ + pcap_t *handle = NULL; + struct bpf_program fp; + char filter[64]; + char pcap_errbuf[PCAP_ERRBUF_SIZE]; + time_t start; + + start = time(0); + while (handle == NULL && time(0) - start < TIMEOUT) + handle = pcap_open_live(intf, PBUFSIZE, 0, POLL_INTERVAL, pcap_errbuf); + + if (handle == NULL) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_open_live: %s"), pcap_errbuf); + return 0; + } + + sprintf(filter, "port 67 or dst port 68"); + if (pcap_compile(handle, &fp, filter, 1, PCAP_NETMASK_UNKNOWN) != 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_compile: %s"), pcap_geterr(handle)); + return 0; + } + if (pcap_setfilter(handle, &fp) != 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("pcap_setfilter: %s"), pcap_geterr(handle)); + return 0; + } + pcap_freecode(&fp); + return handle; +} + +static void +snoopReqFree(struct virNWFilterSnoopReq *req) +{ + struct iplease *ipl; + + if (!req) + return; + + /* free all leases */ + for (ipl = req->start; ipl; ipl = req->start) + ipl_del(req, ipl->ipl_ipaddr, 0); + + /* free all req data */ + VIR_FREE(req->ifname); + VIR_FREE(req->linkdev); + VIR_FREE(req->filtername); + virNWFilterHashTableFree(req->vars); + VIR_FREE(req); +} + +static void * +virNWFilterDHCPSnoop(void *req0) +{ + struct virNWFilterSnoopReq *req = req0; + pcap_t *handle; + struct pcap_pkthdr *hdr; + struct eth *packet; + int ifindex; + int errcount; + char *threadkey; + + handle = dhcpopen(req->ifname); + if (!handle) + return 0; + + req->threadkey = SnoopActivate(pthread_self()); + threadkey = strdup(req->threadkey); + + ifindex = if_nametoindex(req->ifname); + + snoop_lock(); + lease_restore(req); + snoop_unlock(); + + errcount = 0; + while (1) { + int rv; + + snoop_lock(); + ipl_trun(req); + snoop_unlock(); + + rv = pcap_next_ex(handle, &hdr, (const u_char **)&packet); + + if (!SnoopIsActive(threadkey)) { + VIR_FREE(threadkey); + pcap_close(handle); + return 0; + } + if (rv < 0) { + if (virNetDevValidateConfig(req->ifname, NULL, ifindex) <= 0) + break; + if (++errcount > MAXERRS) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ifname \"%s\" failing; reopening"), + req->ifname); + pcap_close(handle); + handle = dhcpopen(req->ifname); + if (!handle) + break; + } + continue; + } + errcount = 0; + if (rv) { + snoop_lock(); + dhcpdecode(req, packet, hdr->caplen); + snoop_unlock(); + } + } + SnoopCancel(&req->threadkey); + (void) virHashRemoveEntry(IfnameToKey, req->ifname); + VIR_FREE(req->ifname); + /* if we still have a valid lease, keep the req for restarts */ + if (!req->start || req->start->ipl_timeout < time(0)) + (void) virHashRemoveEntry(SnoopReqs, req->ifkey); + VIR_FREE(threadkey); + pcap_close(handle); + return 0; +} + +static void +ifkeyFormat(char *ifkey, const unsigned char *vmuuid, + unsigned const char *macaddr) +{ + virUUIDFormat(vmuuid, ifkey); + ifkey[VIR_UUID_STRING_BUFLEN-1] = '-'; + virMacAddrFormat(macaddr, ifkey + VIR_UUID_STRING_BUFLEN); +} + +int +virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, + const char *ifname, + const char *linkdev, + enum virDomainNetType nettype, + const unsigned char *vmuuid, + const unsigned char *macaddr, + const char *filtername, + virNWFilterHashTablePtr filterparams, + virNWFilterDriverStatePtr driver) +{ + struct virNWFilterSnoopReq *req; + bool isnewreq; + char ifkey[VIR_IFKEY_LEN]; + pthread_t thread; + + ifkeyFormat(ifkey, vmuuid, macaddr); + snoop_lock(); + req = virHashLookup(SnoopReqs, ifkey); + isnewreq = req == NULL; + if (!isnewreq) { + if (req->threadkey) { + snoop_unlock(); + return 0; + } + } else { + req = newreq(ifkey); + if (!req) { + snoop_unlock(); + return 1; + } + } + + req->techdriver = techdriver; + req->ifindex = if_nametoindex(ifname); + req->linkdev = linkdev ? strdup(linkdev) : NULL; + req->nettype = nettype; + req->ifname = strdup(ifname); + memcpy(req->macaddr, macaddr, sizeof(req->macaddr)); + req->filtername = strdup(filtername); + if (req->filtername == NULL) { + snoop_unlock(); + snoopReqFree(req); + virReportOOMError(); + return 1; + } + + if (techdriver->applyDHCPOnlyRules(req->ifname, req->macaddr, NULL, + false)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "applyDHCPOnlyRules " + "failed - spoofing not protected!"); + } + + req->vars = virNWFilterHashTableCreate(0); + if (!req->vars) { + snoop_unlock(); + snoopReqFree(req); + virReportOOMError(); + return 1; + } + if (virNWFilterHashTablePutAll(filterparams, req->vars)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq: can't copy variables" + " on if %s"), ifkey); + snoop_unlock(); + snoopReqFree(req); + return 1; + } + req->driver = driver; + + if (virHashAddEntry(IfnameToKey, ifname, req->ifkey)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq ifname map failed" + " on interface \"%s\" key \"%s\""), ifname, + ifkey); + snoop_unlock(); + snoopReqFree(req); + return 1; + } + if (isnewreq && virHashAddEntry(SnoopReqs, ifkey, req)) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq req add failed on" + " interface \"%s\" ifkey \"%s\""), ifname, + ifkey); + (void) virHashRemoveEntry(IfnameToKey, ifname); + snoop_unlock(); + snoopReqFree(req); + return 1; + } + snoop_unlock(); + if (pthread_create(&thread, NULL, virNWFilterDHCPSnoop, req) != 0) { + snoop_lock(); + (void) virHashRemoveEntry(IfnameToKey, ifname); + (void) virHashRemoveEntry(SnoopReqs, ifkey); + snoop_unlock(); + snoopReqFree(req); + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("virNWFilterDHCPSnoopReq pthread_create failed" + " on interface \"%s\""), ifname); + return 1; + } + return 0; +} + +/* + * freeReq - hash table free function to kill a request + */ +static void +freeReq(void *req0, const void *name ATTRIBUTE_UNUSED) +{ + struct virNWFilterSnoopReq *req = (struct virNWFilterSnoopReq *) req0; + + if (!req) + return; + + if (req->threadkey) + SnoopCancel(&req->threadkey); + snoopReqFree(req); +} + +static void +lease_close(void) +{ + VIR_FORCE_CLOSE(lease_fd); +} + +static void +lease_open(void) +{ + lease_close(); + + lease_fd = open(LEASEFILE, O_CREAT|O_RDWR|O_APPEND, 0644); +} + +int +virNWFilterDHCPSnoopInit(void) +{ + if (SnoopReqs) + return 0; + + snoop_lock(); + IfnameToKey = virHashCreate(0, NULL); + SnoopReqs = virHashCreate(0, freeReq); + if (!SnoopReqs) { + snoop_unlock(); + virReportOOMError(); + return -1; + } + lease_load(); + lease_open(); + + snoop_unlock(); + + active_lock(); + Active = virHashCreate(0, 0); + if (!Active) { + active_unlock(); + virReportOOMError(); + return -1; + } + active_unlock(); + return 0; +} + +void +virNWFilterDHCPSnoopEnd(const char *ifname) +{ + char *ifkey = NULL; + + snoop_lock(); + if (!SnoopReqs) { + snoop_unlock(); + return; + } + + if (ifname) { + ifkey = (char *)virHashLookup(IfnameToKey, ifname); + (void) virHashRemoveEntry(IfnameToKey, ifname); + if (!ifkey) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ifname \"%s\" not in key map"), ifname); + snoop_unlock(); + return; + } + } + + if (ifkey) { + struct virNWFilterSnoopReq *req; + + req = virHashLookup(SnoopReqs, ifkey); + if (!req) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("ifkey \"%s\" has no req"), ifkey); + snoop_unlock(); + return; + } + if (!req->start || req->start->ipl_timeout < time(0)) { + (void) virHashRemoveEntry(SnoopReqs, req->ifkey); + snoop_unlock(); + return; + } + /* keep valid lease req; drop interface association */ + SnoopCancel(&req->threadkey); + VIR_FREE(req->ifname); + } else { /* free all of them */ + lease_close(); + virHashFree(IfnameToKey); + virHashFree(SnoopReqs); + IfnameToKey = virHashCreate(0, 0); + if (!IfnameToKey) { + snoop_unlock(); + virReportOOMError(); + return; + } + SnoopReqs = virHashCreate(0, freeReq); + if (!SnoopReqs) { + virHashFree(IfnameToKey); + snoop_unlock(); + virReportOOMError(); + return; + } + lease_load(); + } + snoop_unlock(); +} + +static int +lease_write(int lfd, const char *ifkey, struct iplease *ipl) +{ + char lbuf[256],ipstr[16],dhcpstr[16]; + + if (inet_ntop(AF_INET, &ipl->ipl_ipaddr, ipstr, sizeof ipstr) == 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("inet_ntop(0x%08X) failed"), ipl->ipl_ipaddr); + return -1; + } + if (inet_ntop(AF_INET, &ipl->ipl_server, dhcpstr, sizeof dhcpstr) == 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("inet_ntop(0x%08X) failed"), ipl->ipl_server); + return -1; + } + /* time intf ip dhcpserver */ + snprintf(lbuf, sizeof(lbuf), "%u %s %s %s\n", ipl->ipl_timeout, + ifkey, ipstr, dhcpstr); + if (write(lfd, lbuf, strlen(lbuf)) < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("lease file write failed: %s"), + strerror(errno)); + return -1; + } + (void) fsync(lfd); + return 0; +} + +static void +lease_save(struct iplease *ipl) +{ + struct virNWFilterSnoopReq *req = ipl->ipl_req; + + if (lease_fd < 0) + lease_open(); + if (lease_write(lease_fd, req->ifkey, ipl) < 0) + return; + /* keep dead leases at < ~95% of file size */ + if (++wleases >= nleases*20) + lease_load(); /* load & refresh lease file */ +} + +static struct virNWFilterSnoopReq * +newreq(const char *ifkey) +{ + struct virNWFilterSnoopReq *req; + + if (VIR_ALLOC(req) < 0) { + virReportOOMError(); + return NULL; + } + strncpy(req->ifkey, ifkey, sizeof req->ifkey); + + return req; +} + +static void +SaveSnoopReqIter(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *data) +{ + struct virNWFilterSnoopReq *req = payload; + int tfd = (int)data; + struct iplease *ipl; + + /* clean up orphaned, expired leases */ + if (!req->threadkey) { + uint32_t now; + + now = time(0); + for (ipl = req->start; ipl; ipl = ipl->ipl_next) + if (ipl->ipl_timeout < now) + ipl_del(req, ipl->ipl_ipaddr , 0); + if (!req->start) { + snoopReqFree(req); + return; + } + } + for (ipl = req->start; ipl; ipl = ipl->ipl_next) + (void) lease_write(tfd, req->ifkey, ipl); +} + +static void +lease_refresh(void) +{ + int tfd; + + (void) unlink(TMPLEASEFILE); + /* lease file loaded, delete old one */ + tfd = open(TMPLEASEFILE, O_CREAT|O_RDWR|O_TRUNC|O_EXCL, 0644); + if (tfd < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("open(\"%s\"): %s"), + TMPLEASEFILE, strerror(errno)); + return; + } + if (SnoopReqs) + virHashForEach(SnoopReqs, SaveSnoopReqIter, (void *)tfd); + (void) close(tfd); + if (rename(TMPLEASEFILE, LEASEFILE) < 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("rename(\"%s\", \"%s\"): %s"), + TMPLEASEFILE, LEASEFILE, strerror(errno)); + (void) unlink(TMPLEASEFILE); + } + wleases = 0; + lease_open(); +} + + +static void +lease_load(void) +{ + char line[256], ifkey[VIR_IFKEY_LEN], ipstr[16], srvstr[16]; + struct iplease ipl; + struct virNWFilterSnoopReq *req; + time_t now; + FILE *fp; + int ln = 0; + + fp = fopen(LEASEFILE, "r"); + time(&now); + while (fp && fgets(line, sizeof(line), fp)) { + if (line[strlen(line)-1] != '\n') { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("lease_load lease file line %d corrupt"), + ln); + break; + } + ln++; + /* key len 55 = "VMUUID"+'-'+"MAC" */ + if (sscanf(line, "%u %55s %16s %16s", &ipl.ipl_timeout, + ifkey, ipstr, srvstr) < 4) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("lease_load lease file line %d corrupt"), + ln); + break;; + } + if (ipl.ipl_timeout && ipl.ipl_timeout < now) + continue; + req = virHashLookup(SnoopReqs, ifkey); + if (!req) { + req = newreq(ifkey); + if (!req) + break; + if (virHashAddEntry(SnoopReqs, ifkey, req)) { + snoopReqFree(req); + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("lease_load req add failed on " + "interface \"%s\""), ifkey); + continue; + } + } + + if (inet_pton(AF_INET, ipstr, &ipl.ipl_ipaddr) <= 0) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, + _("line %d corrupt ipaddr \"%s\""), + ln, ipstr); + continue; + } + (void) inet_pton(AF_INET, srvstr, &ipl.ipl_server); + ipl.ipl_req = req; + + if (ipl.ipl_timeout) + ipl_add(&ipl, 0); + else + ipl_del(req, ipl.ipl_ipaddr, 0); + } + if (fp != NULL) + (void) fclose(fp); + lease_refresh(); +} + +static void +lease_restore(struct virNWFilterSnoopReq *req) +{ + struct iplease *ipl; + + for (ipl=req->start; ipl; ipl=ipl->ipl_next) + (void) ipl_install(ipl); +} + +#else /* HAVE_LIBPCAP */ +int +virNWFilterDHCPSnoopInit(void) +{ + return -1; +} + +void +virNWFilterDHCPSnoopEnd(const char *ifname ATTRIBUTE_UNUSED) +{ + return; +} + +int +virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, + const char *linkdev ATTRIBUTE_UNUSED, + enum virDomainNetType nettype ATTRIBUTE_UNUSED, + char *vmuuid ATTRIBUTE_UNUSED, + const unsigned char *macaddr ATTRIBUTE_UNUSED, + const char *filtername ATTRIBUTE_UNUSED, + virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED, + virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED) +{ + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("libvirt was not compiled " + "with libpcap and \"ip_learning='dhcp'\" requires" + " it.")); + return 1; +} +#endif /* HAVE_LIBPCAP */ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h new file mode 100644 index 0000000..25500e2 --- /dev/null +++ b/src/nwfilter/nwfilter_dhcpsnoop.h @@ -0,0 +1,38 @@ +/* + * nwfilter_dhcpsnoop.h: support DHCP snooping for a VM on an interface + * + * Copyright (C) 2010 IBM Corp. + * Copyright (C) 2010 David L Stevens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: David L Stevens <dlstevens(a)us.ibm.com> + */ + +#ifndef __NWFILTER_DHCPSNOOP_H +#define __NWFILTER_DHCPSNOOP_H + +int virNWFilterDHCPSnoopInit(void); +int virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, + const char *ifname, + const char *linkdev, + enum virDomainNetType nettype, + const unsigned char *vmuuid, + const unsigned char *macaddr, + const char *filtername, + virNWFilterHashTablePtr filterparams, + virNWFilterDriverStatePtr driver); +void virNWFilterDHCPSnoopEnd(const char *ifname); +#endif /* __NWFILTER_DHCPSNOOP_H */ diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ffb4b5d..d014a19 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -39,6 +39,7 @@ #include "nwfilter_gentech_driver.h" #include "configmake.h" +#include "nwfilter_dhcpsnoop.h" #include "nwfilter_learnipaddr.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -66,6 +67,8 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; + if (virNWFilterDHCPSnoopInit() < 0) + return -1; if (virNWFilterLearnInit() < 0) return -1; @@ -127,6 +130,7 @@ alloc_err_exit: conf_init_err: virNWFilterTechDriversShutdown(); + virNWFilterDHCPSnoopEnd(0); virNWFilterLearnShutdown(); return -1; @@ -149,6 +153,7 @@ nwfilterDriverReload(void) { conn = virConnectOpen("qemu:///system"); if (conn) { + virNWFilterDHCPSnoopEnd(0); /* shut down all threads -- they will be restarted if necessary */ virNWFilterLearnThreadsTerminate(true); @@ -203,6 +208,7 @@ nwfilterDriverShutdown(void) { virNWFilterConfLayerShutdown(); virNWFilterTechDriversShutdown(); + virNWFilterDHCPSnoopEnd(0); virNWFilterLearnShutdown(); nwfilterDriverLock(driverState); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index fc71e7b..245adb0 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -32,6 +32,7 @@ #include "virterror_internal.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" +#include "nwfilter_dhcpsnoop.h" #include "nwfilter_learnipaddr.h" #include "virnetdev.h" #include "datatypes.h" @@ -42,6 +43,8 @@ #define NWFILTER_STD_VAR_MAC "MAC" #define NWFILTER_STD_VAR_IP "IP" +#define NWFILTER_DFLT_LEARN "any" + static int _virNWFilterTeardownFilter(const char *ifname); @@ -662,6 +665,9 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, void **ptrs = NULL; int instantiate = 1; char *buf; + virNWFilterVarValuePtr lv; + const char *learning; + bool reportIP = false; virNWFilterHashTablePtr missing_vars = virNWFilterHashTableCreate(0); if (!missing_vars) { @@ -678,22 +684,47 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, if (rc < 0) goto err_exit; + lv = virHashLookup(vars->hashTable, "ip_learning"); + if (lv && lv->valType == NWFILTER_VALUE_TYPE_SIMPLE) + learning = lv->u.simple.value; + else + learning = NULL; + + if (learning == NULL) + learning = NWFILTER_DFLT_LEARN; + if (virHashSize(missing_vars->hashTable) == 1) { if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { - if (virNWFilterLookupLearnReq(ifindex) == NULL) { - rc = virNWFilterLearnIPAddress(techdriver, - ifname, - ifindex, - linkdev, - nettype, macaddr, - filter->name, - vars, driver, - DETECT_DHCP|DETECT_STATIC); + if (c_strcasecmp(learning, "none") == 0) { /* no learning */ + reportIP = true; + goto err_unresolvable_vars; } - goto err_exit; - } - goto err_unresolvable_vars; + if (c_strcasecmp(learning, "dhcp") == 0) { + rc = virNWFilterDHCPSnoopReq(techdriver, ifname, linkdev, + nettype, vmuuid, macaddr, + filter->name, vars, driver); + goto err_exit; + } else if (c_strcasecmp(learning, "any") == 0) { + if (virNWFilterLookupLearnReq(ifindex) == NULL) { + rc = virNWFilterLearnIPAddress(techdriver, + ifname, + ifindex, + linkdev, + nettype, macaddr, + filter->name, + vars, driver, + DETECT_DHCP|DETECT_STATIC); + } + goto err_exit; + } else { + rc = 1; + virNWFilterReportError(VIR_ERR_PARSE_FAILED, _("filter '%s' " + "learning value '%s' invalid."), + filter->name, learning); + } + } else + goto err_unresolvable_vars; } else if (virHashSize(missing_vars->hashTable) > 1) { goto err_unresolvable_vars; } else if (!forceWithPendingReq && @@ -761,7 +792,7 @@ err_exit: err_unresolvable_vars: - buf = virNWFilterPrintVars(missing_vars->hashTable, ", ", false, false); + buf = virNWFilterPrintVars(missing_vars->hashTable, ", ", false, reportIP); if (buf) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot instantiate filter due to unresolvable " @@ -1092,6 +1123,8 @@ _virNWFilterTeardownFilter(const char *ifname) return -1; } + virNWFilterDHCPSnoopEnd(ifname); + virNWFilterTerminateLearnReq(ifname); if (virNWFilterLockIface(ifname) < 0) -- 1.7.6.5

4 4

[libvirt] [PATCH] qemu: Avoid entering monitor with locked driver
by Jiri Denemark 27 Mar '12

27 Mar '12

This avoids possible deadlock of the qemu driver in case a domain is begin migrated (in Begin phase) and unrelated connection to qemu driver is closed at the right time. I checked all callers of qemuDomainCheckEjectableMedia() and they are calling this function with qemu driver locked. --- src/qemu/qemu_hotplug.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f1c1283..38163ba 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -160,9 +160,9 @@ qemuDomainCheckEjectableMedia(struct qemud_driver *driver, int ret = -1; int i; - qemuDomainObjEnterMonitor(driver, vm); + qemuDomainObjEnterMonitorWithDriver(driver, vm); table = qemuMonitorGetBlockInfo(priv->mon); - qemuDomainObjExitMonitor(driver, vm); + qemuDomainObjExitMonitorWithDriver(driver, vm); if (!table) goto cleanup; -- 1.7.8.5

2 2

[libvirt] [PATCH v3] qemu, util: on restart of libvirt restart vepa callbacks
by D. Herrendoerfer 27 Mar '12

27 Mar '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> When libvirtd is restarted, also restart the netlink event message callbacks for existing VEPA connections and send a message to lldpad for these existing links, so it learns the new libvirtd pid. This patch includes the nits sent by Laine Stump, and it tests out ok. Signed-off-by: D. Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> --- src/qemu/qemu_driver.c | 31 ++++++++++ src/util/virnetdevmacvlan.c | 129 +++++++++++++++++++++++++++++++++--------- src/util/virnetdevmacvlan.h | 9 +++ src/util/virnetlink.c | 6 ++- 4 files changed, 146 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 538a419..8e6663c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -412,6 +412,35 @@ cleanup: virDomainObjUnlock(vm); } + +static void qemuDomainNetsRestart(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED) +{ + int i; + virDomainObjPtr vm = (virDomainObjPtr)payload; + virDomainDefPtr def = vm->def; + + virDomainObjLock(vm); + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT && + virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_VEPA) { + VIR_DEBUG("VEPA mode device %s active in domain %s. Reassociating.", + net->ifname, def->name); + ignore_value(virNetDevMacVLanRestartWithVPortProfile(net->ifname, + net->mac, + virDomainNetGetActualDirectDev(net), + def->uuid, + virDomainNetGetActualVirtPortProfile(net), + VIR_NETDEV_VPORT_PROFILE_OP_CREATE)); + } + } + + virDomainObjUnlock(vm); +} + /** * qemudStartup: * @@ -668,6 +697,8 @@ qemudStartup(int privileged) { NULL, NULL) < 0) goto error; + virHashForEach(qemu_driver->domains.objs, qemuDomainNetsRestart, NULL); + conn = virConnectOpen(qemu_driver->privileged ? "qemu:///system" : "qemu:///session"); diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 647679f..90888b0 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -769,6 +769,50 @@ virNetDevMacVLanVPortProfileDestroyCallback(int watch ATTRIBUTE_UNUSED, virNetlinkCallbackDataFree((virNetlinkCallbackDataPtr)opaque); } +static int +virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, + const unsigned char *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) +{ + virNetlinkCallbackDataPtr calld = NULL; + + if (virtPortProfile && virNetlinkEventServiceIsRunning()) { + if (VIR_ALLOC(calld) < 0) + goto memory_error; + if ((calld->cr_ifname = strdup(ifname)) == NULL) + goto memory_error; + if (VIR_ALLOC(calld->virtPortProfile) < 0) + goto memory_error; + memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); + if (VIR_ALLOC_N(calld->macaddress, VIR_MAC_BUFLEN) < 0) + goto memory_error; + memcpy(calld->macaddress, macaddress, VIR_MAC_BUFLEN); + if ((calld->linkdev = strdup(linkdev)) == NULL) + goto memory_error; + if (VIR_ALLOC_N(calld->vmuuid, VIR_UUID_BUFLEN) < 0) + goto memory_error; + memcpy(calld->vmuuid, vmuuid, VIR_UUID_BUFLEN); + + calld->vmOp = vmOp; + + if (virNetlinkEventAddClient(virNetDevMacVLanVPortProfileCallback, + virNetDevMacVLanVPortProfileDestroyCallback, + calld, macaddress) < 0) + goto error; + } + + return 0; + +memory_error: + virReportOOMError(); +error: + virNetlinkCallbackDataFree(calld); + return -1; +} + /** * virNetDevMacVLanCreateWithVPortProfile: @@ -810,7 +854,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, int retries, do_retry = 0; uint32_t macvtapMode; const char *cr_ifname; - virNetlinkCallbackDataPtr calld = NULL; int ret; int vf = -1; @@ -917,36 +960,12 @@ create_name: goto disassociate_exit; } - if (virtPortProfile && virNetlinkEventServiceIsRunning()) { - if (VIR_ALLOC(calld) < 0) - goto memory_error; - if ((calld->cr_ifname = strdup(cr_ifname)) == NULL) - goto memory_error; - if (VIR_ALLOC(calld->virtPortProfile) < 0) - goto memory_error; - memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); - if (VIR_ALLOC_N(calld->macaddress, VIR_MAC_BUFLEN) < 0) - goto memory_error; - memcpy(calld->macaddress, macaddress, VIR_MAC_BUFLEN); - if ((calld->linkdev = strdup(linkdev)) == NULL) - goto memory_error; - if (VIR_ALLOC_N(calld->vmuuid, VIR_UUID_BUFLEN) < 0) - goto memory_error; - memcpy(calld->vmuuid, vmuuid, VIR_UUID_BUFLEN); - - calld->vmOp = vmOp; - - virNetlinkEventAddClient(virNetDevMacVLanVPortProfileCallback, - virNetDevMacVLanVPortProfileDestroyCallback, - calld, macaddress); - } + if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) + goto disassociate_exit; return rc; - memory_error: - virReportOOMError(); - virNetlinkCallbackDataFree(calld); - disassociate_exit: ignore_value(virNetDevVPortProfileDisassociate(cr_ifname, virtPortProfile, @@ -1003,6 +1022,48 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, return ret; } +/** + * virNetDevMacVLanRestartWithVPortProfile: + * Register a port profile callback handler for a VM that + * is already running + * . + * @cr_ifname: Interface name that the macvtap has. + * @macaddress: The MAC address for the macvtap device + * @linkdev: The interface name of the NIC to connect to the external bridge + * @vmuuid: The UUID of the VM the macvtap belongs to + * @virtPortProfile: pointer to object holding the virtual port profile data + * @vmOp: Operation to use during setup of the association + * + * Returns 0; returns -1 on error. + */ +int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, + const unsigned char *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) +{ + int rc = 0; + + rc = virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + linkdev, vmuuid, + virtPortProfile, vmOp); + if (rc < 0) + goto error; + + ignore_value(virNetDevVPortProfileAssociate(cr_ifname, + virtPortProfile, + macaddress, + linkdev, + -1, + vmuuid, + vmOp, true)); + +error: + return rc; + +} + #else /* ! WITH_MACVTAP */ int virNetDevMacVLanCreate(const char *ifname ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED, @@ -1052,4 +1113,16 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, _("Cannot create macvlan devices on this platform")); return -1; } + +int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUSED, + const unsigned char *macaddress ATTRIBUTE_UNUSED, + const char *linkdev ATTRIBUTE_UNUSED, + const unsigned char *vmuuid ATTRIBUTE_UNUSED, + virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, + enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 130ecea..14640cf 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -75,4 +75,13 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; +int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, + const unsigned char *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + #endif /* __UTIL_MACVTAP_H__ */ diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 59f3e39..2cb3656 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -428,8 +428,11 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, int i, r, ret = -1; virNetlinkEventSrvPrivatePtr srv = server; - if (handleCB == NULL) + if (handleCB == NULL) { + netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid NULL callback provided")); return -1; + } virNetlinkEventServerLock(srv); @@ -449,6 +452,7 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, srv->handlesAlloc, NETLINK_EVENT_ALLOC_EXTENT); if (VIR_RESIZE_N(srv->handles, srv->handlesAlloc, srv->handlesCount, NETLINK_EVENT_ALLOC_EXTENT) < 0) { + virReportOOMError(); goto error; } } -- 1.7.7.6

1 0

[libvirt] [test-API PATCH 0/6] General improvements and fixes
by Martin Kletzander 27 Mar '12

27 Mar '12

This series fixed some of the issues I came across while trying to make some tests working. I still haven't managed to run more than define, start, destroy and undefine tests, but at least this should help someone to get a start at this. There are many things that could (should?) be changed (either with or without a discussion), but maybe I missed something, so feel free to comment on all the patches if you have any input, I'll be glad to discuss/change anything in order to move forward. Each of the patches has it's own description and they are not that much related to each other, so I won't describe it all here again, I just didn't want to create unnecessary threads in the mailing list, so I'm sending this as a series. Martin Kletzander (6): Slight cross-distribution support Added support for Gentoo Fixed domain/start.py Add default 'uri' parameter to all tests Cleanup and fix of domain/define test Make use of new 'uri' parameter in tests env_inspect.py => dist/gentoo/env_inspect.py | 88 +++++--------- env_inspect.py => dist/redhat/env_inspect.py | 0 generator.py | 18 +++- repos/domain/attach_disk.py | 2 +- repos/domain/attach_interface.py | 2 +- repos/domain/autostart.py | 2 +- repos/domain/balloon_memory.py | 2 +- repos/domain/blkstats.py | 2 +- repos/domain/cpu_affinity.py | 2 +- repos/domain/cpu_topology.py | 2 +- repos/domain/create.py | 2 +- repos/domain/define.py | 132 +++---------------- repos/domain/destroy.py | 2 +- repos/domain/detach_disk.py | 2 +- repos/domain/detach_interface.py | 2 +- repos/domain/domain_blkinfo.py | 2 +- repos/domain/domain_id.py | 2 +- repos/domain/domain_uuid.py | 2 +- repos/domain/dump.py | 2 +- repos/domain/eventhandler.py | 2 +- repos/domain/ifstats.py | 2 +- repos/domain/install_image.py | 6 +- repos/domain/install_linux_cdrom.py | 6 +- repos/domain/install_linux_check.py | 2 +- repos/domain/install_linux_net.py | 7 +- repos/domain/install_windows_cdrom.py | 7 +- repos/domain/ownership_test.py | 2 +- repos/domain/reboot.py | 2 +- repos/domain/restore.py | 2 +- repos/domain/resume.py | 2 +- repos/domain/save.py | 2 +- repos/domain/sched_params.py | 2 +- repos/domain/shutdown.py | 2 +- repos/domain/start.py | 17 ++- repos/domain/suspend.py | 2 +- repos/domain/undefine.py | 2 +- repos/domain/update_devflag.py | 2 +- repos/interface/create.py | 2 +- repos/interface/define.py | 2 +- repos/interface/destroy.py | 2 +- repos/interface/undefine.py | 2 +- repos/libvirtd/qemu_hang.py | 2 +- repos/libvirtd/restart.py | 2 +- repos/network/autostart.py | 2 +- repos/network/create.py | 2 +- repos/network/define.py | 2 +- repos/network/destroy.py | 2 +- repos/network/network_list.py | 2 +- repos/network/network_name.py | 2 +- repos/network/network_uuid.py | 2 +- repos/network/start.py | 2 +- repos/network/undefine.py | 2 +- repos/nodedevice/detach.py | 2 +- repos/nodedevice/reattach.py | 2 +- repos/nodedevice/reset.py | 2 +- repos/npiv/create_virtual_hba.py | 2 +- .../multiple_thread_block_on_domain_create.py | 2 +- repos/sVirt/domain_nfs_start.py | 4 +- repos/snapshot/delete.py | 2 +- repos/snapshot/file_flag.py | 2 +- repos/snapshot/flag_check.py | 2 +- repos/snapshot/internal_create.py | 2 +- repos/snapshot/revert.py | 2 +- repos/storage/activate_pool.py | 2 +- repos/storage/build_dir_pool.py | 2 +- repos/storage/build_disk_pool.py | 2 +- repos/storage/build_logical_pool.py | 2 +- repos/storage/build_netfs_pool.py | 2 +- repos/storage/create_dir_pool.py | 2 +- repos/storage/create_dir_volume.py | 2 +- repos/storage/create_fs_pool.py | 2 +- repos/storage/create_iscsi_pool.py | 2 +- repos/storage/create_logical_volume.py | 2 +- repos/storage/create_netfs_pool.py | 2 +- repos/storage/create_netfs_volume.py | 2 +- repos/storage/create_partition_volume.py | 2 +- repos/storage/define_dir_pool.py | 2 +- repos/storage/define_disk_pool.py | 2 +- repos/storage/define_iscsi_pool.py | 2 +- repos/storage/define_logical_pool.py | 2 +- repos/storage/define_mpath_pool.py | 2 +- repos/storage/define_netfs_pool.py | 2 +- repos/storage/define_scsi_pool.py | 2 +- repos/storage/delete_dir_volume.py | 2 +- repos/storage/delete_logical_pool.py | 2 +- repos/storage/delete_logical_volume.py | 2 +- repos/storage/delete_netfs_volume.py | 2 +- repos/storage/delete_partition_volume.py | 2 +- repos/storage/destroy_pool.py | 2 +- repos/storage/pool_name.py | 2 +- repos/storage/pool_uuid.py | 2 +- repos/storage/undefine_pool.py | 2 +- utils/Python/utils.py | 45 +++++++- 93 files changed, 223 insertions(+), 271 deletions(-) create mode 100644 dist/__init__.py create mode 100644 dist/gentoo/__init__.py copy env_inspect.py => dist/gentoo/env_inspect.py (57%) create mode 100644 dist/redhat/__init__.py rename env_inspect.py => dist/redhat/env_inspect.py (100%) -- 1.7.3.4

5 28