- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: schedinfo --set invalid=value would simply ignore the option
by Jim Meyering 12 May '10

12 May '10

Currently, virsh does this: $ virsh -c test:///default schedinfo 1 --set j=k>/dev/null && echo bad bad It should have diagnosed "j=k" as an invalid schedinfo --set argument. With the patch below, it does: $ ./virsh -c test:///default schedinfo 1 --set j=k>/dev/null && echo bad error: invalid scheduler option: j=k [Exit 1] >From cf56648333c4e5cf73ab3292ba727e33b0ae9708 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 11 May 2010 15:38:21 +0200 Subject: [PATCH] virsh: schedinfo --set invalid=value would simply ignore the option For example, virsh -c test:///default schedinfo 1 --set P=k would mistakenly exit successfully, giving no indication that it had failed to set the scheduling parameter "P". * tools/virsh.c (cmdSchedinfo): Diagnose an invalid --set j=k option, rather than silently ignoring it. * tests/virsh-schedinfo: New test for the above. * tests/Makefile.am (test_scripts): Add it. Reported by Jintao Yang in http://bugzilla.redhat.com/586632 --- tests/Makefile.am | 1 + tests/virsh-schedinfo | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.c | 10 ++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) create mode 100755 tests/virsh-schedinfo diff --git a/tests/Makefile.am b/tests/Makefile.am index ef12386..b5e09e3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -139,6 +139,7 @@ test_scripts += \ undefine \ vcpupin \ virsh-all \ + virsh-schedinfo \ virsh-synopsis endif diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo new file mode 100755 index 0000000..116014a --- /dev/null +++ b/tests/virsh-schedinfo @@ -0,0 +1,49 @@ +#!/bin/sh +# Ensure that virsh schedinfo --set invalid=val fails + +# Copyright (C) 2010 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +: ${srcdir=$(pwd)} +: ${abs_top_srcdir=$(pwd)/..} +: ${abs_top_builddir=$(pwd)/..} + +# If $abs_top_builddir/tools/virsh is not early in $PATH, put it there, +# so that we can safely invoke "virsh" simply with its name. +case $PATH in + $abs_top_builddir/tools/src:$abs_top_builddir/tools/virsh:*) ;; + $abs_top_builddir/tools/virsh:*) ;; + *) PATH=$abs_top_builddir/tools/virsh:$PATH; export PATH ;; +esac + +if test "$VERBOSE" = yes; then + set -x + $abs_top_builddir/tools/virsh --version +fi + +. "$srcdir/test-lib.sh" + +printf 'Scheduler : fair\n\n' > exp-out || framework_failure +printf 'error: invalid scheduler option: j=k\n' > exp-err || framework_failure + +fail=0 + +test_url=test:///default + +virsh -c $test_url schedinfo 1 --set j=k >out 2>err && fail=1 +compare out exp-out || fail=1 +compare err exp-err || fail=1 + +(exit $fail); exit $fail diff --git a/tools/virsh.c b/tools/virsh.c index 0a63f1b..99f383a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1594,6 +1594,16 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) ret = virDomainGetSchedulerParameters(dom, params, &nparams); if (ret == -1) goto cleanup; + } else { + /* See if we've tried to --set var=val. If so, the fact that + we reach this point (with update == 0) means that "var" did + not match any of the settable parameters. Report the error. */ + char *var_value_pair = vshCommandOptString(cmd, "set", NULL); + if (var_value_pair) { + vshError(ctl, _("invalid scheduler option: %s"), + var_value_pair); + goto cleanup; + } } ret_val = TRUE; -- 1.7.1.189.g07419

3 3

[libvirt] [PATCH] virsh: fix a typo in a diagnostic
by Jim Meyering 12 May '10

12 May '10

FYI, I've just pushed these two typo fixes: >From 5603515127ff14b70bd6a24db1485043a6b817a7 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 11 May 2010 16:02:28 +0200 Subject: [PATCH] virsh: fix a typo in a diagnostic * tools/virsh.c (cmdSchedInfoUpdate): Fix typo in a diagnostic: s/an long long/a long long/. One in a comment, too. --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0a63f1b..b9bf06d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -88,7 +88,7 @@ static char *progname; /** * vshErrorLevel: * - * Indicates the level of an log message + * Indicates the level of a log message */ typedef enum { VSH_ERR_DEBUG = 0, @@ -1510,7 +1510,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, case VIR_DOMAIN_SCHED_FIELD_LLONG: if (virStrToLong_ll(val, NULL, 10, &param->value.l) < 0) { vshError(ctl, "%s", - _("Invalid value for parameter, expecting an long long")); + _("Invalid value for parameter, expecting a long long")); return -1; } break; -- 1.7.1.189.g07419

1 0

[libvirt] Build failure on RHEL-5
by Chris Lalancette 11 May '10

11 May '10

Hello, My autobuild of libvirt on RHEL-5 failed last night because of: if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../src -I../src/util -I../src/conf -I../src/remote -I/usr/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option -Werror -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -D_REENTRANT -g -O2 -MT libvirtd-dispatch.o -MD -MP -MF ".deps/libvirtd-dispatch.Tpo" -c -o libvirtd-dispatch.o `test -f 'dispatch.c' || echo './'`dispatch.c; \ then mv -f ".deps/libvirtd-dispatch.Tpo" ".deps/libvirtd-dispatch.Po"; else rm -f ".deps/libvirtd-dispatch.Tpo"; exit 1; fi cc1: warnings being treated as errors dispatch.c: In function 'remoteDispatchClientCall': dispatch.c:444: warning: value computed is not used Git head revision: 78a6af1ff9cdbb799f9e02d1f0160b2f9ee61cd9 >From a quick look, I can't quite see what it is complaining about; args is clearly used later in the function, so it's kind of weird. Anyway, if anyone has time to look, it's probably something we should fix. -- Chris Lalancette

1 0

[libvirt] [PATCH] docs/Makefile.am: remove unnecessary subshells
by Eric Blake 11 May '10

11 May '10

* docs/Makefile.am (ChangeLog.html.in, %.html.tmp, %.html) (html/index.html, $(devhelphtml)): Avoid spurious subshells. --- I'm still having problems getting a VPATH build to work correctly, but noticed this low-hanging fruit in the process. Reformatting to 80 columns is a nice side effect. docs/Makefile.am | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index a18821b..70b9e51 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -91,44 +91,49 @@ ChangeLog.xml: ../ChangeLog ChangeLog.awk awk -f ChangeLog.awk < $< > $@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl - @(if [ -x $(XSLTPROC) ] ; then \ + @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --nonet $(top_srcdir)/docs/ChangeLog.xsl $< > $@ || (rm $@ && exit 1) ; fi ) + $(XSLTPROC) --nonet $(top_srcdir)/docs/ChangeLog.xsl $< > $@ \ + || { rm $@ && exit 1; }; fi %.png: %.fig convert -rotate 90 $< $@ %.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in - @(if [ -x $(XSLTPROC) ] ; then \ + @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet --html $(top_srcdir)/docs/site.xsl $< > $@ || (rm $@ && exit 1) ; fi ) + $(XSLTPROC) --stringparam pagename $$name --nonet --html \ + $(top_srcdir)/docs/site.xsl $< > $@ \ + || { rm $@ && exit 1; }; fi %.html: %.html.tmp - @(if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ - if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ + @if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ + if $(XMLCATALOG) /etc/xml/catalog \ + "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating $@" ; \ - $(XMLLINT) --nonet --format --valid $< > $@ || (rm $@ && exit 1) ; \ - else echo "missing XHTML1 DTD" ; fi ; fi ); + $(XMLLINT) --nonet --format --valid $< > $@ \ + || { rm $@ && exit 1; }; \ + else echo "missing XHTML1 DTD" ; fi ; fi html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in - -@(if [ -x $(XSLTPROC) ] ; then \ + -@if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ - $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi ) - -@(if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ + $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi + -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" \ > /dev/null ; then \ echo "Validating the resulting XHTML pages" ; \ $(XMLLINT) --nonet --valid --noout html/*.html ; \ - else echo "missing XHTML1 DTD" ; fi ; fi ); + else echo "missing XHTML1 DTD" ; fi ; fi $(devhelphtml): libvirt-api.xml $(devhelpxsl) - -@(echo Rebuilding devhelp files) - -@(if [ -x $(XSLTPROC) ] ; then \ + -@echo Rebuilding devhelp files + -@if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \ - $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi ); + $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: $(srcdir)/apibuild.py -srcdir=$(srcdir) $(srcdir)/apibuild.py -- 1.6.6.1

2 1

[libvirt] locking down struct size/layout in remote-protocol.x
by Jim Meyering 11 May '10

11 May '10

This week we noticed that a change to struct remote_error was causing trouble (new member addition changed the size of the object being decoded -- bad for the protocol). In order to ensure that no such changes sneak in again, I'm planning to do the following. First, count how many structs must not change size or layout: $ grep -E '^struct remote_' src/*/remote_protocol.x|wc -l 318 Obviously not appropriate to do it manually. Running this (pdwtags is part of the dwarves package): pdwtags src/libvirt_driver_remote_la-remote_protocol.o prints, among other things, detailed type info for every struct: /* 89 */ struct remote_nonnull_domain { remote_nonnull_string name; /* 0 8 */ remote_uuid uuid; /* 8 16 */ int id; /* 24 4 */ /* size: 32, cachelines: 1, members: 3 */ /* last cacheline: 32 bytes */ /* BRAIN FART ALERT! 32 != 28 + 0(holes), diff = 4 */ }; /* size: 32 */ /* 90 */ typedef struct remote_nonnull_domain remote_nonnull_domain; /* size: 32 */ /* 91 */ struct remote_nonnull_network { remote_nonnull_string name; /* 0 8 */ remote_uuid uuid; /* 8 16 */ /* size: 24, cachelines: 1, members: 2 */ /* last cacheline: 24 bytes */ }; /* size: 24 */ ----------------------------------------------------- A) For each of the above matching /^struct remote_/, print at the very least this sort of compile-time check: verify (sizeof (struct remote_nonnull_domain) == 32); verify (sizeof (struct remote_nonnull_network) == 24); B) Even better, verify member offsets, so that we'd detect reordered members (which often will not change struct size): verify (sizeof (struct remote_nonnull_domain) == 32); verify (offsetof (struct remote_nonnull_domain, name) == 0); verify (offsetof (struct remote_nonnull_domain, uuid) == 8); verify (offsetof (struct remote_nonnull_domain, id) == 24); verify (sizeof (struct remote_nonnull_network) == 24); verify (offsetof (struct remote_nonnull_network, name) == 0); verify (offsetof (struct remote_nonnull_network, uuid) == 16); C) Might as well verify member sizes as well. ----------------------------------------------------- Once we have a small script to generate that (RSN), include the generated, (and version-controlled) file from remote_protocol.c, and we're done. For reference, here's code to generate A): pdwtags src/libvirt_driver_remote_la-remote_protocol.o \ | perl -0777 -n \ -e 'foreach my $p (split m!\n\n/\* \d+ \*/\n!)' \ -e ' { $p =~ m!^struct (remote_\w+).*/\* size: (\d+) \*/!s' \ -e ' and print "verify (sizeof (struct $1) == $2);\n" }' And here's a sample of its output: verify (sizeof (struct remote_nonnull_domain) == 32); verify (sizeof (struct remote_nonnull_network) == 24); verify (sizeof (struct remote_nonnull_nwfilter) == 24); verify (sizeof (struct remote_nonnull_interface) == 16); verify (sizeof (struct remote_nonnull_storage_pool) == 24); verify (sizeof (struct remote_nonnull_storage_vol) == 24); verify (sizeof (struct remote_nonnull_node_device) == 8); ... verify (sizeof (struct remote_domain_has_current_snapshot_args) == 40); verify (sizeof (struct remote_domain_has_current_snapshot_ret) == 4); verify (sizeof (struct remote_domain_snapshot_current_args) == 40); verify (sizeof (struct remote_domain_snapshot_current_ret) == 40); verify (sizeof (struct remote_domain_revert_to_snapshot_args) == 48); verify (sizeof (struct remote_domain_snapshot_delete_args) == 48); verify (sizeof (struct remote_message_header) == 24);

3 15

[libvirt] [PATCH] delMacvtap: typo fix
by Eric Blake 11 May '10

11 May '10

* src/util/macvtap.c (delMacvtap): Fix documentation. --- Pushing as trivial. src/util/macvtap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 5d129fd..1f8dd29 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -669,13 +669,13 @@ link_del_exit: return rc; } /** - * delMacvtapByName: + * delMacvtap: * @ifname : The name of the macvtap interface * * Delete an interface given its name. */ void delMacvtap(const char *ifname) -- 1.7.0.1

2 1

[libvirt] [PATCH] maint: allow VPATH use of remote_protocol-structs
by Eric Blake 11 May '10

11 May '10

* src/Makefile.am (remote_protocol-structs): Ensure file lives in srcdir. --- Jim's new check didn't quite work in a VPATH setup. I'm applying it as obvious, since it was a build-breaker: GEN remote_protocol-structs diff: remote_protocol-structs: No such file or directory make[3]: *** [remote_protocol-structs] Error 2 src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1542ab1..15bc8fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -179,7 +179,7 @@ remote_protocol-structs: -e ' $$p =~ s!\s+$$!!;' \ -e ' print "$$p\n" } }' \ > $@-t; \ - diff -u $@-t $@; st=$$?; rm -f $@-t; exit $$st; \ + diff -u $@-t $(srcdir)/$@; st=$$?; rm -f $@-t; exit $$st; \ else \ echo 'WARNING: you lack pdwtags; skipping the $@ test'; \ echo 'WARNING: install the dwarves package to get pdwtags'; \ -- 1.7.0.1

1 0

[libvirt] [PATCH] build: fix autogen rule for VPATH build
by Eric Blake 11 May '10

11 May '10

* cfg.mk (gnulib_srcdir): Override maint.mk default. (_update_required): Run in correct directory. --- I noticed an error message about bootstrap.conf not found when trying to do a VPATH build for my new clang setup. This subsumes up my earlier patch to declare the correct gnulib_srcdir, as noticed by Jim, but does not advance to a newer .gnulib, as there are some other issues to fix on that front first. cfg.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cfg.mk b/cfg.mk index 105b625..a6e9204 100644 --- a/cfg.mk +++ b/cfg.mk @@ -24,6 +24,9 @@ gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE)) url_dir_list = \ ftp://$(gnu_rel_host)/gnu/coreutils +# We use .gnulib, not gnulib. +gnulib_srcdir = $(srcdir)/.gnulib + # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ @@ -282,6 +285,7 @@ ifeq (0,$(MAKELEVEL)) # b653eda3ac4864de205419d9f41eec267cb89eeb _submodule_hash = sed 's/^[ +-]//;s/ .*//' _update_required := $(shell \ + cd '$(srcdir)'; \ actual=$$(git submodule status | $(_submodule_hash); \ git hash-object bootstrap.conf; \ git diff .gnulib); \ -- 1.6.6.1

4 18

[libvirt] question on network interface of LXC domain
by Osier Yang 11 May '10

11 May '10

Hello there with newest libvirt, when I connect to the container via console, then execute "ifconfig", there will be no output, though the network works fine. and "/proc/net/dev" of container seems good too. (has entries about "eth0" and "lo"). I traced the call procedure of "ifconfig", it reads the infomations of network interface from "/proc/net/dev" and vise visa. so I'm confused about what cause this problem. there is no problem with libvirt-0.8.0-4. Thanks and Regards Osier

2 1

[libvirt] [PATCH] more interface functions; some needed for VEPA
by Stefan Berger 08 May '10

08 May '10

In the attached patch I am refactoring the function that changes the flags on an interface to call a separate function to first read the flags on the interface. This function that reads the flags then becomes public. I am also adding a function that test whether an interface is currently up. This prevents other code to have to include interface related include files. Then there is a new function that reads the VLANid of a VLAN interface via an ioctl(). This one will be needed by upcoming VEPA related patches. On cygwin for example none of the newly added functions are available. The flags related function could not be exported due to missing PF_PACKET -- or maybe other type of protocol that needs to be used when opening the socket for running the ioctl() on. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/libvirt_private.syms | 2 + src/util/interface.c | 76 ++++++++++++++++++++++++++++++++++++++++------- src/util/interface.h | 3 + 3 files changed, 70 insertions(+), 11 deletions(-) Index: libvirt-acl/src/util/interface.c =================================================================== --- libvirt-acl.orig/src/util/interface.c +++ libvirt-acl/src/util/interface.c @@ -30,6 +30,8 @@ #ifdef __linux__ # include <linux/if.h> +# include <linux/sockios.h> +# include <linux/if_vlan.h> #endif #include "internal.h" @@ -42,6 +44,85 @@ virReportErrorHelper(NULL, VIR_FROM_NET, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) +#if __linux__ +static int +getFlags(int fd, const char *ifname, struct ifreq *ifr) { + + memset(ifr, 0, sizeof(*ifr)); + + if (virStrncpy(ifr->ifr_name, + ifname, strlen(ifname), sizeof(ifr->ifr_name)) == NULL) + return ENODEV; + + if (ioctl(fd, SIOCGIFFLAGS, ifr) < 0) + return errno; + + return 0; +} + + +/** + * ifaceGetFlags + * + * @ifname : name of the interface + * @flags : pointer to short holding the flags on success + * + * Get the flags of the interface. Returns 0 on success, error code on failure. + */ +int +ifaceGetFlags(const char *ifname, short *flags) { + struct ifreq ifr; + int rc; + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + + if (fd < 0) + return errno; + + rc = getFlags(fd, ifname, &ifr); + + *flags = ifr.ifr_flags; + + close(fd); + + return rc; +} + + +int +ifaceIsUp(const char *ifname, bool *up) { + short flags; + int rc = ifaceGetFlags(ifname, &flags); + + if (rc) + return rc; + + *up = ((flags & IFF_UP) == IFF_UP); + + return 0; +} +#else + +/* Note: Showstopper on cygwin is only missing PF_PACKET */ + +int +ifaceGetFlags(const char *ifname ATTRIBUTE_UNUSED, + short *flags ATTRIBUTE_UNUSED) { + ifaceError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ifaceGetFlags is not supported on non-linux platforms")); + return ENOSYS; +} + +int +ifaceIsUp(const char *ifname ATTRIBUTE_UNUSED, + bool *up ATTRIBUTE_UNUSED) { + + ifaceError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ifaceIsUp is not supported on non-linux platforms")); + return ENOSYS; +} + +#endif /* __linux__ */ + /* * chgIfaceFlags: Change flags on an interface * @@ -59,23 +140,16 @@ static int chgIfaceFlags(const char *ifname, short flagclear, short flagset) { struct ifreq ifr; int rc = 0; - int flags; + short flags; short flagmask = (~0 ^ flagclear); int fd = socket(PF_PACKET, SOCK_DGRAM, 0); if (fd < 0) return errno; - if (virStrncpy(ifr.ifr_name, - ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { - rc = ENODEV; + rc = getFlags(fd, ifname, &ifr); + if (rc != 0) goto err_exit; - } - - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { - rc = errno; - goto err_exit; - } flags = (ifr.ifr_flags & flagmask) | flagset; @@ -151,6 +225,8 @@ ifaceCheck(bool reportError, const char if (fd < 0) return errno; + memset(&ifr, 0, sizeof(ifr)); + if (virStrncpy(ifr.ifr_name, ifname, strlen(ifname), sizeof(ifr.ifr_name)) == NULL) { if (reportError) @@ -227,6 +303,8 @@ ifaceGetIndex(bool reportError, const ch if (fd < 0) return errno; + memset(&ifreq, 0, sizeof(ifreq)); + if (virStrncpy(ifreq.ifr_name, ifname, strlen(ifname), sizeof(ifreq.ifr_name)) == NULL) { if (reportError) @@ -269,3 +347,46 @@ ifaceGetIndex(bool reportError, } #endif /* __linux__ */ + +#ifdef __linux__ +int +ifaceGetVlanID(const char *vlanifname, int *vlanid) { + struct vlan_ioctl_args vlanargs = { + .cmd = GET_VLAN_VID_CMD, + }; + int rc = 0; + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + + if (fd < 0) + return errno; + + if (virStrcpyStatic(vlanargs.device1, vlanifname) == NULL) { + rc = EINVAL; + goto err_exit; + } + + if (ioctl(fd, SIOCGIFVLAN, &vlanargs) != 0) { + rc = errno; + goto err_exit; + } + + *vlanid = vlanargs.u.VID; + + err_exit: + close(fd); + + return rc; +} + +#else + +int +ifaceGetVlanID(const char *vlanifname ATTRIBUTE_UNUSED, + int *vlanid ATTRIBUTE_UNUSED) { + + ifaceError(VIR_ERR_INTERNAL_ERROR, "%s", + _("ifaceGetVlanID is not supported on non-linux platforms")); + + return ENOSYS; +} +#endif /* __linux__ */ Index: libvirt-acl/src/util/interface.h =================================================================== --- libvirt-acl.orig/src/util/interface.h +++ libvirt-acl/src/util/interface.h @@ -12,6 +12,9 @@ # include "datatypes.h" +int ifaceGetFlags(const char *name, short *flags); +int ifaceIsUp(const char *name, bool *up); + int ifaceCtrl(const char *name, bool up); static inline int ifaceUp(const char *name) { @@ -27,4 +30,6 @@ int ifaceCheck(bool reportError, const c int ifaceGetIndex(bool reportError, const char *ifname, int *ifindex); +int ifaceGetVlanID(const char *vlanifname, int *vlanid); + #endif /* __VIR_INTERFACE_H__ */ Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -685,6 +685,9 @@ virArgvToString; ifaceCtrl; ifaceCheck; ifaceGetIndex; +ifaceGetFlags; +ifaceIsUp; +ifaceGetVlanID; # usb.h usbGetDevice;

2 3

[libvirt] [PATCH] mingw32-libvirt.spec: bring up to date
by Eric Blake 08 May '10

08 May '10

Right now, mingw32-portablexdr is not available in Fedora, but is present in fedora-mingw.git. With that package, plus redhat-rpm-config and this patch, it is once again possible to build mingw32-libvirt from a Fedora 12 host. * mingw32-libvirt.spec.in (__debug_install_post): Override. (%files): Mention recent additions. --- The __debug_install_post trick is something that Richard Jones taught me while figuring out how to get mingw32-portablexdr. Also, during that effort, we discovered this bug in rpm: https://bugzilla.redhat.com/show_bug.cgi?id=587818 you have to have redhat-rpm-config installed to work around it. mingw32-libvirt.spec.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 867a849..fc90203 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -3,6 +3,7 @@ %define _use_internal_dependency_generator 0 %define __find_requires %{_mingw32_findrequires} %define __find_provides %{_mingw32_findprovides} +%define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-libvirt Version: @VERSION@ @@ -30,6 +31,7 @@ BuildRequires: gettext BuildArch: noarch +%{?_mingw32_debug_package} %description MinGW Windows libvirt virtualization library. @@ -95,9 +97,12 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/libvirt/schemas/nodedev.rng %{_mingw32_datadir}/libvirt/schemas/capability.rng %{_mingw32_datadir}/libvirt/schemas/interface.rng +%{_mingw32_datadir}/libvirt/schemas/nwfilter.rng %{_mingw32_datadir}/libvirt/schemas/secret.rng %{_mingw32_datadir}/libvirt/schemas/storageencryption.rng +%{_mingw32_datadir}/libvirt/cpu_map.xml + %{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo %dir %{_mingw32_includedir}/libvirt -- 1.6.6.1

2 2

[libvirt] [PATCH] Fix pthread related link error for virt-aa-helper
by Matthias Bolte 08 May '10

08 May '10

Link virt-aa-helper explicitly with pthread. This is at least required on Ubuntu 10.04. --- I just pushed this one, as it qualifies as trivial compile fix. src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2025208..0da30bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1002,7 +1002,7 @@ libexec_PROGRAMS += virt-aa-helper virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) -virt_aa_helper_LDFLAGS = $(WARN_CFLAGS) +virt_aa_helper_LDFLAGS = $(WARN_CFLAGS) $(LIB_PTHREAD) virt_aa_helper_LDADD = \ $(WARN_CFLAGS) \ $(LIBXML_LIBS) \ -- 1.7.0.4

3 10

[libvirt] small typo in "Terminology and goals" page
by Ersek, Laszlo 08 May '10

08 May '10

Hi, there seems to be a typo in http://libvirt.org/goals.html "Multiple mode may be accessed with libvirt simultaneously but the APIs are limited to single node operations." I think that was intended as "Multiple *nodes*". If not: sorry :) Cheers, lacos

2 1

[libvirt] [Reminder] KVM Forum 2010: Call for Papers
by KVM Forum 2010 Program Committee 08 May '10

08 May '10

Just a reminder...The submission deadline is in one week. thanks, -KVM Forum 2010 Program Commitee -- ================================================================= CALL FOR PAPERS KVM Forum 2010 ================================================================= DESCRIPTION The KVM Forum is back! After a break last year we're proud to present this year's gathering around KVM again. The idea is to have everyone involved with KVM development come together to talk about the future and current state of KVM, teaching everyone some pieces of the puzzle they might be missing without. So if you're a KVM developer, mark the dates in your calendar! If possible, also submit a talk -- we're interested in a wide variety of KVM topics, so don't hesitate to propose a talk on your work. If you're not a KVM developer, please read on nevertheless (or jump to END USER COLLABORATION). DATES / LOCATION Conference: August 9 - 10, 2010 Location: Renaissance Boston Waterfront in Boston, MA Abstracts due: May 14th, 2010 Notification: May 28th, 2010 Yes, we're colocated with LinuxCon. Tickets for the KVM Forum also count for LinuxCon. http://events.linuxfoundation.org/component/registrationpro/?func=details&d… PROCESS At first check if it's before May 14th. If you're past that date, you're out of luck. Now try to think hard and come up with a great idea that you could talk about. Once you have that set, we need you to write up a short abstract (~150 words) on it. In your submission please note how long your talk will take. Slots vary in length up to one hour. Also include in your proposal the proposal type -- one of: technical talk, breakout session, or end-user talk. Add that information to the abstract and submit it at the following URL: http://events.linuxfoundation.org/cfp/cfp-add Now, wait until May 24th. You will receive a notification on whether your talk was accepted or not. SCOPE OF TALKS We have a list of suggested presentation topics below. These suggestions are just for guidance, please feel free to submit a proposal on any of these or related topics. In general, the more it's about backend infrastructure, the better. KVM - Scaling and performance - Nested virtualization - I/O improvements - Driver domains - Time keeping - Memory management (page sharing, swapping, huge pages, etc) - Fault tolerance - VEPA, vswitch Embedded KVM - KVM on ARM, PPC, MIPS, ...? - Real-time requirements host/guest - Device pass-through w/o iommu - Custom device/platform models QEMU - Device model improvements - New devices - Security model - Scaling and performance - Desktop virtualization - Increasing robustness - Management interfaces - QMP protocol and implementation - Live migration Virtio - Speeding up existing devices - Vhost - Alternatives - Using virtio in non-kvm environments - Virtio on non-Linux Management infrastructure - Libvirt - Kvm autotest - Easy networking - Qemud BREAKOUT SESSION We will reserve some time each day to break out for working sessions. These sessions will be less formal than a presentation and more focused on developing a solution to some real development issue. If you are interested in getting developers together to hack on some code, submit your proposal and just make it clear it's a breakout session proposal. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. To solve this issue at least a little, there will be a few slots reserved for end users talking about their deployments, problems and achievements. So if you have a KVM based deployment running in production or are about to roll out one, please also submit a talk (see PROCESS), and simply mark it asn an end-user collaboration proposal. We would love to have an open discussion of fields where KVM/Qemu can still improve and you would have the unique chance to steer that process! Keep in mind that most of the Forum will be focused on development though, so we suggest you also come with a good portion of technical interest :-). And of course, no product marketing please! The purpose is to engage with KVM developers. LIGHTNING TALKS In addition to submitted talks we will also have some room for lightning talks. So if you have something you think might be done until the KVM Forum, but you're not sure you could fill 15 minutes with it. Or if you don't know if you'll make it until there, just keep in mind that you will still get the chance to talk about it. Lightning talk submissions and scheduling will be handled on-site at KVM Forum. Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2010 in August! Now, start thinking about that talk you want to give. Thanks, your KVM Forum 2010 Program Commitee Alexander Graf, Novell Anthony Liguori, IBM Avi Kivity, Red Hat Chris Wright, Red Hat Dor Laor, Red Hat Jan Kiszka, Siemens Please contact us with any questions or comments. KVM-Forum-2010-PC(a)redhat.com

1 0

[libvirt] [PATCH] qemu: Fix warning about a non-literal format string
by Matthias Bolte 08 May '10

08 May '10

--- I just pushed this one, as it qualifies as trivial compile fix. src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 92dc22d..bb1079e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7968,7 +7968,7 @@ static int qemudDomainDetachSCSIDiskDevice(struct qemud_driver *driver, } if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { - qemuReportError(VIR_ERR_OPERATION_FAILED, + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Underlying qemu does not support SCSI disk removal")); goto cleanup; } -- 1.7.0.4

1 0

[libvirt] [PATCH] avoid link error in tests using libvirt_util; due to pthread_sigmask
by Jim Meyering 08 May '10

08 May '10

Without this patch, linking the test programs fails like this: /usr/bin/ld: ../src/.libs/libvirt_test.a(libvirt_util_la-util.o): undefined reference to symbol 'pthread_sigmask@@GLIBC_2.2.5' /usr/bin/ld: note: 'pthread_sigmask@@GLIBC_2.2.5' is defined in DSO /lib64/libpthread.so.0 so try adding it to the linker command line /lib64/libpthread.so.0: could not read symbols: Invalid operation collect2: ld returned 1 exit status make[3]: *** [nodeinfotest] Error 1 >From ae53113ddf09846cc01ec0f5e6e65a25991b1bfa Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 7 May 2010 16:23:44 +0200 Subject: [PATCH] avoid link error in tests using libvirt_util; due to pthread_sigmask * src/Makefile.am (libvirt_util_la_LDFLAGS): Add $(LIB_PTHREAD), required, now that we're using gnulib's pthread module. 2010-05-07 Jim Meyering <meyering(a)redhat.com> --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7182da1..937ee84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -378,7 +378,7 @@ libvirt_la_LIBADD = libvirt_util.la libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) -libvirt_util_la_LDFLAGS = $(CAPNG_LIBS) $(YAJL_LIBS) +libvirt_util_la_LDFLAGS = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIB_PTHREAD) noinst_LTLIBRARIES += libvirt_conf.la -- 1.7.1.166.gf2086

3 4

[libvirt] [PATCH] Remove unused nwfilter field from struct remote_error
by Matthew Booth 08 May '10

08 May '10

Change 965466c1 added a new field to struct remote_error, which broke the RPC protocol. Fortunately the new field is unused, so this change simply removes it again. * src/remote/remote_protocol.(c|h|x): Remove remote_nwfilter from struct remote_error --- src/remote/remote_protocol.c | 2 -- src/remote/remote_protocol.h | 1 - src/remote/remote_protocol.x | 1 - 3 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c index 187281d..972bf52 100644 --- a/src/remote/remote_protocol.c +++ b/src/remote/remote_protocol.c @@ -227,8 +227,6 @@ xdr_remote_error (XDR *xdrs, remote_error *objp) return FALSE; if (!xdr_remote_network (xdrs, &objp->net)) return FALSE; - if (!xdr_remote_nwfilter (xdrs, &objp->nwfilter)) - return FALSE; return TRUE; } diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h index 6f01da7..a600af6 100644 --- a/src/remote/remote_protocol.h +++ b/src/remote/remote_protocol.h @@ -143,7 +143,6 @@ struct remote_error { int int1; int int2; remote_network net; - remote_nwfilter nwfilter; }; typedef struct remote_error remote_error; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 8000ee0..1ce488c 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -266,7 +266,6 @@ struct remote_error { int int1; int int2; remote_network net; - remote_nwfilter nwfilter; }; /* Authentication types available thus far.... */ -- 1.6.6.1

3 3

[libvirt] [TCK PATCH] block devices: allow specification of size for safety
by Eric Blake 08 May '10

08 May '10

I was getting failures of domain/103-blockdev-save-restore.t when connecting as qemu:///session, since my uid could stat /dev/sdb but not open it. That test now skips for unprivileged users, as well as adds a layer of sanity checking against expected size to avoid trashing the wrong device. * conf/default.cfg (host_block_devices): Document optional size. * lib/Sys/Virt/TCK.pm (get_host_block_device): If optional size is supplied, skip a device that does not match. Also, avoid devices that can't be opened. --- Go easy on me - I'm not that fluent in perl (yet); if there's a better way to do the sanity check, I'm all ears. conf/default.cfg | 8 ++++++++ lib/Sys/Virt/TCK.pm | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/conf/default.cfg b/conf/default.cfg index 01f438c..12c05b7 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -134,5 +134,13 @@ host_pci_devices = ( # the test suite itself needs to create partitions. # The disks should be at *least* 512 MB in size host_block_devices = ( +# Each block device is either a raw path # /dev/vdb +# or a path plus size in 1k blocks, as in /proc/partitions, to avoid +# trashing the wrong device +# { +# path = /dev/sdb +# size = 989184 +# } +# Can list more than on block device if many are available ) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index 9cdef09..fc325a3 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -33,6 +33,7 @@ use IO::Uncompress::Gunzip qw(gunzip); use IO::Uncompress::Bunzip2 qw(bunzip2); use XML::XPath; use Carp qw(cluck carp); +use Fcntl qw(O_RDONLY SEEK_END); use Test::Builder; use Sub::Uplevel qw(uplevel); @@ -833,7 +834,18 @@ sub get_host_block_device { my $self = shift; my $devindex = @_ ? shift : 0; - return $self->config("host_block_devices/[$devindex]", undef); + my $device = $self->config("host_block_devices/[$devindex]/path", undef); + my $size = $self->config("host_block_devices/[$devindex]/size", 0); + + if (!defined $device) { + $device = $self->config("host_block_devices/[$devindex]", undef); + } + if ($size) { + sysopen(BLK, "$device", O_RDONLY) or return undef; + return undef unless sysseek(BLK, 0, SEEK_END) == $size * 1024; + close(BLK); + } + return $device; } 1; -- 1.6.6.1

5 21

[libvirt] [PATCH] Add support for NIC hotplug using netdev_add in QEMU
by Daniel P. Berrange 08 May '10

08 May '10

QEMU is gaining a new monitor command netdev_add for hotplugging NICs using the netdev backend code. We already support this on the command this, though it is disabled. This adds support for hotplug too, also to remain disabled until 0.13 QEMU is released * src/qemu/qemu_driver.c: Support netdev hotplug for NICs * src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h, src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_json.h, src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h: Add support for netdev_add and netdev_remove commands --- src/qemu/qemu_driver.c | 58 +++++++++++--- src/qemu/qemu_monitor.c | 31 ++++++++ src/qemu/qemu_monitor.h | 6 ++ src/qemu/qemu_monitor_json.c | 175 ++++++++++++++++++++++++++++-------------- src/qemu/qemu_monitor_json.h | 6 ++ src/qemu/qemu_monitor_text.c | 58 ++++++++++++++ src/qemu/qemu_monitor_text.h | 6 ++ 7 files changed, 269 insertions(+), 71 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b8a021d..d5a0c68 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7273,12 +7273,17 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, qemuDomainPCIAddressEnsureAddr(priv->pciaddrs, &net->info) < 0) goto cleanup; - vlan = qemuDomainNetVLAN(net); + if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + vlan = -1; + } else { + vlan = qemuDomainNetVLAN(net); - if (vlan < 0) { - qemuReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Unable to attach network devices without vlan")); - goto cleanup; + if (vlan < 0) { + qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + _("Unable to attach network devices without vlan")); + goto cleanup; + } } if (tapfd != -1) { @@ -7306,9 +7311,17 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorAddHostNetwork(priv->mon, netstr) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto try_tapfd_close; + if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + if (qemuMonitorAddNetdev(priv->mon, netstr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_tapfd_close; + } + } else { + if (qemuMonitorAddHostNetwork(priv->mon, netstr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_tapfd_close; + } } qemuDomainObjExitMonitorWithDriver(driver, vm); @@ -7365,7 +7378,20 @@ cleanup: try_remove: if (vlan < 0) { - VIR_WARN0(_("Unable to remove network backend")); + if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + char *netdev_name; + if (virAsprintf(&netdev_name, "host%s", net->info.alias) < 0) + goto no_memory; + qemuDomainObjEnterMonitorWithDriver(driver, vm); + if (qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) + VIR_WARN(_("Failed to remove network backend for netdev %s"), + netdev_name); + qemuDomainObjExitMonitorWithDriver(driver, vm); + VIR_FREE(netdev_name); + } else { + VIR_WARN0(_("Unable to remove network backend")); + } } else { char *hostnet_name; if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0) @@ -8197,9 +8223,17 @@ qemudDomainDetachNetDevice(struct qemud_driver *driver, } } - if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cleanup; + if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto cleanup; + } + } else { + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto cleanup; + } } qemuDomainObjExitMonitorWithDriver(driver, vm); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5eb05d3..4a8ee9d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1437,6 +1437,37 @@ int qemuMonitorRemoveHostNetwork(qemuMonitorPtr mon, return ret; } + +int qemuMonitorAddNetdev(qemuMonitorPtr mon, + const char *netdevstr) +{ + int ret; + DEBUG("mon=%p, fd=%d netdevstr=%s", + mon, mon->fd, netdevstr); + + if (mon->json) + ret = qemuMonitorJSONAddNetdev(mon, netdevstr); + else + ret = qemuMonitorTextAddNetdev(mon, netdevstr); + return ret; +} + + +int qemuMonitorRemoveNetdev(qemuMonitorPtr mon, + const char *alias) +{ + int ret; + DEBUG("mon=%p, fd=%d alias=%s", + mon, mon->fd, alias); + + if (mon->json) + ret = qemuMonitorJSONRemoveNetdev(mon, alias); + else + ret = qemuMonitorTextRemoveNetdev(mon, alias); + return ret; +} + + int qemuMonitorGetPtyPaths(qemuMonitorPtr mon, virHashTablePtr paths) { diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 4e3c4e8..0eeb563 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -325,6 +325,12 @@ int qemuMonitorRemoveHostNetwork(qemuMonitorPtr mon, int vlan, const char *netname); +int qemuMonitorAddNetdev(qemuMonitorPtr mon, + const char *netdevstr); + +int qemuMonitorRemoveNetdev(qemuMonitorPtr mon, + const char *alias); + int qemuMonitorGetPtyPaths(qemuMonitorPtr mon, virHashTablePtr paths); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8249b99..79daaf3 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -457,6 +457,65 @@ error: } +static void +qemuFreeKeywords(int nkeywords, char **keywords, char **values) +{ + int i; + for (i = 0 ; i < nkeywords ; i++) { + VIR_FREE(keywords[i]); + VIR_FREE(values[i]); + } + VIR_FREE(keywords); + VIR_FREE(values); +} + +static virJSONValuePtr +qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) +{ + virJSONValuePtr ret = NULL; + char **keywords = NULL; + char **values = NULL; + int nkeywords = 0; + int i; + + if (!(ret = virJSONValueNewObject())) + goto no_memory; + + nkeywords = qemuParseKeywords(str, &keywords, &values, 1); + + if (nkeywords < 0) + goto error; + + for (i = 0 ; i < nkeywords ; i++) { + if (values[i] == NULL) { + if (i != 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected empty keyword in %s"), str); + goto error; + } else { + /* This 3rd arg isn't a typo - the way the parser works is + * that the value ended up in the keyword field */ + if (virJSONValueObjectAppendString(ret, firstkeyword, keywords[i]) < 0) + goto no_memory; + } + } else { + if (virJSONValueObjectAppendString(ret, keywords[i], values[i]) < 0) + goto no_memory; + } + } + + qemuFreeKeywords(nkeywords, keywords, values); + return ret; + +no_memory: + virReportOOMError(); +error: + qemuFreeKeywords(nkeywords, keywords, values); + virJSONValueFree(ret); + return NULL; +} + + static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) { qemuMonitorEmitShutdown(mon); @@ -1830,6 +1889,63 @@ int qemuMonitorJSONRemoveHostNetwork(qemuMonitorPtr mon, } +int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon, + const char *netdevstr) +{ + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + virJSONValuePtr args = NULL; + + cmd = qemuMonitorJSONMakeCommand("netdev_add", NULL); + if (!cmd) + return -1; + + args = qemuMonitorJSONKeywordStringToJSON(netdevstr, "type"); + if (!args) + goto cleanup; + + if (virJSONValueObjectAppend(cmd, "arguments", args) < 0) { + virReportOOMError(); + goto cleanup; + } + args = NULL; /* obj owns reference to args now */ + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + +cleanup: + virJSONValueFree(args); + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + + +int qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon, + const char *alias) +{ + int ret; + virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("netdev_del", + "s:id", alias, + NULL); + virJSONValuePtr reply = NULL; + if (!cmd) + return -1; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + + /* * Example return data * @@ -2040,65 +2156,6 @@ int qemuMonitorJSONDelDevice(qemuMonitorPtr mon, } -static void -qemuFreeKeywords(int nkeywords, char **keywords, char **values) -{ - int i; - for (i = 0 ; i < nkeywords ; i++) { - VIR_FREE(keywords[i]); - VIR_FREE(values[i]); - } - VIR_FREE(keywords); - VIR_FREE(values); -} - -static virJSONValuePtr -qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) -{ - virJSONValuePtr ret = NULL; - char **keywords = NULL; - char **values = NULL; - int nkeywords = 0; - int i; - - if (!(ret = virJSONValueNewObject())) - goto no_memory; - - nkeywords = qemuParseKeywords(str, &keywords, &values, 1); - - if (nkeywords < 0) - goto error; - - for (i = 0 ; i < nkeywords ; i++) { - if (values[i] == NULL) { - if (i != 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected empty keyword in %s"), str); - goto error; - } else { - /* This 3rd arg isn't a typo - the way the parser works is - * that the value ended up in the keyword field */ - if (virJSONValueObjectAppendString(ret, firstkeyword, keywords[i]) < 0) - goto no_memory; - } - } else { - if (virJSONValueObjectAppendString(ret, keywords[i], values[i]) < 0) - goto no_memory; - } - } - - qemuFreeKeywords(nkeywords, keywords, values); - return ret; - -no_memory: - virReportOOMError(); -error: - qemuFreeKeywords(nkeywords, keywords, values); - virJSONValueFree(ret); - return NULL; -} - - int qemuMonitorJSONAddDevice(qemuMonitorPtr mon, const char *devicestr) { diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 5cfbe6c..4dcb3e0 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -159,6 +159,12 @@ int qemuMonitorJSONRemoveHostNetwork(qemuMonitorPtr mon, int vlan, const char *netname); +int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon, + const char *netdevstr); + +int qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon, + const char *alias); + int qemuMonitorJSONGetPtyPaths(qemuMonitorPtr mon, virHashTablePtr paths); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 3f917bf..faa144d 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1813,6 +1813,64 @@ cleanup: } +int qemuMonitorTextAddNetdev(qemuMonitorPtr mon, + const char *netdevstr) +{ + char *cmd; + char *reply = NULL; + int ret = -1; + + if (virAsprintf(&cmd, "netdev_add %s", netdevstr) < 0) { + virReportOOMError(); + return -1; + } + + if (qemuMonitorCommand(mon, cmd, &reply) < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("failed to add netdev with '%s'"), cmd); + goto cleanup; + } + + /* XXX error messages here ? */ + + ret = 0; + +cleanup: + VIR_FREE(cmd); + VIR_FREE(reply); + return ret; +} + + +int qemuMonitorTextRemoveNetdev(qemuMonitorPtr mon, + const char *alias) +{ + char *cmd; + char *reply = NULL; + int ret = -1; + + if (virAsprintf(&cmd, "netdev_del %s", alias) < 0) { + virReportOOMError(); + return -1; + } + + if (qemuMonitorCommand(mon, cmd, &reply) < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("failed to remove netdev in qemu with '%s'"), cmd); + goto cleanup; + } + + /* XXX error messages here ? */ + + ret = 0; + +cleanup: + VIR_FREE(cmd); + VIR_FREE(reply); + return ret; +} + + /* Parse the output of "info chardev" and return a hash of pty paths. * * Output is: diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 23c3a45..25be828 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -154,6 +154,12 @@ int qemuMonitorTextRemoveHostNetwork(qemuMonitorPtr mon, int vlan, const char *netname); +int qemuMonitorTextAddNetdev(qemuMonitorPtr mon, + const char *netdevstr); + +int qemuMonitorTextRemoveNetdev(qemuMonitorPtr mon, + const char *alias); + int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, virHashTablePtr paths); -- 1.6.6.1

2 1

[libvirt] [PATCH] Add env variable for debugging gnutls usage
by Daniel P. Berrange 07 May '10

07 May '10

Allow debugging of GNUTLS interactions by setting LIBVIRT_GNUTLS_DEBUG=10 LIBVIRT_DEBUG=1 virsh * src/remote/remote_driver.c: Use LIBVIRT_GNUTLS_DEBUG to enable gnutls debugging --- src/remote/remote_driver.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 72cf292..9e90e5c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1138,16 +1138,29 @@ check_cert_file(const char *type, const char *file) } +static void remote_debug_gnutls_log(int level, const char* str) { + DEBUG("%d %s", level, str); +} + static int initialize_gnutls(void) { static int initialized = 0; int err; + char *gnudebug; if (initialized) return 0; gnutls_global_init (); + if ((gnudebug = getenv("LIBVIRT_GNUTLS_DEBUG")) != NULL) { + int val; + if (virStrToLong_i(gnudebug, NULL, 10, &val) < 0) + val = 10; + gnutls_global_set_log_level(val); + gnutls_global_set_log_function(remote_debug_gnutls_log); + } + /* X509 stuff */ err = gnutls_certificate_allocate_credentials (&x509_cred); if (err) { -- 1.6.6.1

2 1

[libvirt] [PATCH] cygwin: fix abort of virsh on my system
by Stefan Berger 07 May '10

07 May '10

This strange patch fixes aborts of virsh on my system. It seems that the string returned by xmlSaveUri is owned by the xml library?? Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 317125f..a916b86 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -542,6 +542,9 @@ doRemoteOpen (virConnectPtr conn, } name = (char *) xmlSaveUri (&tmpuri); +#ifdef __CYGWIN__ + name = strdup(name); +#endif #ifdef HAVE_XMLURI_QUERY_RAW VIR_FREE(tmpuri.query_raw);

3 3

[libvirt] [PATCH] Fix SCSI disk unplugging
by Wolfgang Mauerer 07 May '10

07 May '10

Detaching disk devices is not only possible for VIR_DOMAIN_DISK_BUS_VIRTIO, but also for VIR_DOMAIN_DISK_BUS_SCSI, so take care of this possibility. Additionally, when the new-style device syntax is used, we do not need to check if the PCI address is valid since we don't need it to do the hot-unplugging. And while we're at it, drop the "pci" part in qemudDomainDetachPciDiskDevice() -- it's misleading since we do not necessarily have to deal with PCI addresses. Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer(a)siemens.com> --- src/qemu/qemu_driver.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 704f824..f2b8517 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7862,10 +7862,10 @@ cleanup: } -static int qemudDomainDetachPciDiskDevice(struct qemud_driver *driver, - virDomainObjPtr vm, - virDomainDeviceDefPtr dev, - unsigned long long qemuCmdFlags) +static int qemudDomainDetachDiskDevice(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainDeviceDefPtr dev, + unsigned long long qemuCmdFlags) { int i, ret = -1; virDomainDiskDefPtr detach = NULL; @@ -7884,7 +7884,8 @@ static int qemudDomainDetachPciDiskDevice(struct qemud_driver *driver, goto cleanup; } - if (!virDomainDeviceAddressIsValid(&detach->info, + if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) && + !virDomainDeviceAddressIsValid(&detach->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("device cannot be detached without a PCI address")); @@ -8373,8 +8374,9 @@ static int qemudDomainDetachDevice(virDomainPtr dom, if (dev->type == VIR_DOMAIN_DEVICE_DISK && dev->data.disk->device == VIR_DOMAIN_DISK_DEVICE_DISK && - dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { - ret = qemudDomainDetachPciDiskDevice(driver, vm, dev, qemuCmdFlags); + (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO || + dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { + ret = qemudDomainDetachDiskDevice(driver, vm, dev, qemuCmdFlags); } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { ret = qemudDomainDetachNetDevice(driver, vm, dev, qemuCmdFlags); } else if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER) { -- 1.6.4

3 7

[libvirt] [PATCHv2 0/5] build: update gnulib
by Eric Blake 07 May '10

07 May '10

This replaces the first cut at this series: https://www.redhat.com/archives/libvir-list/2010-April/msg01341.html Changes since v1: squash the original 1/5 and 2/5 into one patch test every stage of the series on a cross-compile to mingw add new 5/5, and adjust to recent syntax checks available in today's gnulib [PATCHv2 1/5] build: rely on gnulib's pthread module [PATCHv2 2/5] build: use gnulib's uname [PATCHv2 3/5] build: use gnulib's sys/wait.h [PATCHv2 4/5] build: drop more redundant configure checks [PATCHv2 5/5] build: update gnulib Because of the new patch, I'll wait for a re-ACK before pushing; but 1 through 4 are pretty much unchanged from their original ACK. .gnulib | 2 +- .x-sc_prohibit_always_true_header_tests | 4 ++++ bootstrap.conf | 3 +++ configure.ac | 22 ++++------------------ src/libvirt.c | 4 +--- src/network/bridge_driver.c | 1 - src/nodeinfo.c | 12 ++---------- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 1 - src/qemu/qemu_driver.c | 1 - src/remote/remote_driver.c | 5 +---- src/storage/storage_backend.c | 4 +--- src/uml/uml_driver.c | 1 - src/util/ebtables.c | 7 ++----- src/util/hooks.c | 4 +--- src/util/iptables.c | 7 ++----- src/util/processinfo.c | 6 ++---- src/util/util.c | 4 +--- 19 files changed, 27 insertions(+), 65 deletions(-)

2 10

Re: [libvirt] [PATCH] cygwin: fix abort of virsh on my system
by Stefan Berger 07 May '10

07 May '10

Stefan Berger/Watson/IBM wrote on 05/06/2010 02:55:31 PM: > Chris Lalancette <clalance(a)redhat.com> wrote on 05/06/2010 02:28:18 PM: > > > > On 05/06/2010 02:11 PM, Stefan Berger wrote: > > > This strange patch fixes aborts of virsh on my system. It seems that the > > > string returned by xmlSaveUri is owned by the xml library?? > > > [...] > > > > > So something else might be going on. What version of libxml2 > > are you currently building against? > > Cygwin picks up what I have installed in /cydrive/c/GTK/ and there I > have version 2.6.32. > > xmlversion.h:#define LIBXML_DOTTED_VERSION "2.6.32" > > The abort occurs upon the VIR_FREE(name). That was also the problem. Since the includes weren't missing I didn't have cygwin's libvirt-devel package installed and so it took the wrong includes... Stefan

1 0

[libvirt] [PATCH] cgroup: Enable memory.use_hierarchy of cgroup for domain
by Ryota Ozaki 07 May '10

07 May '10

Through conversation with Kumar L Srikanth-B22348, I found that the function of getting memory usage (e.g., virsh dominfo) doesn't work for lxc with ns subsystem of cgroup enabled. This is because of features of ns and memory subsystems. Ns creates child cgroup on every process fork and as a result processes in a container are not assigned in a cgroup for domain (e.g., libvirt/lxc/test1/). For example, libvirt_lxc and init (or somewhat specified in XML) are assigned into libvirt/lxc/test1/8839/ and libvirt/lxc/test1/8839/8849/, respectively. On the other hand, memory subsystem accounts memory usage within a group of processes by default, i.e., it does not take any child (and descendent) groups into account. With the two features, virsh dominfo which just checks memory usage of a cgroup for domain always returns zero because the cgroup has no process. Setting memory.use_hierarchy of a group allows to account (and limit) memory usage of every descendent groups of the group. By setting it of a cgroup for domain, we can get proper memory usage of lxc with ns subsystem enabled. (To be exact, the setting is required only when memory and ns subsystems are enabled at the same time, e.g., mount -t cgroup none /cgroup.) --- src/util/cgroup.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 4 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index b8b2eb5..f7d6b41 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -443,7 +443,38 @@ static int virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group) return rc; } -static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, int create) +static int virCgroupSetMemoryUseHierarchy(virCgroupPtr group) +{ + int rc = 0; + unsigned long long value; + const char *filename = "memory.use_hierarchy"; + + rc = virCgroupGetValueU64(group, + VIR_CGROUP_CONTROLLER_MEMORY, + filename, &value); + if (rc != 0) { + VIR_ERROR("Failed to read %s/%s (%d)", group->path, filename, rc); + return rc; + } + + /* Setting twice causes error, so if already enabled, skip setting */ + if (value == 1) + return 0; + + VIR_DEBUG("Setting up %s/%s", group->path, filename); + rc = virCgroupSetValueU64(group, + VIR_CGROUP_CONTROLLER_MEMORY, + filename, 1); + + if (rc != 0) { + VIR_ERROR("Failed to set %s/%s (%d)", group->path, filename, rc); + } + + return rc; +} + +static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, + int create, int memory_hierarchy) { int i; int rc = 0; @@ -477,6 +508,20 @@ static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, int creat break; } } + /* + * Note that virCgroupSetMemoryUseHierarchy should always be + * called prior to creating subcgroups and attaching tasks. + */ + if (memory_hierarchy && + group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint != NULL && + (i == VIR_CGROUP_CONTROLLER_MEMORY || + STREQ(group->controllers[i].mountPoint, group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) { + rc = virCgroupSetMemoryUseHierarchy(group); + if (rc != 0) { + VIR_FREE(path); + break; + } + } } VIR_FREE(path); @@ -553,7 +598,7 @@ static int virCgroupAppRoot(int privileged, if (rc != 0) goto cleanup; - rc = virCgroupMakeGroup(rootgrp, *group, create); + rc = virCgroupMakeGroup(rootgrp, *group, create, 0); cleanup: virCgroupFree(&rootgrp); @@ -653,7 +698,7 @@ int virCgroupForDriver(const char *name, VIR_FREE(path); if (rc == 0) { - rc = virCgroupMakeGroup(rootgrp, *group, create); + rc = virCgroupMakeGroup(rootgrp, *group, create, 0); if (rc != 0) virCgroupFree(group); } @@ -703,7 +748,17 @@ int virCgroupForDomain(virCgroupPtr driver, VIR_FREE(path); if (rc == 0) { - rc = virCgroupMakeGroup(driver, *group, create); + /* + * Create a cgroup with memory.use_hierarchy enabled to + * surely account memory usage of lxc with ns subsystem + * enabled. (To be exact, memory and ns subsystems are + * enabled at the same time.) + * + * The reason why doing it here, not a upper group, say + * a group for driver, is to avoid overhead to track + * cumulative usage that we don't need. + */ + rc = virCgroupMakeGroup(driver, *group, create, 1); if (rc != 0) virCgroupFree(group); } -- 1.6.5.2

1 0

[libvirt] [PATCH] cgroup: Enable memory.use_hierarchy of cgroup for domain
by Ryota Ozaki 07 May '10

07 May '10

Through conversation with Kumar L Srikanth-B22348, I found that the function of getting memory usage (e.g., virsh dominfo) doesn't work for lxc with ns subsystem of cgroup enabled. This is because of features of ns and memory subsystems. Ns creates child cgroup on every process fork and as a result processes in a container are not assigned in a cgroup for domain (e.g., libvirt/lxc/test1/). For example, libvirt_lxc and init (or somewhat specified in XML) are assigned into libvirt/lxc/test1/8839/ and libvirt/lxc/test1/8839/8849/, respectively. On the other hand, memory subsystem accounts memory usage within a group of processes by default, i.e., it does not take any child (and descendent) groups into account. With the two features, virsh dominfo which just checks memory usage of a cgroup for domain always returns zero because the cgroup has no process. Setting memory.use_hierarchy of a group allows to account (and limit) memory usage of every descendent groups of the group. By setting it of a cgroup for domain, we can get proper memory usage of lxc with ns subsystem enabled. (To be exact, the setting is required only when memory and ns subsystems are enabled at the same time, e.g., mount -t cgroup none /cgroup.) --- src/util/cgroup.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index b8b2eb5..93cd6a9 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -443,7 +443,38 @@ static int virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group) return rc; } -static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, int create) +static int virCgroupSetMemoryUseHierarchy(virCgroupPtr group) +{ + int rc = 0; + unsigned long long value; + const char *filename = "memory.use_hierarchy"; + + rc = virCgroupGetValueU64(group, + VIR_CGROUP_CONTROLLER_MEMORY, + filename, &value); + if (rc != 0) { + VIR_ERROR("Failed to read %s/%s (%d)", group->path, filename, rc); + return rc; + } + + /* Setting twice causes error, so if already enabled, skip setting */ + if (value == 1) + return 0; + + VIR_DEBUG("Setting up %s/%s", group->path, filename); + rc = virCgroupSetValueU64(group, + VIR_CGROUP_CONTROLLER_MEMORY, + filename, 1); + + if (rc != 0) { + VIR_ERROR("Failed to set %s/%s (%d)", group->path, filename, rc); + } + + return rc; +} + +static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, + int create, int memory_hierarchy) { int i; int rc = 0; @@ -477,6 +508,16 @@ static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, int creat break; } } + if (memory_hierarchy && + group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint != NULL && + (i == VIR_CGROUP_CONTROLLER_MEMORY || + STREQ(group->controllers[i].mountPoint, group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) { + rc = virCgroupSetMemoryUseHierarchy(group); + if (rc != 0) { + VIR_FREE(path); + break; + } + } } VIR_FREE(path); @@ -553,7 +594,7 @@ static int virCgroupAppRoot(int privileged, if (rc != 0) goto cleanup; - rc = virCgroupMakeGroup(rootgrp, *group, create); + rc = virCgroupMakeGroup(rootgrp, *group, create, 0); cleanup: virCgroupFree(&rootgrp); @@ -653,7 +694,7 @@ int virCgroupForDriver(const char *name, VIR_FREE(path); if (rc == 0) { - rc = virCgroupMakeGroup(rootgrp, *group, create); + rc = virCgroupMakeGroup(rootgrp, *group, create, 0); if (rc != 0) virCgroupFree(group); } @@ -703,7 +744,7 @@ int virCgroupForDomain(virCgroupPtr driver, VIR_FREE(path); if (rc == 0) { - rc = virCgroupMakeGroup(driver, *group, create); + rc = virCgroupMakeGroup(driver, *group, create, 1); if (rc != 0) virCgroupFree(group); } -- 1.6.5.2

3 3

[libvirt] [PATCH] util: fix va_start usage bug
by Eric Blake 07 May '10

07 May '10

Detected by clang. POSIX requires that the second argument to va_start be the name of the last variable; and in some implementations, passing *path instead of path would dereference bogus memory instead of pulling arguments off the stack. * src/util/util.c (virBuildPathInternal): Use correct argument to va_start. --- I think this falls under the trivial rule, as it silences a compiler warning and is a one-line fix of a real bug, so I pushed it. src/util/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 2d32952..c44d012 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2799,7 +2799,7 @@ int virBuildPathInternal(char **path, ...) va_list ap; int ret = 0; - va_start(ap, *path); + va_start(ap, path); path_component = va_arg(ap, char *); virBufferAdd(&buf, path_component, -1); -- 1.6.6.1

2 1

[libvirt] Libvirtd in listen mode.
by Kumar L Srikanth-B22348 06 May '10

06 May '10

Hi, If I start the libvirtd service using the command "service libvirtd start", it is not starting in listen mode. I am stopping the libvirtd service, and then starting in listen mode externally, using the following command: "libvirtd -listen". But, how can I start libvirtd service in listen mode by default (when I issue the command "service libvirtd start")? Regards, Srikanth.

2 1

[libvirt] [PATCH] build: silence a clang false positive
by Eric Blake 06 May '10

06 May '10

* src/qemu/qemu_monitor.c (qemuMonitorIOWriteWithFD): Work around recent clang shortcoming in analysis. --- False positive encountered with the latest F-13 clang :( src/qemu/qemu_monitor.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 443d216..abf1338 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1,7 +1,7 @@ /* * qemu_monitor.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -374,6 +374,9 @@ qemuMonitorIOWriteWithFD(qemuMonitorPtr mon, msg.msg_controllen = sizeof(control); cmsg = CMSG_FIRSTHDR(&msg); + /* Some static analyzers, like clang 2.6-0.6.pre2, fail to see + that our use of CMSG_FIRSTHDR will not return NULL. */ + sa_assert(cmsg); cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; -- 1.6.6.1

2 2

[libvirt] [PATCH] cgroup: Change virCgroupRemove to remove all child groups at first
by Ryota Ozaki 06 May '10

06 May '10

As same as normal directories, a cgroup cannot be removed if it contains sub groups. This patch changes virCgroupRemove to remove all child groups (subdirectories) of a target group before removing the target group. The handling is required when we run lxc with ns subsystem of cgroup. Ns subsystem automatically creates child cgroups on every process forks, but unfortunately the groups are not removed on process exits, so we have to remove them by ourselves. With this patch, such child groups are surely removed at lxc shutdown, i.e., lxcVmCleanup which calls virCgroupRemove. --- src/util/cgroup.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index b8b2eb5..531c131 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -23,6 +23,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <libgen.h> +#include <dirent.h> #include "internal.h" #include "util.h" @@ -561,11 +562,52 @@ cleanup: } #endif +static int virCgroupRemoveRecursively(char *grppath) +{ + DIR *grpdir; + struct dirent *ent; + int rc = 0; + + grpdir = opendir(grppath); + if (grpdir == NULL) { + VIR_ERROR("Unable to open %s (%d)", grppath, errno); + rc = -errno; + return rc; + } + + while ((ent = readdir(grpdir)) != NULL) { + char path[PATH_MAX]; + int ret; + + if (ent->d_name[0] == '.') continue; + if (ent->d_type != DT_DIR) continue; + + ret = snprintf(path, sizeof(path), "%s/%s", grppath, ent->d_name); + if (ret < 0) + break; + rc = virCgroupRemoveRecursively(path); + if (rc != 0) + break; + } + DEBUG("Removing cgroup %s", grppath); + if (rmdir(grppath) != 0 && errno != ENOENT) { + rc = -errno; + VIR_ERROR("Unable to remove %s (%d)", grppath, errno); + } + + return rc; +} + /** * virCgroupRemove: * * @group: The group to be removed * + * It first removes all child groups recursively + * in depth first order and then removes @group + * because the presence of the child groups + * prevents removing @group. + * * Returns: 0 on success */ int virCgroupRemove(virCgroupPtr group) @@ -585,10 +627,8 @@ int virCgroupRemove(virCgroupPtr group) &grppath) != 0) continue; - DEBUG("Removing cgroup %s", grppath); - if (rmdir(grppath) != 0 && errno != ENOENT) { - rc = -errno; - } + DEBUG("Removing cgroup %s and all child cgroups", grppath); + rc = virCgroupRemoveRecursively(grppath); VIR_FREE(grppath); } -- 1.6.5.2

1 0

[libvirt] [PATCH v2] rpmbuild: add ebtables & ip(6)tables dependency for rpm
by Stefan Berger 06 May '10

06 May '10

Add ebtables,iptables & iptables-ipv6 dependency to rpm. Changes from V1 to V2: -passing --without-libpcap to configure script, if libpcap is not to be used Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- libvirt.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) Index: libvirt-acl/libvirt.spec.in =================================================================== --- libvirt-acl.orig/libvirt.spec.in +++ libvirt-acl/libvirt.spec.in @@ -61,6 +61,7 @@ %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} %define with_yajl 0%{!?_without_yajl:0} +%define with_nwfilter 0%{!?_without_nwfilter:0} %define with_libpcap 0%{!?_without_libpcap:0} # Non-server/HV driver defaults which are always enabled @@ -150,6 +151,7 @@ # Enable libpcap library %if %{with_qemu} +%define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} %define with_libpcap 0%{!?_without_libpcap:%{server_drivers}} %endif @@ -195,6 +197,11 @@ Requires: bridge-utils Requires: dnsmasq Requires: iptables %endif +%if %{with_nwfilter} +Requires: ebtables +Requires: iptables +Requires: iptables-ipv6 +%endif # needed for device enumeration %if %{with_hal} Requires: hal @@ -517,6 +524,10 @@ of recent versions of Linux (and other O %define _without_yajl --without-yajl %endif +%if ! %{with_libpcap} +%define _without_libpcap --without-libpcap +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -545,6 +556,7 @@ of recent versions of Linux (and other O %{?_without_hal} \ %{?_without_udev} \ %{?_without_yajl} \ + %{?_without_libpcap} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \

2 2

[libvirt] [PATCH] rpmbuild: add ebtables & ip(6)tables dependency for rpm
by Stefan Berger 06 May '10

06 May '10

Add ebtables,iptables & iptables-ipv6 dependency to rpm. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- libvirt.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) Index: libvirt-acl/libvirt.spec.in =================================================================== --- libvirt-acl.orig/libvirt.spec.in +++ libvirt-acl/libvirt.spec.in @@ -61,6 +61,7 @@ %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} %define with_yajl 0%{!?_without_yajl:0} +%define with_nwfilter 0%{!?_without_nwfilter:0} %define with_libpcap 0%{!?_without_libpcap:0} # Non-server/HV driver defaults which are always enabled @@ -150,6 +151,7 @@ # Enable libpcap library %if %{with_qemu} +%define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} %define with_libpcap 0%{!?_without_libpcap:%{server_drivers}} %endif @@ -195,6 +197,11 @@ Requires: bridge-utils Requires: dnsmasq Requires: iptables %endif +%if %{with_nwfilter} +Requires: ebtables +Requires: iptables +Requires: iptables-ipv6 +%endif # needed for device enumeration %if %{with_hal} Requires: hal

3 3

[libvirt] libvirt with qemu-kvm, not recognizing NIC model
by Jonathan Hoover 06 May '10

06 May '10

Is this the right list for this question, or should I be elsewhere? I am trying to specify a network card "model type" of "pcnet" (to emulate vmware esxi's network card). No matter what I put for model type in my xml config file, it comes up as an Intel e1000. I ran "qemu-kvm -net nic,model=? /dev/null" and I got back a list of supported models including pcnet,e1000,virtio, and others as expected. No matter which I put in my xml file for /etc/libvirt/qemu/Symantec-bg.xml (a Symantec Brightmail Gateway virtual machine), I just get back that its an Intel card on boot (which doesn't work with Symantec BG). I am running Fedora 12, kernel is 2.6.31.6-166.fc12.x86_64. The version of libvirt is 0.7.1. I am running it on an Intel Core 2 Quad CPU Q8400 @ 2.66 GHz. I have the same problem under Fedora 13 Beta. Thoughts? Jonathan Hoover

2 2

[libvirt] Alternative to XML Creation and Parsing?
by Ganesh Pagade 05 May '10

05 May '10

Hello, We plan to develop a fancy GUI which would help creating and managing VMs/Domains for RHEL 5.4 KVM. However looking at the schemas provided in docs/schemas/ (Ex: domain.rng) generating the XML file from the inputs taken from the GUI and pass it on to virDomainDefineXML() turns out to be a huge tasks in itself. I was wondering if there is an better way for me to provide my configurations to the library and also to read data from it (instead of creating, parsing XMLs)? If an alternate approach exist, are there any limitations with it? Also the schema given in docs/schemas/ would be generic for all hyper visor. How can I identify the tags applicable only for a particular hyper visor? I found: virConnectDomainXMLFromNative(virConnectPtr conn, const char * nativeFormat, const char * nativeConfig, unsigned int flags) in API reference, which could solve my first problem but couldn't figure out what nativeFormat would be. Any inputs/pointers would be highly appreciated. Regards, Ganesh

2 2

[libvirt] Fwd: Re: need your help about virito vmchannel
by Matthew Booth 05 May '10

05 May '10

FYI for the list. I haven't looked at this yet. Matt -------- Original Message -------- Subject: Re: need your help about virito vmchannel Date: Tue, 4 May 2010 18:00:02 +0530 From: Amit Shah <amit.shah(a)redhat.com> To: Matthew Booth <mbooth(a)redhat.com> CC: Jianlin Liu <jialiu(a)redhat.com> On (Tue) May 04 2010 [13:18:30], Matthew Booth wrote: > On 04/05/10 12:48, Jianlin Liu wrote: > > Hi Matthew, > > > > I want to create a virtio vm channel in my guest. So I add the followiong to my guest xml file: > > <channel type='pty'> > > <target type='virtio' name='org.linux-kvm.port.0'/> > > </channel> > > Jianlin, > > While I wrote the libvirt->vmchannel glue, I'm not actually that > familiar with vmchannel itself. I've cc'd Amit, who hopefully might > recognise this problem and tell me how to fix it ;) > > Amit, > > Any idea what's going on here? Yes: > > Then I try to start the guest: > > # virsh start winxp > > error: Failed to start domain winxp > > error: internal error Process exited while reading console log output: char device redirected to /dev/pts/4 > > char device redirected to /dev/pts/5 > > qemu-kvm: -device virtio-serial-pci,id=virtio-serial0,max_ports=0,vectors=0,bus=pci.0,addr=0x5: Device 'virtio-serial-pci' could not be initialized With max_ports=0, the virtio-serial device doesn't get created and hence this error. Amit

3 3

[libvirt] [PATCH] configure.ac: Avoid uname, which breaks cross-compilation
by Matthias Bolte 05 May '10

05 May '10

When cross-compiling on Linux, configure will misdetect the target as Linux because it uses uname instead of relying on the $host variable. This results in including libvirt_linux.syms into libvirt.syms and therefore trying to export undefined symbols. Replace uname checks with $host checks to fix this. --- configure.ac | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6ee5b90..5d68dcc 100644 --- a/configure.ac +++ b/configure.ac @@ -210,8 +210,11 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then fi dnl lxc and qemu drivers require linux headers -if test `uname -s` != "Linux" -then +case "$host" in + *-*-linux*) + # match linux here so the *) case will match anything non-linux + ;; + *) if test "x$with_lxc" != "xyes" then with_lxc=no @@ -220,7 +223,8 @@ then then with_qemu=no fi -fi + ;; +esac dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], @@ -1983,7 +1987,13 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) -AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"]) +with_linux=no +case "$host" in + *-*-linux*) + with_linux=yes + ;; +esac +AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AC_ARG_WITH([qemu-user], -- 1.7.0.4

3 3

[libvirt] [PATCH] Don't wipe generated iface target in active domains
by jdenemar＠redhat.com 05 May '10

05 May '10

From: Jiri Denemark <jdenemar(a)redhat.com> Wipe generated interface target only when reading configuration of inactive domains. --- src/conf/domain_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 546ddf2..3e45f79 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1889,7 +1889,8 @@ virDomainNetDefParseXML(virCapsPtr caps, xmlStrEqual(cur->name, BAD_CAST "target")) { ifname = virXMLPropString(cur, "dev"); if ((ifname != NULL) && - ((STRPREFIX((const char*)ifname, "vnet")) || + (((flags & VIR_DOMAIN_XML_INACTIVE) && + (STRPREFIX((const char*)ifname, "vnet"))) || (!isValidIfname(ifname)))) { /* An auto-generated target name, blank it out */ /* blank out invalid interface names */ -- 1.7.1

3 2

[libvirt] [PATCH] Various fixes for the spec file
by Daniel Veillard 05 May '10

05 May '10

This includes various things: - fix the Requires: libvirt-client to use %{name} to allow easy renaming - when building ESX support one need libcurl-devel - remove Makefile[.in] from xml/nwfilter in the docs, as this breaks parallel install ation of i686 and x86_64 packages - don't include nwfilter config files if not building with the daemon all relatively trivial which is why I packed them together, Daniel diff --git a/libvirt.spec.in b/libvirt.spec.in index 47e3050..9045c9a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -184,7 +184,7 @@ URL: http://libvirt.org/ BuildRequires: python-devel # The client side, i.e. shared libs and virsh are in a subpackage -Requires: libvirt-client = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} # Used by many of the drivers, so turn it on whenever the # daemon is present @@ -347,6 +347,9 @@ BuildRequires: libssh2-devel %if %{with_netcf} BuildRequires: netcf-devel >= 0.1.4 %endif +%if %{with_esx} +BuildRequires: libcurl-devel +%endif # Fedora build root suckage BuildRequires: gawk @@ -378,7 +381,7 @@ virtualization capabilities of recent versions of Linux (and other OSes). %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries -Requires: libvirt-client = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel @@ -392,7 +395,7 @@ the virtualization capabilities of recent versions of Linux (and other OSes). %package python Summary: Python bindings for the libvirt library Group: Development/Libraries -Requires: libvirt-client = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} %description python The libvirt-python package contains a module that permits applications @@ -556,7 +559,7 @@ gzip -9 ChangeLog rm -fr %{buildroot} %makeinstall -for i in domain-events/events-c dominfo domsuspend hellolibvirt python +for i in domain-events/events-c dominfo domsuspend hellolibvirt python xml/nwfilter do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done @@ -600,6 +603,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} %endif +%if ! %{with_libvirtd} +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter +%endif + %if ! %{with_qemu} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] why we should use a mechanical indentation checker
by Jim Meyering 04 May '10

04 May '10

I introduced a bug with this supposedly-safe, no-semantic-change delta: http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=b6719eab9e95c5daeeea85 See if you can spot it. Here is the loop in question, as it was prior to my erroneous change: for (i = 0; i < nruleInstances; i++) switch (inst[i]->ruleType) { case RT_EBTABLES: ebiptablesInstCommand(&buf, inst[i]->commandTemplate, 'A', -1, 1); break; case RT_IPTABLES: haveIptables = true; break; case RT_IP6TABLES: haveIp6tables = true; break; } Its formatting is WRONG. Sure, it is technically correct to omit the curly braces when the for-loop body is a single *statement*, as it is above. However, the moment the construct in the body occupies more than one line, it is very risky to omit the curly braces. I demonstrated that yesterday by inserting a no-op sa_assert statement as the "first" line of that loop body, not noticing that unlike my other two additions, this one pushed the single-stmt body *out of the loop*. Nasty. For example, do not omit the curly braces even when the body is just a single-line statement but with a preceding comment. while (true) /* explanation... */ BAD! single_line_stmt (); while (true) { /* Always put braces around a multi-line body. */ /* explanation... */ single_line_stmt (); } Of course do not do this, either: if (expr) while (other_expr) { BAD! ... } Do this, instead: if (expr) { while (other_expr) { ... } } I am adding something like the following to coreutils' HACKING, and will add the equivalent (adjusting indentation/brace-positioning style in the examples) to libvirt's hacking.html.in, so if you object, speak up soon. While writing the above and below, I noticed that with the GNU formatting style, this is less of a problem, since there you do not add those oh-so-important-to-semantics curly braces at the *end* of a line where it easy to miss them, but at the beginning. In addition, with the GNU style, adding the opening curly brace changes the indentation level of the body, while in libvirt's style, it does not. In either case, an automatic indentation checker would catch the problem. This is yet another reason to enforce an indentation style. The longer we wait, the harder it will become. Note: these diffs are relative to coreutils' HACKING file, not libvirt's: diff --git a/HACKING b/HACKING index 124c666..4a6d593 100644 --- a/HACKING +++ b/HACKING @@ -233,6 +233,110 @@ Try to make the summary line fit one of the following forms: maint: change-description +Curly braces: use judiciously +============================= +Omit the curly braces around an "if", "while", "for" etc. body only when +that body occupies a single line. In every other case we require the braces. +This ensures that it is trivially easy to identify a single-*statement* loop: +each has only one *line* in its body. + +For example, do not omit the curly braces even when the body is just a +single-line statement but with a preceding comment. + +Omitting braces with a single-line body is fine: + + while (expr) + single_line_stmt (); + +However, the moment your loop body extends onto a second line, for +whatever reason (even if it's just an added comment), then you should +add braces. Otherwise, it would be too easy to insert a statement just +before that comment (without adding braces), thinking it is already a +multi-statement loop: + + while (true) + /* comment... */ // BAD: multi-line body without braces + single_line_stmt (); + +Do this instead: + + while (true) + { /* Always put braces around a multi-line body. */ + /* explanation... */ + single_line_stmt (); + } + +There is one exception: when the second body line is not +at the same indentation level as the first body line. + + if (expr) + error (0, 0, _("a diagnostic that would make this line" + " extend past the 80-column limit")); + +It seems safe not to require curly braces in this case, +since the further-indented second body line makes it obvious +that this is still a single-statement body. + +To reiterate, don't do this: + + if (expr) + while (expr_2) // BAD: multi-line body without braces + { + ... + } + +Do this, instead: + + if (expr) + { + while (expr_2) + { + ... + } + } + +However, there is one exception in the other direction, when +even a one-line block should have braces. +That occurs when that one-line, brace-less block +is an "else" block, and the corresponding "then" block *does* use braces. +In that case, either put braces around the "else" block, or negate the +"if"-condition and swap the bodies, putting the one-line block first +and making the longer, multi-line block be the "else" block. + + if (expr) + { + ... + ... + } + else + x = y; // BAD: braceless "else" with braced "then" + +This is preferred, especially when the multi-line body is more +than a few lines long, because it is easier to read and grasp +the semantics of an if-then-else block when the simpler block +occurs first, rather than after the more involved block: + + if (!expr) + x = y; /* more readable */ + else + { + ... + ... + } + +If you'd rather not negate the condition, then add braces: + + if (expr) + { + ... + ... + } + else + { + x = y; + } + + Use SPACE-only indentation in all[*] files ========================================== We use space-only indentation in nearly all files.

2 3

[libvirt] [PATCH 0/3] lxc: Fix domain lookup and error handling
by jdenemar＠redhat.com 04 May '10

04 May '10

From: Jiri Denemark <jdenemar(a)redhat.com> Jiri Denemark (3): lxc: Use virDomainFindByUUID for domain lookup lxc: Make SetMemory work for active domains only lxc: Check domain is active/inactive as required by operation src/lxc/lxc_driver.c | 138 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 94 insertions(+), 44 deletions(-)

4 10

[libvirt] qemu-kvm spending time in do_info_migrate() during virDomainSave(); 50ms polling too fast?
by Charles Duffy 04 May '10

04 May '10

...or more particularly, in ram_bytes_remaining() called by do_info_migrate(); oddly, this is much more pronounced when running with <emulator> pointing at a shim prepending -no-kvm-irqchip to the invoked command line. This VM was intended to be paused for the save event (if my software was doing its job correctly), so we shouldn't be spending time running the guest CPU and writing updates for already-once-written blocks. I'm seeing much more CPU time spent inside qemu-kvm than in the exec'd lzop process compressing and writing the data stream; on attaching gdb and taking some stack traces to sample where execution time was spent, it appeared that we were spending our time responding to requests from the monitor. The question then -- is the 50ms poll in qemuDomainWaitForMigrationComplete (called from qemudDomainSave) perhaps too frequent? Thanks! --- Below is an exchange from IRC: <nDuff> How often should libvirt be calling "info migrate" during a virDomainSave (of a qemu domain)? * nDuff is seeing his qemu-kvm spending the bulk of its time inside ram_bytes_remaining() under do_info_migrate(). <DV> nDuff: I doubt libvirt is doing this on his own, something else is asking for the information I would assume <nDuff> DV, I'm not running virt-manager or such; the only management layer on top is locally developed, and it only has a single thread that's blocked waiting for the dom.save() call [this is using the Python bindings] to complete. <DV> interesting <DV> nDuff -> send this to the list, someone need to look at it, at least raise the problem, maybe we didn't expected that to be so costly <DV> nDuff: maybe open a bugzilla <nDuff> it might be that it's not _usually_ so costly except that I'm hitting a qemu/kvm bug; it only started expressing itself when I added -no-kvm-irqchip to the commandline via a shim <DV> nDuff: I could see how trying to extract this too often could stall the migration process <nDuff> ...but yes, I'll post to the list. <DV> nDuff: maybe it's related to the capability to force migration end when the full flush will be shorter than a user defined limit

3 3

[libvirt] [PATCH] nwfilter: skip interfaces on filter update
by Stefan Berger 04 May '10

04 May '10

When a filter is updated, only those interfaces must have their old rules cleared that either reference the filter directly or indirectly through another filter. Remember between the different steps of the instantiation of the filters which interfaces must be skipped. I am using a hash map to remember the names of the interfaces and store a bogus pointer to ~0 into it that need not be freed. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.c | 8 ++++ src/conf/nwfilter_conf.h | 1 src/nwfilter/nwfilter_gentech_driver.c | 66 ++++++++++++++++++++++++--------- src/nwfilter/nwfilter_gentech_driver.h | 3 + 4 files changed, 59 insertions(+), 19 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -2088,8 +2088,14 @@ virNWFilterTriggerVMFilterRebuild(virCon .conn = conn, .err = 0, .step = STEP_APPLY_NEW, + .skipInterfaces = virHashCreate(0), }; + if (!cb.skipInterfaces) { + virReportOOMError(); + return 1; + } + for (i = 0; i < nCallbackDriver; i++) { callbackDrvArray[i]->vmFilterRebuild(conn, virNWFilterDomainFWUpdateCB, @@ -2115,6 +2121,8 @@ virNWFilterTriggerVMFilterRebuild(virCon &cb); } + virHashFree(cb.skipInterfaces, NULL); + return err; } Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -471,6 +471,7 @@ struct domUpdateCBStruct { virConnectPtr conn; enum UpdateStep step; int err; + virHashTablePtr skipInterfaces; }; Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -40,7 +40,8 @@ enum instCase { int virNWFilterInstantiateFilter(virConnectPtr conn, const virDomainNetDefPtr net); int virNWFilterUpdateInstantiateFilter(virConnectPtr conn, - const virDomainNetDefPtr net); + const virDomainNetDefPtr net, + bool *skipIface); int virNWFilterRollbackUpdateFilter(virConnectPtr conn, const virDomainNetDefPtr net); Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -316,7 +316,7 @@ _virNWFilterInstantiateRec(virConnectPtr virNWFilterHashTablePtr vars, int *nEntries, virNWFilterRuleInstPtr **insts, - enum instCase useNewFilter, int *foundNewFilter, + enum instCase useNewFilter, bool *foundNewFilter, virNWFilterDriverStatePtr driver) { virNWFilterPoolObjPtr obj; @@ -381,7 +381,7 @@ _virNWFilterInstantiateRec(virConnectPtr case INSTANTIATE_FOLLOW_NEWFILTER: if (obj->newDef) { next_filter = obj->newDef; - *foundNewFilter = 1; + *foundNewFilter = true; } break; case INSTANTIATE_ALWAYS: @@ -562,7 +562,7 @@ virNWFilterInstantiate(virConnectPtr con int ifindex, const char *linkdev, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, int *foundNewFilter, + enum instCase useNewFilter, bool *foundNewFilter, bool teardownOld, const unsigned char *macaddr, virNWFilterDriverStatePtr driver, @@ -693,7 +693,8 @@ __virNWFilterInstantiateFilter(virConnec virNWFilterHashTablePtr filterparams, enum instCase useNewFilter, virNWFilterDriverStatePtr driver, - bool forceWithPendingReq) + bool forceWithPendingReq, + bool *foundNewFilter) { int rc; const char *drvname = EBIPTABLES_DRIVER_ID; @@ -702,7 +703,6 @@ __virNWFilterInstantiateFilter(virConnec virNWFilterHashTablePtr vars, vars1; virNWFilterDefPtr filter; char vmmacaddr[VIR_MAC_STRING_BUFLEN] = {0}; - int foundNewFilter = 0; char *str_macaddr = NULL; const char *ipaddr; char *str_ipaddr = NULL; @@ -775,7 +775,7 @@ __virNWFilterInstantiateFilter(virConnec case INSTANTIATE_FOLLOW_NEWFILTER: if (obj->newDef) { filter = obj->newDef; - foundNewFilter = 1; + *foundNewFilter = true; } break; @@ -791,7 +791,7 @@ __virNWFilterInstantiateFilter(virConnec ifindex, linkdev, vars, - useNewFilter, &foundNewFilter, + useNewFilter, foundNewFilter, teardownOld, macaddr, driver, @@ -816,7 +816,8 @@ static int _virNWFilterInstantiateFilter(virConnectPtr conn, const virDomainNetDefPtr net, bool teardownOld, - enum instCase useNewFilter) + enum instCase useNewFilter, + bool *foundNewFilter) { const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) ? net->data.direct.linkdev @@ -837,7 +838,8 @@ _virNWFilterInstantiateFilter(virConnect net->filterparams, useNewFilter, conn->nwfilterPrivateData, - false); + false, + foundNewFilter); } @@ -853,6 +855,8 @@ virNWFilterInstantiateFilterLate(virConn virNWFilterDriverStatePtr driver) { int rc; + bool foundNewFilter = false; + rc = __virNWFilterInstantiateFilter(conn, 1, ifname, @@ -864,7 +868,8 @@ virNWFilterInstantiateFilterLate(virConn filterparams, INSTANTIATE_ALWAYS, driver, - true); + true, + &foundNewFilter); if (rc) { //something went wrong... 'DOWN' the interface if (ifaceCheck(false, ifname, NULL, ifindex) != 0 || @@ -881,19 +886,29 @@ int virNWFilterInstantiateFilter(virConnectPtr conn, const virDomainNetDefPtr net) { + bool foundNewFilter = false; + return _virNWFilterInstantiateFilter(conn, net, 1, - INSTANTIATE_ALWAYS); + INSTANTIATE_ALWAYS, + &foundNewFilter); } int virNWFilterUpdateInstantiateFilter(virConnectPtr conn, - const virDomainNetDefPtr net) + const virDomainNetDefPtr net, + bool *skipIface) { - return _virNWFilterInstantiateFilter(conn, net, - 0, - INSTANTIATE_FOLLOW_NEWFILTER); + bool foundNewFilter = false; + + int rc = _virNWFilterInstantiateFilter(conn, net, + 0, + INSTANTIATE_FOLLOW_NEWFILTER, + &foundNewFilter); + + *skipIface = !foundNewFilter; + return rc; } int virNWFilterRollbackUpdateFilter(virConnectPtr conn, @@ -993,6 +1008,7 @@ virNWFilterDomainFWUpdateCB(void *payloa virDomainDefPtr vm = obj->def; struct domUpdateCBStruct *cb = data; int i; + bool skipIface; virDomainObjLock(obj); @@ -1003,15 +1019,29 @@ virNWFilterDomainFWUpdateCB(void *payloa switch (cb->step) { case STEP_APPLY_NEW: cb->err = virNWFilterUpdateInstantiateFilter(cb->conn, - net); + net, + &skipIface); + if (cb->err == 0 && skipIface == true) { + // filter tree unchanged -- no update needed + cb->err = virHashAddEntry(cb->skipInterfaces, + net->ifname, + (void *)~0); + if (cb->err) + virReportOOMError(); + } break; case STEP_TEAR_NEW: - cb->err = virNWFilterRollbackUpdateFilter(cb->conn, net); + if ( !virHashLookup(cb->skipInterfaces, net->ifname)) { + cb->err = virNWFilterRollbackUpdateFilter(cb->conn, + net); + } break; case STEP_TEAR_OLD: - cb->err = virNWFilterTearOldFilter(cb->conn, net); + if ( !virHashLookup(cb->skipInterfaces, net->ifname)) { + cb->err = virNWFilterTearOldFilter(cb->conn, net); + } break; } if (cb->err)

2 2

[libvirt] [PATCH] mingw: Fix two undefined symbols
by Matthias Bolte 04 May '10

04 May '10

Add an empty body for virCondWaitUntil and move virPipeReadUntilEOF out of the '#ifndef WIN32' block, because it compiles fine with MinGW in combination with gnulib. --- src/util/threads-win32.c | 10 +++ src/util/util.c | 160 +++++++++++++++++++++++----------------------- 2 files changed, 90 insertions(+), 80 deletions(-) diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c index a30bccf..e478560 100644 --- a/src/util/threads-win32.c +++ b/src/util/threads-win32.c @@ -157,6 +157,16 @@ int virCondWait(virCondPtr c, virMutexPtr m) return 0; } +int virCondWaitUntil(virCondPtr c ATTRIBUTE_UNUSED, + virMutexPtr m ATTRIBUTE_UNUSED, + unsigned long long whenms ATTRIBUTE_UNUSED) +{ + /* FIXME: this function is currently only used by the QEMU driver that + * is not compiled on Windows, so it's okay for now to just + * miss an implementation */ + return -1; +} + void virCondSignal(virCondPtr c) { virMutexLock(&c->lock); diff --git a/src/util/util.c b/src/util/util.c index 3209185..e444c97 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -782,86 +782,6 @@ int virExecDaemonize(const char *const*argv, return ret; } -int -virPipeReadUntilEOF(int outfd, int errfd, - char **outbuf, char **errbuf) { - - struct pollfd fds[2]; - int i; - int finished[2]; - - fds[0].fd = outfd; - fds[0].events = POLLIN; - finished[0] = 0; - fds[1].fd = errfd; - fds[1].events = POLLIN; - finished[1] = 0; - - while(!(finished[0] && finished[1])) { - - if (poll(fds, ARRAY_CARDINALITY(fds), -1) < 0) { - if ((errno == EAGAIN) || (errno == EINTR)) - continue; - goto pollerr; - } - - for (i = 0; i < ARRAY_CARDINALITY(fds); ++i) { - char data[1024], **buf; - int got, size; - - if (!(fds[i].revents)) - continue; - else if (fds[i].revents & POLLHUP) - finished[i] = 1; - - if (!(fds[i].revents & POLLIN)) { - if (fds[i].revents & POLLHUP) - continue; - - virUtilError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Unknown poll response.")); - goto error; - } - - got = read(fds[i].fd, data, sizeof(data)); - - if (got == 0) { - finished[i] = 1; - continue; - } - if (got < 0) { - if (errno == EINTR) - continue; - if (errno == EAGAIN) - break; - goto pollerr; - } - - buf = ((fds[i].fd == outfd) ? outbuf : errbuf); - size = (*buf ? strlen(*buf) : 0); - if (VIR_REALLOC_N(*buf, size+got+1) < 0) { - virReportOOMError(); - goto error; - } - memmove(*buf+size, data, got); - (*buf)[size+got] = '\0'; - } - continue; - - pollerr: - virReportSystemError(errno, - "%s", _("poll error")); - goto error; - } - - return 0; - -error: - VIR_FREE(*outbuf); - VIR_FREE(*errbuf); - return -1; -} - /** * @argv NULL terminated argv to run * @status optional variable to return exit status in @@ -1008,6 +928,86 @@ virExecDaemonize(const char *const*argv ATTRIBUTE_UNUSED, # endif /* WIN32 */ int +virPipeReadUntilEOF(int outfd, int errfd, + char **outbuf, char **errbuf) { + + struct pollfd fds[2]; + int i; + int finished[2]; + + fds[0].fd = outfd; + fds[0].events = POLLIN; + finished[0] = 0; + fds[1].fd = errfd; + fds[1].events = POLLIN; + finished[1] = 0; + + while(!(finished[0] && finished[1])) { + + if (poll(fds, ARRAY_CARDINALITY(fds), -1) < 0) { + if ((errno == EAGAIN) || (errno == EINTR)) + continue; + goto pollerr; + } + + for (i = 0; i < ARRAY_CARDINALITY(fds); ++i) { + char data[1024], **buf; + int got, size; + + if (!(fds[i].revents)) + continue; + else if (fds[i].revents & POLLHUP) + finished[i] = 1; + + if (!(fds[i].revents & POLLIN)) { + if (fds[i].revents & POLLHUP) + continue; + + virUtilError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unknown poll response.")); + goto error; + } + + got = read(fds[i].fd, data, sizeof(data)); + + if (got == 0) { + finished[i] = 1; + continue; + } + if (got < 0) { + if (errno == EINTR) + continue; + if (errno == EAGAIN) + break; + goto pollerr; + } + + buf = ((fds[i].fd == outfd) ? outbuf : errbuf); + size = (*buf ? strlen(*buf) : 0); + if (VIR_REALLOC_N(*buf, size+got+1) < 0) { + virReportOOMError(); + goto error; + } + memmove(*buf+size, data, got); + (*buf)[size+got] = '\0'; + } + continue; + + pollerr: + virReportSystemError(errno, + "%s", _("poll error")); + goto error; + } + + return 0; + +error: + VIR_FREE(*outbuf); + VIR_FREE(*errbuf); + return -1; +} + +int virRun(const char *const*argv, int *status) { return virRunWithHook(argv, NULL, NULL, status); -- 1.7.0.4

2 2

[libvirt] [PATCH] configure.ac: avoid uname, which breaks cross-compilation
by Eric Blake 04 May '10

04 May '10

Without this patch, compiling to mingw with a $build on windows (think MSYS or cygwin) worked, but failed with a $build on Linux. * configure.ac: Fix cross-compilation from Linux to mingw. Reported by Matthias Bolte. --- configure.ac | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0fb8bd9..3225cfa 100644 --- a/configure.ac +++ b/configure.ac @@ -197,8 +197,8 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then fi dnl lxc and qemu drivers require linux headers -if test `uname -s` != "Linux" -then +case $host in + linux*) if test "x$with_lxc" != "xyes" then with_lxc=no @@ -207,7 +207,8 @@ then then with_qemu=no fi -fi + ;; +esac dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], @@ -1970,7 +1971,11 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) -AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"]) +case $host in + linux*) with_linux=yes ;; + *) with_linux=no ;; +esac +AM_CONDITIONAL([WITH_LINUX], [test $with_linux = yes]) AC_ARG_WITH([qemu-user], -- 1.6.6.1

1 1

[libvirt] [PATCH] build: avoid compiler warning
by Eric Blake 04 May '10

04 May '10

Necessary on cygwin, where uid_t and gid_t are 4-byte long rather than int, causing gcc -Wformat warnings. * src/util/util.c (virFileOperationNoFork, virDirCreateNoFork) (virFileOperation, virDirCreate, virGetUserEnt): Cast uid_t and gid_t before passing to printf. * .gitignore: Ignore cygwin executables. --- .gitignore | 1 + src/util/util.c | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8c275f4..4faf384 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *#*# *.#*# *.a +*.exe *.o *.orig *.rej diff --git a/src/util/util.c b/src/util/util.c index 3209185..0c5a22b 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -74,11 +74,14 @@ #include "util.h" #include "memory.h" #include "threads.h" +#include "verify.h" #ifndef NSIG # define NSIG 32 #endif +verify(sizeof (gid_t) <= sizeof (int) && sizeof (uid_t) <= sizeof (int)); + #define VIR_FROM_THIS VIR_FROM_NONE #define virUtilError(code, ...) \ @@ -1277,7 +1280,7 @@ static int virFileOperationNoFork(const char *path, int openflags, mode_t mode, && (fchown(fd, uid, gid) < 0)) { ret = errno; virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - path, uid, gid); + path, (int) uid, (int) gid); goto error; } if ((flags & VIR_FILE_OP_FORCE_PERMS) @@ -1328,7 +1331,7 @@ static int virDirCreateNoFork(const char *path, mode_t mode, uid_t uid, gid_t gi && (chown(path, uid, gid) < 0)) { ret = errno; virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - path, uid, gid); + path, (int) uid, (int) gid); goto error; } if ((flags & VIR_DIR_CREATE_FORCE_PERMS) @@ -1407,14 +1410,14 @@ parenterror: ret = errno; virReportSystemError(errno, _("cannot set gid %u creating '%s'"), - gid, path); + (int) gid, path); goto childerror; } if ((uid != 0) && (setuid(uid) != 0)) { ret = errno; virReportSystemError(errno, _("cannot set uid %u creating '%s'"), - uid, path); + (int) uid, path); goto childerror; } if ((fd = open(path, openflags, mode)) < 0) { @@ -1436,7 +1439,7 @@ parenterror: && (fchown(fd, -1, gid) < 0)) { ret = errno; virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - path, uid, gid); + path, (int) uid, (int) gid); goto childerror; } if ((flags & VIR_FILE_OP_FORCE_PERMS) @@ -1517,13 +1520,13 @@ parenterror: if ((gid != 0) && (setgid(gid) != 0)) { ret = errno; virReportSystemError(errno, _("cannot set gid %u creating '%s'"), - gid, path); + (int) gid, path); goto childerror; } if ((uid != 0) && (setuid(uid) != 0)) { ret = errno; virReportSystemError(errno, _("cannot set uid %u creating '%s'"), - uid, path); + (int) uid, path); goto childerror; } if (mkdir(path, mode) < 0) { @@ -1547,7 +1550,7 @@ parenterror: ret = errno; virReportSystemError(errno, _("cannot chown '%s' to group %u"), - path, gid); + path, (int) gid); goto childerror; } if ((flags & VIR_DIR_CREATE_FORCE_PERMS) @@ -2564,7 +2567,7 @@ static char *virGetUserEnt(uid_t uid, if (getpwuid_r(uid, &pwbuf, strbuf, strbuflen, &pw) != 0 || pw == NULL) { virReportSystemError(errno, _("Failed to find user record for uid '%d'"), - uid); + (int) uid); VIR_FREE(strbuf); return NULL; } -- 1.6.6.1

2 5

[libvirt] [PATCH] dnsmasqReload: avoid mingw link failure
by Eric Blake 04 May '10

04 May '10

* src/util/dnsmasq.c (dnsmasqReload): Mingw lacks kill, but is not running a dnsmasq daemon either. --- I'm not as familiar with the mingw cross-build setup, but I finally got enough pieces installed on my F-12 machine that this was the only remaining compilation failure that I ran into. Let me know if we need an alternate patch that solves dnsmasq more gracefully than just crippling one function. src/util/dnsmasq.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 1cb5f21..d6cef40 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -328,14 +328,16 @@ dnsmasqDelete(const dnsmasqContext *ctx) * Reloads all the configurations associated to a context */ int -dnsmasqReload(pid_t pid) +dnsmasqReload(pid_t pid ATTRIBUTE_UNUSED) { +#ifndef __MINGW32__ if (kill(pid, SIGHUP) != 0) { virReportSystemError(errno, _("Failed to make dnsmasq (PID: %d) reload config files.\n"), pid); return -1; } +#endif /* __MINGW32__ */ return 0; } -- 1.6.6.1

2 5

[libvirt] [PATCH] nwfilter: pass info where request stems from to have rules applied
by Stefan Berger 04 May '10

04 May '10

For the decision on whether to instantiate the rules, the check for a pending IP address learn request is not sufficient since then only the thread could instantiate the rules. So, a boolean needs to be passed when the thread instantiates the filter rules late and the IP address learn request is still pending in order to override the check for the pending learn request. If the rules are to be updated while the thread is active, this will not be done immediately but the thread will do that later on. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -543,6 +543,8 @@ virNWFilterRuleInstancesToArray(int nEnt * @ifname: The name of the interface to apply the rules to * @vars: A map holding variable names and values used for instantiating * the filter and its subfilters. + * @forceWithPendingReq: Ignore the check whether a pending learn request + * is active; 'true' only when the rules are applied late * * Returns 0 on success, a value otherwise. * @@ -563,7 +565,8 @@ virNWFilterInstantiate(virConnectPtr con enum instCase useNewFilter, int *foundNewFilter, bool teardownOld, const unsigned char *macaddr, - virNWFilterDriverStatePtr driver) + virNWFilterDriverStatePtr driver, + bool forceWithPendingReq) { int rc; int j, nptrs; @@ -610,7 +613,8 @@ virNWFilterInstantiate(virConnectPtr con } else if (virHashSize(missing_vars->hashTable) > 1) { rc = 1; goto err_exit; - } else if (virNWFilterLookupLearnReq(ifindex) == NULL) { + } else if (!forceWithPendingReq && + virNWFilterLookupLearnReq(ifindex) != NULL) { goto err_exit; } @@ -688,7 +692,8 @@ __virNWFilterInstantiateFilter(virConnec const char *filtername, virNWFilterHashTablePtr filterparams, enum instCase useNewFilter, - virNWFilterDriverStatePtr driver) + virNWFilterDriverStatePtr driver, + bool forceWithPendingReq) { int rc; const char *drvname = EBIPTABLES_DRIVER_ID; @@ -789,7 +794,8 @@ __virNWFilterInstantiateFilter(virConnec useNewFilter, &foundNewFilter, teardownOld, macaddr, - driver); + driver, + forceWithPendingReq); virNWFilterHashTableFree(vars); @@ -830,7 +836,8 @@ _virNWFilterInstantiateFilter(virConnect net->filter, net->filterparams, useNewFilter, - conn->nwfilterPrivateData); + conn->nwfilterPrivateData, + false); } @@ -856,7 +863,8 @@ virNWFilterInstantiateFilterLate(virConn filtername, filterparams, INSTANTIATE_ALWAYS, - driver); + driver, + true); if (rc) { //something went wrong... 'DOWN' the interface if (ifaceCheck(false, ifname, NULL, ifindex) != 0 ||

2 1

[libvirt] [PATCH] cgroup: Fix possible memory leak in virCgroupMakeGroup
by Ryota Ozaki 04 May '10

04 May '10

* src/util/cgroup.c: free temporal path string before breaking loop --- src/util/cgroup.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index b649c3c..b8b2eb5 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -472,8 +472,10 @@ static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, int creat (i == VIR_CGROUP_CONTROLLER_CPUSET || STREQ(group->controllers[i].mountPoint, group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) { rc = virCgroupCpuSetInherit(parent, group); - if (rc != 0) + if (rc != 0) { + VIR_FREE(path); break; + } } } -- 1.6.5.2

2 1

[libvirt] [PATCH] dnsmasq.c: Fix OOM error reporting
by Matthias Bolte 04 May '10

04 May '10

Also do some indentation clean up. --- src/util/dnsmasq.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 1cb5f21..2d57884 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -84,12 +84,12 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, if (name) { if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", - mac, ip, name) < 0) { + mac, ip, name) < 0) { goto alloc_error; } } else { if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", - mac, ip) < 0) { + mac, ip) < 0) { goto alloc_error; } } @@ -99,9 +99,8 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, return 0; alloc_error: - virReportSystemError(ENOMEM, - _("Failed to add dhcp host entry: mac=%s, ip=%s, name=%s\n"), - mac, ip, (name ? name : "(null)")); + virReportOOMError(); + return -1; } @@ -112,20 +111,23 @@ hostsfileNew(const char *name, int err; dnsmasqHostsfile *hostsfile; - if (VIR_ALLOC(hostsfile) < 0) + if (VIR_ALLOC(hostsfile) < 0) { + virReportOOMError(); return NULL; + } hostsfile->hosts = NULL; hostsfile->nhosts = 0; if (virAsprintf(&hostsfile->path, "%s/%s.%s", config_dir, name, - DNSMASQ_HOSTSFILE_SUFFIX) < 0) { + DNSMASQ_HOSTSFILE_SUFFIX) < 0) { + virReportOOMError(); goto error; } if ((err = virFileMakePath(config_dir))) { virReportSystemError(err, _("cannot create config directory '%s'"), - config_dir); + config_dir); goto error; } @@ -201,11 +203,11 @@ static int hostsfileSave(dnsmasqHostsfile *hostsfile) { int err = hostsfileWrite(hostsfile->path, hostsfile->hosts, - hostsfile->nhosts); + hostsfile->nhosts); if (err < 0) { virReportSystemError(err, _("cannot write config file '%s'"), - hostsfile->path); + hostsfile->path); return -1; } @@ -220,7 +222,7 @@ hostsfileDelete(dnsmasqHostsfile *hostsfile) if (unlink(hostsfile->path) < 0) { virReportSystemError(errno, _("cannot remove config file '%s'"), - hostsfile->path); + hostsfile->path); return -1; } @@ -240,8 +242,10 @@ dnsmasqContextNew(const char *network_name, { dnsmasqContext *ctx; - if (VIR_ALLOC(ctx) < 0) + if (VIR_ALLOC(ctx) < 0) { + virReportOOMError(); return NULL; + } if (!(ctx->hostsfile = hostsfileNew(network_name, config_dir))) goto error; -- 1.7.0.4

2 2

[libvirt] [PATCH] mingw: Fix symbol export
by Matthias Bolte 04 May '10

04 May '10

In commit 98fb83ce25f46e0236706fa6e0943032d921935f I changed the version script handling. But it seems that I didn't test this properly and broke it. The .def file is passed to the compiler directly, but it should get passed to the linker instead. Set VERSION_SCRIPT_FLAGS to -Wl, to pass the .def file correctly to the linker. This fixes the undefined symbol errors while linking virsh. --- configure.ac | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f25e173..6ee5b90 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,6 @@ AM_PROG_LD VERSION_SCRIPT_FLAGS=-Wl,--version-script= `$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," -AC_SUBST(VERSION_SCRIPT_FLAGS) LIBVIRT_COMPILE_WARNINGS([maximum]) @@ -1824,10 +1823,11 @@ case "$host" in # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the linker LIBVIRT_SYMBOL_FILE=libvirt.def # mingw's ld has the --version-script parameter, but it requires a .def file - # instead to work properly, therefore clear --version-script here + # instead to work properly, therefore clear --version-script here and use + # -Wl, to pass the .def file to the linker # cygwin's ld has the --version-script parameter too, but for some reason # it's working there as expected - VERSION_SCRIPT_FLAGS= + VERSION_SCRIPT_FLAGS="-Wl," ;; esac AC_SUBST([CYGWIN_EXTRA_LDFLAGS]) @@ -1836,6 +1836,7 @@ AC_SUBST([CYGWIN_EXTRA_PYTHON_LIBADD]) AC_SUBST([MINGW_EXTRA_LDFLAGS]) AC_SUBST([WIN32_EXTRA_CFLAGS]) AC_SUBST([LIBVIRT_SYMBOL_FILE]) +AC_SUBST([VERSION_SCRIPT_FLAGS]) dnl Look for windres to build a Windows icon resource. -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix memory leaks in cmdInterfaceEdit and cmdNWFilterEdit.
by Laine Stump 04 May '10

04 May '10

This applies a fix to thos functions similar to that made to cmdEdit in 270895063d1cf86ab42fa220a8d090c24d58dbc0, thus fnixing a memory leak - if tmp is unlinked and NULLed early in the function, the memory used by tmp is never freed. Since we will always unlink tmp prior to freeing its memory at the end of the function, just remove the earlier code and let cleanup: do the cleanup. --- tools/virsh.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index eb11a78..fb66a72 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3248,9 +3248,6 @@ cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) doc_edited = editReadBackFile (ctl, tmp); if (!doc_edited) goto cleanup; - unlink (tmp); - tmp = NULL; - /* Compare original XML with edited. Has it changed at all? */ if (STREQ (doc, doc_edited)) { vshPrint (ctl, _("Interface %s XML configuration not changed.\n"), @@ -4193,9 +4190,6 @@ cmdNWFilterEdit (vshControl *ctl, const vshCmd *cmd) doc_edited = editReadBackFile (ctl, tmp); if (!doc_edited) goto cleanup; - unlink (tmp); - tmp = NULL; - /* Compare original XML with edited. Has it changed at all? */ if (STREQ (doc, doc_edited)) { vshPrint (ctl, _("Network filter %s XML configuration not changed.\n"), -- 1.6.6.1

3 3

[libvirt] [PATCH] lxc: Fix failure on starting a domain that has multiple network interfaces
by Ryota Ozaki 03 May '10

03 May '10

[Error message] error: Failed to start domain lxc_test1 error: internal error Failed to create veth device pair: 512 The reason of the failure is that lxc driver unexpectedly re-uses an auto-assigned veth name and tries to create the created veth again. The failure will happen when a domain has multiple network interfaces and the names of those are not specified in XML. The patch fixes the problem by resetting buffers of veth names in every iteration of creating veth. * src/lxc/lxc_driver.c: prevent re-using auto-assigned veth name Reported by Kumar L Srikanth-B22348. --- src/lxc/lxc_driver.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 409b1cf..554bf66 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -786,14 +786,15 @@ static int lxcSetupInterfaces(virConnectPtr conn, { int rc = -1, i; char *bridge = NULL; - char parentVeth[PATH_MAX] = ""; - char containerVeth[PATH_MAX] = ""; brControl *brctl = NULL; if (brInit(&brctl) != 0) return -1; for (i = 0 ; i < def->nnets ; i++) { + char parentVeth[PATH_MAX] = ""; + char containerVeth[PATH_MAX] = ""; + switch (def->nets[i]->type) { case VIR_DOMAIN_NET_TYPE_NETWORK: { -- 1.6.5.2

2 1

[libvirt] Creating multiple network interfaces in libvirt Domain.
by Kumar L Srikanth-B22348 01 May '10

01 May '10

Hi, I want to create a Domain with two interfaces. I am using LXC hypervisor in the libvirt. My domain XML is shown below: <domain type='lxc' id='1'> <name>srikanth_vm2</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/sh</init> </os> <vcpu>1</vcpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/root/lxc/fedora1'/> <target dir='/'/> </filesystem> <interface type='network'> <source network='default'/> </interface> <interface type='network'> <source network='default'/> </interface> <console type='pty' /> </devices> </domain> I am able to define the Domain. But, I am not able to start the Domain. While starting the domain, I am getting the following error: error: Failed to start domain srikanth_vm2 error: internal error Failed to create veth device pair: 512 Can you please let me know where I am going wrong? Regards, Srikanth.

2 2

[libvirt] [PATCH] Fix a virsh edit memory leak
by Chris Lalancette 01 May '10

01 May '10

When running virsh edit, we are unlinking and setting the tmp variable to NULL before going to the end of the function, meaning that we never free tmp. Since the exit to the function will always unlink and free tmp, just remove this bit of code and let it get done at the end. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 04b47a1..ab099da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8066,9 +8066,6 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) doc_edited = editReadBackFile (ctl, tmp); if (!doc_edited) goto cleanup; - unlink (tmp); - tmp = NULL; - /* Compare original XML with edited. Has it changed at all? */ if (STREQ (doc, doc_edited)) { vshPrint (ctl, _("Domain %s XML configuration not changed.\n"), -- 1.6.6.1

3 2

[libvirt] [PATCH] autobuild.sh: provide default prefix
by Eric Blake 01 May '10

01 May '10

Without this patch and with a clean environment, ./autobuild.sh tried to use ./configure --prefix=/, and fails. * autobuild.sh (AUTOBUILD_INSTALL_ROOT): Provide sensible default. Suggested by Daniel P. Berrange. --- autobuild.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index d3934ea..3379be4 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -6,6 +6,7 @@ set -v # Make things clean. test -n "$1" && RESULTS=$1 || RESULTS=results.log +: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} test -f Makefile && make -k distclean || : rm -rf coverage -- 1.6.6.1

3 3

[libvirt] Release of libvirt-0.8.1
by Daniel Veillard 01 May '10

01 May '10

As planned, here is the 0.8.1 bug fix release, available from libvirt.org FTP: ftp://libvirt.org/libvirt/ As planned it's rather light on features but includes a very large set of bug fixes, cleanups and portability enhancements, Features: - Add virDomainGetBlockInfo API to query disk sizing (Daniel P. Berrange) - Starts dnsmasq from libvirtd with --dhcp-hostsfile option (Satoru SATOH) Documentation: - cleanup the download section of the documentation (Daniel Veillard) - Fix messsage -> message. (Chris Lalancette) - Fix up a debug typo. (Chris Lalancette) - add nwfilter functions to virsh man page (Stefan Berger) Portability: - Fix build on Ubuntu. (Chris Lalancette) - cygwin/mingw: Fix version script handling (Matthias Bolte) - build: fix autogen rule for VPATH build (Eric Blake) - Fix build with DEBUG_RAW_IO=1 (Jiri Denemark) - Don't try to build qemu and lxc on non-Linux platforms (Daniel Veillard) - cygwin: Handle differences in the XDR implementation (Matthias Bolte) - Cygwin's GCC doesn't like this .sa_handler initialization for some reason (Matthias Bolte) - linux/if.h header is not available on non-Linux platforms (Matthias Bolte) - cygwin: Check explicitly for getmntent_r (Matthias Bolte) - Disable stateful OpenNebula driver if libvirtd is disabled (Matthias Bolte) - build: don't include winsock2.h on cygwin (Eric Blake) - portability fixes to tools/virt-pki-validate.in (Dustin Kirkland) - virt-aa-helper-test: avoid non-portable echo -n (Eric Blake) - schematestutils.sh: improve shell portability: avoid "echo -e" (Jim Meyering) - Fix build of openvz on RHEL-5. (Chris Lalancette) - Fix spec file for builds without lxc (Daniel Berteaud) Bug Fixes: - domain: Fix PCI address decimal parsing regression (Cole Robinson) - Fix virt-pki-validate's determination of CN (Dustin Kirkland) - Fix detection of disk in IO events (Daniel P. Berrange) - Fix a virsh edit memory leak (Chris Lalancette) - Fix a qemuDomainPCIAddressSetFree memory leak (Chris Lalancette) - Fix a memory leak in the node_device_udev code (Chris Lalancette) - qemuDomainSnapshotCreateXML: avoid NULL dereferences (Jim Meyering) - qemudDomainCreate: correct a slightly misdirected goto (Jim Meyering) - Fix handling of security driver restore failures in QEMU domain save (Daniel P. Berrange) - Fix QEMU domain save to block devices with cgroups enabled (Daniel P. Berrange) - Fix QEMU save/restore with block devices (Daniel P. Berrange) - Fix crash when cleaning up from failed save attempt (Daniel P. Berrange) - The base used for conversion of USB values should be 16 not 10. (Klaus Ethgen) - Fix up the locking in the snapshot code. (Chris Lalancette) - Ignore qemu STOP event when stopping CPUs (Jiri Denemark) - Fix memory leak in virsh snapshot-list. (Chris Lalancette) - Fix virDomainSnapshotObjFree memory leak. (Chris Lalancette) - Fix a memory leak in the snapshot code in libvirtd. (Chris Lalancette) - QEmu JSON drop timestamp from command object (Luiz Capitulino) - Fix crash in nwfilter driver check (Daniel P. Berrange) - qemu: fix security context references in DAC code (Spencer Shimko) - Properly indent encryption tags (David Allan) - Fix locking in qemudDomainCoreDump (Jiri Denemark) - Poll for migration end every 50ms instead of 50us (Jiri Denemark) - configure.ac SELinux fixes (Spencer Shimko) - Fix QEMU text monitor command error checking (Daniel P. Berrange) - Fix CPU hotplug command names (Daniel P. Berrange) - Fix printing of event detail in python events demo program (Daniel P. Berrange) - Fix initial VCPU pinning in qemu driver (Jiri Denemark) - Make avahi startup more robust. (Chris Lalancette) - esx: Don't treat an empty root snapshot list as error (Chris Wong) - esx: Fix FindByIp response handling (Matthias Bolte) - esx: Fix virtualHW.version generation (Matthias Bolte) - Fix device_del in JSON mode for QEMU (Daniel P. Berrange) - nwfilter: Free nwfilter hash of virConnectPtr (Matthias Bolte) - remote: react to failures on wakeupFD (Eric Blake) - Fix CDROM media change for QEMU when using -device syntax (Daniel P. Berrange) - Fix QEMU memory stats JSON mode (Daniel P. Berrange) - Trivial fix: Add braces to for statement to avoid crashes (Stefan Berger) - qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang (Jim Meyering) - qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang (Jim Meyering) - virGetHostnameLocalhost: avoid FP NULL-ptr-deref from clang (Jim Meyering) - nwfilter_ebiptables_driver.c: avoid NULL dereference (Jim Meyering) - esxVMX_GatherSCSIControllers: avoid NULL dereference (Jim Meyering) - Fix nodeinfotest on NUMA machines (Daniel P. Berrange) Improvements: - Add support for another explicit IO error event (Daniel P. Berrange) - Report all errors in SELinuxRestoreSecurityFileLabel (Jiri Denemark) - Prevent updates while IP address learn thread is running (Stefan Berger) - Syncronize the teardown of rules with the thread (Stefan Berger) - Clean all tables before applying 'basic' rules (Stefan Berger) - MAke virFileHasSuffix case insensitive (Paul Dorman) - nwfilter: Also pick IP address from a DHCP ACK message (Stefan Berger) - Implement python binding for virDomainGetBlockInfo (Daniel P. Berrange) - Add new domblkinfo command to virsh (Daniel P. Berrange) - Implement virDomainGetBlockInfo in QEMU driver (Daniel P. Berrange) - Remote protocol impl for virDomainGetBlockInfo (Daniel P. Berrange) - Internal driver API infrastructure for virDomainGetBlockInfo (Daniel P. Berrange) - Report better error if qemuSnapshotIsAllowed failed. (Chris Lalancette) - nwfilter: python bindings for nwfilter (Stefan Berger) - Move dnsmasq host file to a separate directory (Daniel Veillard) - nwfilter: allow to mix filterrefs and rules in the schema (Stefan Berger) - Avoid create/unlink with block devs used for QEMU save (Daniel P. Berrange) - nwfilter: let qemu's after-migration packet pass (Stefan Berger) - Fix up the error message if we can't parse the snapshot XML. (Chris Lalancette) - nwfilter: add support for RAPR protocol (Stefan Berger) - nwfilter: enable hex number inputs in filter XML (Stefan Berger) - Add build support for dnsmasq module (Satoru SATOH) - Add dnsmasq module files (Satoru SATOH) - Fix make dist missing ESX generated files (Daniel Veillard) - Fix printing of pathnames on error in qemuDomainSnapshotLoad. (Chris Lalancette) - Improve configure error message about missing Linux headers (Matthias Bolte) - nwfilter: extend schema + add testcase w/ connlimit-above (Stefan Berger) - addrToString: give better error message (Eric Blake) - Fake host CPU for qemu tests (Jiri Denemark) - Use configured CPU model if possible (Jiri Denemark) - Support removing features when converting data to CPU (Jiri Denemark) - Move MIN macro to util.h so that others can use it (Jiri Denemark) - Deal with CPU models in [] (Jiri Denemark) - Ignore empty type attribute in driver element of virtual disks (Guido Günther) - esx: Gather some XML generation macros in esx_vi.h (Matthias Bolte) - nwfilter: add support for connlimit match (Stefan Berger) - Extend fwall-drv interface and call functions via interface (Stefan Berger) - esx: Add support for the VMXNET 2 (Enhanced) NIC model (Matthias Bolte) - Install nwfilter xml files from source directory. (Philipp Hahn) - Fixup python binding for virDomainSnapshot APIs (Daniel P. Berrange) - Fix network hotplug to use device_add in QEMU (Daniel P. Berrange) - Fix error reporting for getfd + host_net_add in QEMU (Daniel P. Berrange) - Replace printf with logging macros (Matthias Bolte) - Mark internal.h for translation (Jiri Denemark) - Use virCheckFlags for APIs added in 0.8.0 (Jiri Denemark) - Introduce virCheckFlags for consistent flags checking (Jiri Denemark) - nwfilter: Clear all state tracking from a drop rule (Stefan Berger) - Update to latest gnulib to get strtok_r relaxed to LGPLv2+ (Matthias Bolte) - esx: Add nwfilter driver stub (Matthias Bolte) - util: ensure safe{read,write,zero} return is checked (Eric Blake) - Update QEMU device_add command in JSON mode (Daniel P. Berrange) - Rename parameter in qemuMonitorDeviceDel (Daniel P. Berrange) - Run test suite as part of RPM build process (Daniel P. Berrange) - Fix QEMU command building errors to reflect unsupported configuration (Daniel P. Berrange) - nwfilter: fix tear down order and consolidate functions (Stefan Berger) - Fix close_used_without_including_unistd_h error (Matthias Bolte) - Implement variable length structure allocator (David Allan) - build: set STATIC_ANALYSIS when running via clang or coverity (Jim Meyering) - sa_assert: assert-like macro, enabled only for use with static analyzers (Jim Meyering) - Implement forgotten backend of virInterfaceIsActive() (Laine Stump) - nwfilter: use virFindFileInPath for needed CLI tools (Stefan Berger) - esx: Extend esx_vi_generator.py to cover methods too (Matthias Bolte) - Consolidate interface related functions in interface.c (Stefan Berger) - build: include usleep gnulib module (Eric Blake) Cleanups: - qemudDomainSaveFlag: remove dead store (Jim Meyering) - Remove unused goto label from qemudDomainCreate (Daniel P. Berrange) - Fix indentation for storage conf XML (David Allan) - Make virDomainSnapshotObjListDeinit static. (Chris Lalancette) - Some NWFilter symbols are conditional and have to be exported conditional (Matthias Bolte) - xen: Fix inside_daemon beeing unused when libvirtd is disabled (Matthias Bolte) - maint: update AUTHORS (Marco Bozzolan) - maint: update AUTHORS with recent contributors (Eric Blake) - maint: enforce whitespace on shell scripts (Eric Blake) - testutilsqemu: avoid uninitialized variable (Eric Blake) - maint: ignore 'make syntax-check' failure files (Eric Blake) - build: fix preprocessor indentation (Eric Blake) - build: avoid compiler warning (Eric Blake) - Explicitly set virStoragePoolTypeInfo FS and NETFS defaults (Matthias Bolte) - Mark in_open parameter of remoteAuthenticate as unused when it's unused (Matthias Bolte) - Don't ship generated python/libvirt.? files. (Philipp Hahn) - esx: Replace scanf with STRSKIP and strtok_r (Matthias Bolte) - maint: another preprocessor fix (Eric Blake) - Remove code from JSON monitor for commands that won't be ported (Daniel P. Berrange) - Fix apibuild.py warnings about missing ':' (Matthias Bolte) - xend_internal.c: assure clang that we do not dereference NULL (Jim Meyering) - build: fix recent 'make syntax-check' failure (Eric Blake) - virStorageBackendFileSystemMount: prefer strdup over virAsprintf (Jim Meyering) - virStorageBackendFileSystemMount: placate clang (Jim Meyering) - openvzGetProcessInfo: address clang-detected low-probability flaw (Jim Meyering) - vshCommandRun: avoid used-uninitialized timing-related report from clang (Jim Meyering) - Fix up formatting of remote protocol stuff. (Chris Lalancette) - Remove some debugging leftovers. (Chris Lalancette) - build: fix syntax-check problems (Eric Blake) Thanks to everybody who helped for the release ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] domain: Fix PCI address decimal parsing regression
by Cole Robinson 01 May '10

01 May '10

<hostdev> address parsing previously attempted to detect the number base: currently it is hardcoded to base 16, which can break PCI assignment via virt-manager. Revert to the previous behavior. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/domain_conf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1607e8b..546ddf2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1079,28 +1079,28 @@ virDomainDevicePCIAddressParseXML(xmlNodePtr node, function = virXMLPropString(node, "function"); if (domain && - virStrToLong_ui(domain, NULL, 16, &addr->domain) < 0) { + virStrToLong_ui(domain, NULL, 0, &addr->domain) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'domain' attribute")); goto cleanup; } if (bus && - virStrToLong_ui(bus, NULL, 16, &addr->bus) < 0) { + virStrToLong_ui(bus, NULL, 0, &addr->bus) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'bus' attribute")); goto cleanup; } if (slot && - virStrToLong_ui(slot, NULL, 16, &addr->slot) < 0) { + virStrToLong_ui(slot, NULL, 0, &addr->slot) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'slot' attribute")); goto cleanup; } if (function && - virStrToLong_ui(function, NULL, 16, &addr->function) < 0) { + virStrToLong_ui(function, NULL, 0, &addr->function) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'function' attribute")); goto cleanup; -- 1.7.0.1

2 1

[libvirt] [patch 0/3] Fixes related to the IP address learning thread
by Stefan Berger 30 Apr '10

30 Apr '10

Proper resubmission -- sorry for the noise. The following set of patches are primarily related to the thread learning the IP address of a VM and deal with: - ebtables cleanup before applying basic filtering rules while the IP address is detected - shutting down all traffic in case the filtering rules could not be applied by the thread - serialization of the teardown of eb/ip/ip6tables rules to occurr after the IP address learning thread has terminated - no to apply or tear any eb/ip/ip6tables rules while the IP address learning thread is active Regards, Stefan

2 9

[libvirt] [PATCH] Report all errors in SELinuxRestoreSecurityFileLabel
by jdenemar＠redhat.com 30 Apr '10

30 Apr '10

From: Jiri Denemark <jdenemar(a)redhat.com> --- src/security/security_selinux.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 3e20475..1aabb20 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -364,12 +364,20 @@ SELinuxRestoreSecurityFileLabel(const char *path) goto err; } - if (stat(newpath, &buf) != 0) + if (stat(newpath, &buf) != 0) { + virReportSystemError(errno, + _("cannot stat %s"), newpath); goto err; + } if (matchpathcon(newpath, buf.st_mode, &fcon) == 0) { rc = SELinuxSetFilecon(newpath, fcon); + } else { + virSecurityReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot restore selinux file label for %s"), + newpath); } + err: VIR_FREE(fcon); VIR_FREE(newpath); -- 1.7.0.4

3 2

[libvirt] virFileHasSuffix case sensitivity
by Paul Dorman 30 Apr '10

30 Apr '10

Hi all, virFileHasSuffix fails on esx IDE fileName VMX entries that aren't lower case, e.g. '.ISO'. Unless there's a good reason, can the comparison be done with STRCASEEQ instead of STREQ? Kind regards, Paul

3 4

[libvirt] [PATCH] Add support for another explicit IO error event
by Daniel P. Berrange 30 Apr '10

30 Apr '10

This introduces a new event type VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON This event is the same as the previous VIR_DOMAIN_ID_IO_ERROR event, but also includes a string describing the cause of the event. Thus there is a new callback definition for this event type typedef void (*virConnectDomainEventIOErrorReasonCallback)(virConnectPtr conn, virDomainPtr dom, const char *srcPath, const char *devAlias, int action, const char *reason, void *opaque); This is currently wired up to the QEMU block IO error events * daemon/remote.c: Dispatch IO error events to client * examples/domain-events/events-c/event-test.c: Watch for IO error events * include/libvirt/libvirt.h.in: Define new IO error event ID and callback signature * src/conf/domain_event.c, src/conf/domain_event.h, src/libvirt_private.syms: Extend API to handle IO error events * src/qemu/qemu_driver.c: Connect to the QEMU monitor event for block IO errors and emit a libvirt IO error event * src/remote/remote_driver.c: Receive and dispatch IO error events to application * src/remote/remote_protocol.x: Wire protocol definition for IO error events * src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h, src/qemu/qemu_monitor_json.c: Watch for BLOCK_IO_ERROR event from QEMU monitor --- daemon/remote.c | 38 +++++++++++++++ daemon/remote_dispatch_table.h | 5 ++ include/libvirt/libvirt.h.in | 23 +++++++++ python/libvirt-override-virConnect.py | 14 +++++- python/libvirt-override.c | 55 +++++++++++++++++++++ src/conf/domain_event.c | 84 ++++++++++++++++++++++++++++----- src/conf/domain_event.h | 10 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 9 +++- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 6 ++- src/qemu/qemu_monitor_json.c | 2 +- src/remote/remote_driver.c | 35 ++++++++++++++ src/remote/remote_protocol.c | 17 +++++++ src/remote/remote_protocol.h | 12 +++++ src/remote/remote_protocol.x | 11 ++++- 16 files changed, 307 insertions(+), 21 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 6dbe7ee..c54565c 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -256,6 +256,43 @@ static int remoteRelayDomainEventIOError(virConnectPtr conn ATTRIBUTE_UNUSED, } +static int remoteRelayDomainEventIOErrorReason(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + const char *reason, + void *opaque) +{ + struct qemud_client *client = opaque; + remote_domain_event_io_error_reason_msg data; + + if (!client) + return -1; + + REMOTE_DEBUG("Relaying domain io error %s %d %s %s %d %s", + dom->name, dom->id, srcPath, devAlias, action, reason); + + virMutexLock(&client->lock); + + /* build return data */ + memset(&data, 0, sizeof data); + make_nonnull_domain (&data.dom, dom); + data.srcPath = (char*)srcPath; + data.devAlias = (char*)devAlias; + data.action = action; + data.reason = (char*)reason; + + remoteDispatchDomainEventSend (client, + REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON, + (xdrproc_t)xdr_remote_domain_event_io_error_reason_msg, &data); + + virMutexUnlock(&client->lock); + + return 0; +} + + static int remoteRelayDomainEventGraphics(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, int phase, @@ -327,6 +364,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventWatchdog), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventIOError), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventGraphics), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventIOErrorReason), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h index 984634f..86bd3b0 100644 --- a/daemon/remote_dispatch_table.h +++ b/daemon/remote_dispatch_table.h @@ -977,3 +977,8 @@ .args_filter = (xdrproc_t) xdr_remote_domain_get_block_info_args, .ret_filter = (xdrproc_t) xdr_remote_domain_get_block_info_ret, }, +{ /* Async event DomainEventIoErrorReason => 195 */ + .fn = NULL, + .args_filter = (xdrproc_t) xdr_void, + .ret_filter = (xdrproc_t) xdr_void, +}, diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 4237b7b..f296d16 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2054,6 +2054,28 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn, void *opaque); /** + * virConnectDomainEventWatchdogCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @srcPath: The host file on which the IO error occurred + * @devAlias: The guest device alias associated with the path + * @action: action that is to be taken due to the IO error + * @reason: the cause of the IO error + * @opaque: application specified data + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_IO_ERROR with virConnectDomainEventRegisterAny() + * + */ +typedef void (*virConnectDomainEventIOErrorReasonCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + const char *reason, + void *opaque); + +/** * virDomainEventGraphicsPhase: * * The phase of the graphics client connection @@ -2161,6 +2183,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_WATCHDOG = 3, /* virConnectDomainEventWatchdogCallback */ VIR_DOMAIN_EVENT_ID_IO_ERROR = 4, /* virConnectDomainEventIOErrorCallback */ VIR_DOMAIN_EVENT_ID_GRAPHICS = 5, /* virConnectDomainEventGraphicsCallback */ + VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON = 6, /* virConnectDomainEventIOErrorReasonCallback */ /* * NB: this enum value will increase over time as new events are diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index cb38e3f..df39b79 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -94,7 +94,19 @@ cb = cbData["cb"] opaque = cbData["opaque"] - cb(self, virDomain(self, _obj=dom), opaque) + cb(self, virDomain(self, _obj=dom), srcPath, devAlias, opaque) + return 0 + except AttributeError: + pass + + def dispatchDomainEventIOErrorReasonCallback(self, dom, srcPath, devAlias, action, reason, cbData): + """Dispatches events to python user domain IO error event callbacks + """ + try: + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), srcPath, devAlias, action, reason, opaque) return 0 except AttributeError: pass diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 7c7682c..b97445b 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -3208,6 +3208,58 @@ libvirt_virConnectDomainEventIOErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED } static int +libvirt_virConnectDomainEventIOErrorReasonCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + const char *reason, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + pyobj_dom = libvirt_virDomainPtrWrap(dom); + Py_INCREF(pyobj_cbData); + + dictKey = libvirt_constcharPtrWrap("conn"); + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"dispatchDomainEventIOErrorCallback", + (char*)"OssisO", + pyobj_dom, + srcPath, devAlias, action, reason, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + if(!pyobj_ret) { +#if DEBUG_ERROR + printf("%s - ret:%p\n", __FUNCTION__, pyobj_ret); +#endif + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + +static int libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, int phase, @@ -3345,6 +3397,9 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, case VIR_DOMAIN_EVENT_ID_IO_ERROR: cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventIOErrorCallback); break; + case VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventIOErrorReasonCallback); + break; case VIR_DOMAIN_EVENT_ID_GRAPHICS: cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventGraphicsCallback); break; diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index e3ce5ba..e5bd458 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -74,6 +74,7 @@ struct _virDomainEvent { char *srcPath; char *devAlias; int action; + char *reason; } ioError; struct { int phase; @@ -474,6 +475,7 @@ void virDomainEventFree(virDomainEventPtr event) case VIR_DOMAIN_EVENT_ID_IO_ERROR: VIR_FREE(event->data.ioError.srcPath); VIR_FREE(event->data.ioError.devAlias); + VIR_FREE(event->data.ioError.reason); break; case VIR_DOMAIN_EVENT_ID_GRAPHICS: @@ -630,19 +632,22 @@ virDomainEventPtr virDomainEventWatchdogNewFromObj(virDomainObjPtr obj, return ev; } -virDomainEventPtr virDomainEventIOErrorNewFromDom(virDomainPtr dom, - const char *srcPath, - const char *devAlias, - int action) +static virDomainEventPtr virDomainEventIOErrorNewFromDomImpl(int event, + virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + const char *reason) { virDomainEventPtr ev = - virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_IO_ERROR, + virDomainEventNewInternal(event, dom->id, dom->name, dom->uuid); if (ev) { ev->data.ioError.action = action; if (!(ev->data.ioError.srcPath = strdup(srcPath)) || - !(ev->data.ioError.devAlias = strdup(devAlias))) { + !(ev->data.ioError.devAlias = strdup(devAlias)) || + (reason && !(ev->data.ioError.reason = strdup(reason)))) { virDomainEventFree(ev); ev = NULL; } @@ -650,19 +655,23 @@ virDomainEventPtr virDomainEventIOErrorNewFromDom(virDomainPtr dom, return ev; } -virDomainEventPtr virDomainEventIOErrorNewFromObj(virDomainObjPtr obj, - const char *srcPath, - const char *devAlias, - int action) + +static virDomainEventPtr virDomainEventIOErrorNewFromObjImpl(int event, + virDomainObjPtr obj, + const char *srcPath, + const char *devAlias, + int action, + const char *reason) { virDomainEventPtr ev = - virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_IO_ERROR, + virDomainEventNewInternal(event, obj->def->id, obj->def->name, obj->def->uuid); if (ev) { ev->data.ioError.action = action; if (!(ev->data.ioError.srcPath = strdup(srcPath)) || - !(ev->data.ioError.devAlias = strdup(devAlias))) { + !(ev->data.ioError.devAlias = strdup(devAlias)) || + !(ev->data.ioError.reason = strdup(reason))) { virDomainEventFree(ev); ev = NULL; } @@ -671,6 +680,48 @@ virDomainEventPtr virDomainEventIOErrorNewFromObj(virDomainObjPtr obj, return ev; } +virDomainEventPtr virDomainEventIOErrorNewFromDom(virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action) +{ + return virDomainEventIOErrorNewFromDomImpl(VIR_DOMAIN_EVENT_ID_IO_ERROR, + dom, srcPath, devAlias, + action, NULL); +} + +virDomainEventPtr virDomainEventIOErrorNewFromObj(virDomainObjPtr obj, + const char *srcPath, + const char *devAlias, + int action) +{ + return virDomainEventIOErrorNewFromObjImpl(VIR_DOMAIN_EVENT_ID_IO_ERROR, + obj, srcPath, devAlias, + action, NULL); +} + +virDomainEventPtr virDomainEventIOErrorReasonNewFromDom(virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + const char *reason) +{ + return virDomainEventIOErrorNewFromDomImpl(VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + dom, srcPath, devAlias, + action, reason); +} + +virDomainEventPtr virDomainEventIOErrorReasonNewFromObj(virDomainObjPtr obj, + const char *srcPath, + const char *devAlias, + int action, + const char *reason) +{ + return virDomainEventIOErrorNewFromObjImpl(VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + obj, srcPath, devAlias, + action, reason); +} + virDomainEventPtr virDomainEventGraphicsNewFromDom(virDomainPtr dom, int phase, @@ -853,6 +904,15 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn, cbopaque); break; + case VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON: + ((virConnectDomainEventIOErrorReasonCallback)cb)(conn, dom, + event->data.ioError.srcPath, + event->data.ioError.devAlias, + event->data.ioError.action, + event->data.ioError.reason, + cbopaque); + break; + case VIR_DOMAIN_EVENT_ID_GRAPHICS: ((virConnectDomainEventGraphicsCallback)cb)(conn, dom, event->data.graphics.phase, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index f72ac58..e28293d 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -129,6 +129,16 @@ virDomainEventPtr virDomainEventIOErrorNewFromObj(virDomainObjPtr obj, const char *srcPath, const char *devAlias, int action); +virDomainEventPtr virDomainEventIOErrorReasonNewFromDom(virDomainPtr dom, + const char *srcPath, + const char *devAlias, + int action, + const char *reason); +virDomainEventPtr virDomainEventIOErrorReasonNewFromObj(virDomainObjPtr obj, + const char *srcPath, + const char *devAlias, + int action, + const char *reason); virDomainEventPtr virDomainEventGraphicsNewFromDom(virDomainPtr dom, int phase, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 746327d..09f3da1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -246,6 +246,8 @@ virDomainEventWatchdogNewFromDom; virDomainEventWatchdogNewFromObj; virDomainEventIOErrorNewFromDom; virDomainEventIOErrorNewFromObj; +virDomainEventIOErrorReasonNewFromDom; +virDomainEventIOErrorReasonNewFromObj; virDomainEventGraphicsNewFromDom; virDomainEventGraphicsNewFromObj; virDomainEventFree; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c2902ac..52f2df8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1015,10 +1015,12 @@ static int qemuHandleDomainIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, const char *diskAlias, - int action) + int action, + const char *reason) { struct qemud_driver *driver = qemu_driver; virDomainEventPtr ioErrorEvent = NULL; + virDomainEventPtr ioErrorEvent2 = NULL; virDomainEventPtr lifecycleEvent = NULL; const char *srcPath; const char *devAlias; @@ -1036,6 +1038,7 @@ qemuHandleDomainIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } ioErrorEvent = virDomainEventIOErrorNewFromObj(vm, srcPath, devAlias, action); + ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, srcPath, devAlias, action, reason); if (action == VIR_DOMAIN_EVENT_IO_ERROR_PAUSE && vm->state == VIR_DOMAIN_RUNNING) { @@ -1051,10 +1054,12 @@ qemuHandleDomainIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } virDomainObjUnlock(vm); - if (ioErrorEvent || lifecycleEvent) { + if (ioErrorEvent || ioErrorEvent2 || lifecycleEvent) { qemuDriverLock(driver); if (ioErrorEvent) qemuDomainEventQueue(driver, ioErrorEvent); + if (ioErrorEvent2) + qemuDomainEventQueue(driver, ioErrorEvent2); if (lifecycleEvent) qemuDomainEventQueue(driver, lifecycleEvent); qemuDriverUnlock(driver); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5e83afc..fca8590 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -833,7 +833,8 @@ int qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action) int qemuMonitorEmitIOError(qemuMonitorPtr mon, const char *diskAlias, - int action) + int action, + const char *reason) { int ret = -1; VIR_DEBUG("mon=%p", mon); @@ -841,7 +842,7 @@ int qemuMonitorEmitIOError(qemuMonitorPtr mon, qemuMonitorRef(mon); qemuMonitorUnlock(mon); if (mon->cb && mon->cb->domainIOError) - ret = mon->cb->domainIOError(mon, mon->vm, diskAlias, action); + ret = mon->cb->domainIOError(mon, mon->vm, diskAlias, action, reason); qemuMonitorLock(mon); qemuMonitorUnref(mon); return ret; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index ec848a8..3fa83b7 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -95,7 +95,8 @@ struct _qemuMonitorCallbacks { int (*domainIOError)(qemuMonitorPtr mon, virDomainObjPtr vm, const char *diskAlias, - int action); + int action, + const char *reason); int (*domainGraphics)(qemuMonitorPtr mon, virDomainObjPtr vm, int phase, @@ -148,7 +149,8 @@ int qemuMonitorEmitRTCChange(qemuMonitorPtr mon, long long offset); int qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action); int qemuMonitorEmitIOError(qemuMonitorPtr mon, const char *diskAlias, - int action); + int action, + const char *reason); int qemuMonitorEmitGraphics(qemuMonitorPtr mon, int phase, int localFamily, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 09a3562..8c77ab1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -534,7 +534,7 @@ static void qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr dat actionID = VIR_DOMAIN_EVENT_IO_ERROR_NONE; } - qemuMonitorEmitIOError(mon, device, actionID); + qemuMonitorEmitIOError(mon, device, actionID, ""); } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e589f8e..317125f 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7430,6 +7430,37 @@ remoteDomainReadEventIOError(virConnectPtr conn, XDR *xdr) static virDomainEventPtr +remoteDomainReadEventIOErrorReason(virConnectPtr conn, XDR *xdr) +{ + remote_domain_event_io_error_reason_msg msg; + virDomainPtr dom; + virDomainEventPtr event = NULL; + memset (&msg, 0, sizeof msg); + + /* unmarshall parameters, and process it*/ + if (! xdr_remote_domain_event_io_error_reason_msg(xdr, &msg) ) { + remoteError(VIR_ERR_RPC, "%s", + _("unable to demarshall reboot event")); + return NULL; + } + + dom = get_nonnull_domain(conn,msg.dom); + if (!dom) + return NULL; + + event = virDomainEventIOErrorReasonNewFromDom(dom, + msg.srcPath, + msg.devAlias, + msg.action, + msg.reason); + xdr_free ((xdrproc_t) &xdr_remote_domain_event_io_error_reason_msg, (char *) &msg); + + virDomainFree(dom); + return event; +} + + +static virDomainEventPtr remoteDomainReadEventGraphics(virConnectPtr conn, XDR *xdr) { remote_domain_event_graphics_msg msg; @@ -9327,6 +9358,10 @@ processCallDispatchMessage(virConnectPtr conn, struct private_data *priv, event = remoteDomainReadEventIOError(conn, xdr); break; + case REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON: + event = remoteDomainReadEventIOErrorReason(conn, xdr); + break; + case REMOTE_PROC_DOMAIN_EVENT_GRAPHICS: event = remoteDomainReadEventGraphics(conn, xdr); break; diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c index 71eed42..187281d 100644 --- a/src/remote/remote_protocol.c +++ b/src/remote/remote_protocol.c @@ -3290,6 +3290,23 @@ xdr_remote_domain_event_io_error_msg (XDR *xdrs, remote_domain_event_io_error_ms } bool_t +xdr_remote_domain_event_io_error_reason_msg (XDR *xdrs, remote_domain_event_io_error_reason_msg *objp) +{ + + if (!xdr_remote_nonnull_domain (xdrs, &objp->dom)) + return FALSE; + if (!xdr_remote_nonnull_string (xdrs, &objp->srcPath)) + return FALSE; + if (!xdr_remote_nonnull_string (xdrs, &objp->devAlias)) + return FALSE; + if (!xdr_int (xdrs, &objp->action)) + return FALSE; + if (!xdr_remote_nonnull_string (xdrs, &objp->reason)) + return FALSE; + return TRUE; +} + +bool_t xdr_remote_domain_event_graphics_address (XDR *xdrs, remote_domain_event_graphics_address *objp) { diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h index 8c4291f..6f01da7 100644 --- a/src/remote/remote_protocol.h +++ b/src/remote/remote_protocol.h @@ -1864,6 +1864,15 @@ struct remote_domain_event_io_error_msg { }; typedef struct remote_domain_event_io_error_msg remote_domain_event_io_error_msg; +struct remote_domain_event_io_error_reason_msg { + remote_nonnull_domain dom; + remote_nonnull_string srcPath; + remote_nonnull_string devAlias; + int action; + remote_nonnull_string reason; +}; +typedef struct remote_domain_event_io_error_reason_msg remote_domain_event_io_error_reason_msg; + struct remote_domain_event_graphics_address { int family; remote_nonnull_string node; @@ -2206,6 +2215,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_REVERT_TO_SNAPSHOT = 192, REMOTE_PROC_DOMAIN_SNAPSHOT_DELETE = 193, REMOTE_PROC_DOMAIN_GET_BLOCK_INFO = 194, + REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195, }; typedef enum remote_procedure remote_procedure; @@ -2541,6 +2551,7 @@ extern bool_t xdr_remote_domain_event_reboot_msg (XDR *, remote_domain_event_re extern bool_t xdr_remote_domain_event_rtc_change_msg (XDR *, remote_domain_event_rtc_change_msg*); extern bool_t xdr_remote_domain_event_watchdog_msg (XDR *, remote_domain_event_watchdog_msg*); extern bool_t xdr_remote_domain_event_io_error_msg (XDR *, remote_domain_event_io_error_msg*); +extern bool_t xdr_remote_domain_event_io_error_reason_msg (XDR *, remote_domain_event_io_error_reason_msg*); extern bool_t xdr_remote_domain_event_graphics_address (XDR *, remote_domain_event_graphics_address*); extern bool_t xdr_remote_domain_event_graphics_identity (XDR *, remote_domain_event_graphics_identity*); extern bool_t xdr_remote_domain_event_graphics_msg (XDR *, remote_domain_event_graphics_msg*); @@ -2873,6 +2884,7 @@ extern bool_t xdr_remote_domain_event_reboot_msg (); extern bool_t xdr_remote_domain_event_rtc_change_msg (); extern bool_t xdr_remote_domain_event_watchdog_msg (); extern bool_t xdr_remote_domain_event_io_error_msg (); +extern bool_t xdr_remote_domain_event_io_error_reason_msg (); extern bool_t xdr_remote_domain_event_graphics_address (); extern bool_t xdr_remote_domain_event_graphics_identity (); extern bool_t xdr_remote_domain_event_graphics_msg (); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index ae306d2..8000ee0 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1659,6 +1659,14 @@ struct remote_domain_event_io_error_msg { int action; }; +struct remote_domain_event_io_error_reason_msg { + remote_nonnull_domain dom; + remote_nonnull_string srcPath; + remote_nonnull_string devAlias; + int action; + remote_nonnull_string reason; +}; + struct remote_domain_event_graphics_address { int family; remote_nonnull_string node; @@ -1996,7 +2004,8 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_SNAPSHOT_CURRENT = 191, REMOTE_PROC_DOMAIN_REVERT_TO_SNAPSHOT = 192, REMOTE_PROC_DOMAIN_SNAPSHOT_DELETE = 193, - REMOTE_PROC_DOMAIN_GET_BLOCK_INFO = 194 + REMOTE_PROC_DOMAIN_GET_BLOCK_INFO = 194, + REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195 /* * Notice how the entries are grouped in sets of 10 ? -- 1.6.6.1

2 1

[libvirt] [PATCH v2] nwfilter: Also pick IP address from a DHCP ACK message
by Stefan Berger 30 Apr '10

30 Apr '10

The local DHCP server on virtbr0 sends DHCP ACK messages when a VM is started and requests an IP address while the initial DHCP lease on the VM's MAC address hasn't expired. So, also pick the IP address of the VM if that type of message is seen. Thanks to Gerhard Stenzel for providing a test case for this. Changes from V1 to V2: - cleanup: replacing DHCP option numbers through constants Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_learnipaddr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -98,6 +98,11 @@ struct dhcp { } ATTRIBUTE_PACKED; #define DHCP_MSGT_DHCPOFFER 2 +#define DHCP_MSGT_DHCPACK 5 + + +#define DHCP_OPT_BCASTADDRESS 28 +#define DHCP_OPT_MESSAGETYPE 53 struct ether_vlan_header { @@ -336,17 +341,18 @@ procDHCPOpts(struct dhcp *dhcp, int dhcp switch (dhcpopt->code) { - case 28: /* Broadcast address */ + case DHCP_OPT_BCASTADDRESS: /* Broadcast address */ if (dhcp_opts_len >= 6) { uint32_t *tmp = (uint32_t *)&dhcpopt->value; (*bcastaddr) = ntohl(*tmp); } break; - case 53: /* Message type */ + case DHCP_OPT_MESSAGETYPE: /* Message type */ if (dhcp_opts_len >= 3) { uint8_t *val = (uint8_t *)&dhcpopt->value; switch (*val) { + case DHCP_MSGT_DHCPACK: case DHCP_MSGT_DHCPOFFER: *vmaddr = dhcp->yiaddr; *howDetected = DETECT_DHCP;

2 2

[libvirt] [PATCH] Ignore qemu STOP event when stopping CPUs
by jdenemar＠redhat.com 30 Apr '10

30 Apr '10

From: Jiri Denemark <jdenemar(a)redhat.com> With JSON qemu monitor, we get a STOP event from qemu whenever qemu stops guests CPUs. The downside of it is that vm->state is changed to PAUSED and a new generic paused event is send to applications. However, when we ask qemu to stop the CPUs we are not really interested in qemu event and we usually want to issue a more specific event. By setting vm->status to PAUSED before actually sending the request to qemu (and resetting it back if the request fails) we can ignore the event since the event handler does nothing when the guest is already paused. This solution is quite hacky but unfortunately it's the best solution which I was able to come up with and it doesn't introduce a race condition. --- src/qemu/qemu_driver.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3c4876e..8ccf0b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4117,13 +4117,16 @@ static int qemudDomainSuspend(virDomainPtr dom) { } if (vm->state != VIR_DOMAIN_PAUSED) { int rc; + int state = vm->state; + vm->state = VIR_DOMAIN_PAUSED; qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorStopCPUs(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); - if (rc < 0) + if (rc < 0) { + vm->state = state; goto endjob; - vm->state = VIR_DOMAIN_PAUSED; + } event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); @@ -4491,8 +4494,10 @@ qemuDomainMigrateOffline(struct qemud_driver *driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + int state = vm->state; int ret; + vm->state = VIR_DOMAIN_PAUSED; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorStopCPUs(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); @@ -4500,13 +4505,13 @@ qemuDomainMigrateOffline(struct qemud_driver *driver, if (ret == 0) { virDomainEventPtr event; - vm->state = VIR_DOMAIN_PAUSED; event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); if (event) qemuDomainEventQueue(driver, event); - } + } else + vm->state = state; return ret; } @@ -4743,13 +4748,14 @@ static int qemudDomainSaveFlag(virDomainPtr dom, const char *path, /* Pause */ if (vm->state == VIR_DOMAIN_RUNNING) { header.was_running = 1; + vm->state = VIR_DOMAIN_PAUSED; qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorStopCPUs(priv->mon) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); + vm->state = VIR_DOMAIN_RUNNING; goto endjob; } qemuDomainObjExitMonitorWithDriver(driver, vm); - vm->state = VIR_DOMAIN_PAUSED; } /* Get XML for the domain */ @@ -5167,9 +5173,11 @@ static int qemudDomainCoreDump(virDomainPtr dom, /* Pause domain for non-live dump */ if (!(flags & VIR_DUMP_LIVE) && vm->state == VIR_DOMAIN_RUNNING) { + vm->state = VIR_DOMAIN_PAUSED; qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorStopCPUs(priv->mon) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); + vm->state = VIR_DOMAIN_RUNNING; goto endjob; } qemuDomainObjExitMonitorWithDriver(driver, vm); @@ -5214,6 +5222,7 @@ endjob: "%s", _("resuming after dump failed")); } qemuDomainObjExitMonitorWithDriver(driver, vm); + vm->state = VIR_DOMAIN_RUNNING; } if (qemuDomainObjEndJob(vm) == 0) @@ -11056,12 +11065,16 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, /* qemu unconditionally starts the domain running again after * loadvm, so let's pause it to keep consistency */ + int state = vm->state; priv = vm->privateData; + vm->state = VIR_DOMAIN_PAUSED; qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorStopCPUs(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); - if (rc < 0) + if (rc < 0) { + vm->state = state; goto cleanup; + } } event = virDomainEventNewFromObj(vm, -- 1.7.0.4

5 7

[libvirt] 'dommemstat' is not working for LXC hypervisor.
by Kumar L Srikanth-B22348 30 Apr '10

30 Apr '10

Hi Daniel, I am using libvirt version 0.8.0. I created a domain 'srikanth_vm' using 'lxc' hypervisor. I am able to start the Domain. But, I am not able to get the memory stats for that Domain. If I issue 'dommemstat Srikanth_vm' in the virsh console, the following error is throwing: error: Failed to get memory statistics for domain srikanth_vm error: this function is not supported by the hypervisor: virDomainMemoryStats Can you please let me know, how can I get memory stats for a particular domain in libvirt? Regards, Srikanth.

3 15

[libvirt] [PATCH] Fix virt-pki-validate's determination of CN
by Dustin Kirkland 30 Apr '10

30 Apr '10

Fix virt-pki-validate's determination of CN This patch is a follow-up to: cb06a9bfe529e64b15773cb86781ae14c09f8216 "portability fixes to tools/virt-pki-validate.in" addressing Eric Blake's concerns about the regular expression. Ubuntu's gntls package generates an Issuer line that looks like this: Issuer: C=US,ST=NY,L=Rochester,O=example.com,CN=example.com CA,EMAIL=hostmaster(a)example.com While Red Hat's looks like this Issuer: CN=Red Hat Emerging Technologies Note the leading whitespace, and the additional fields in the former. This patch updates the regular expression to: * trim leading characters before "Issuer:" * trim anything between Issuer: and CN= * trim anything after the next , I've tested this against the certool output of both RH and Ubuntu generated certs. I know that Eric dislikes the leading grep. My apologies. I spent more time than I care to admit trying to get sed to select that one line, and then run two regexes against it. Feel free to correct this patch and educate me, if you have a better way. Thanks! Signed-off-by: Dustin Kirkland <kirkland(a)canonical.com> diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index f77521d..c44aa9d 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -130,7 +130,7 @@ then echo "as root do: chmod 644 $CA/cacert.pem" exit 1 fi -ORG=`$CERTOOL -i --infile $CA/cacert.pem | sed -n '/Issuer/ s+Issuer: CN=++p'` +ORG=`$CERTOOL -i --infile $CA/cacert.pem | grep "Issuer:" | sed -e 's/^.*Issuer:.*CN=//' -e 's/,.*$//'` if [ "$ORG" = "" ] then echo the CA certificate $CA/cacert.pem does not define the organization

2 4

[libvirt] [v2 0/3] Fixes related to the IP address learning thread
by Stefan Berger 30 Apr '10

30 Apr '10

The following set of patches are primarily related to the thread learning the IP address of a VM and deal with: - ebtables cleanup before applying basic filtering rules that are active while the IP address is detected - shutting down all traffic in case the filtering rules could not be applied by the thread - serialization of the teardown of eb/ip/ip6tables rules to occurr after the IP address learning thread has terminated - not to apply or tear any eb/ip/ip6tables rules of a VM's interface while the IP address learning thread is active. This may be due to a filter being updated concurrently using for exampe 'virsh define/edit'. Regards, Stefan

1 3

[libvirt] [PATCH] qemudDomainSaveFlag: remove dead store
by Jim Meyering 30 Apr '10

30 Apr '10

Clang spotted a new (albeit harmless) dead store: >From 0e37c524fb9c62d9b16443d6ff081c977963f4c5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 29 Apr 2010 17:56:01 +0200 Subject: [PATCH] qemudDomainSaveFlag: remove dead store * src/qemu/qemu_driver.c (qemudDomainSaveFlag): Remove dead store to "rc". --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6ee5cc2..8c5d745 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4818,7 +4818,7 @@ static int qemudDomainSaveFlag(virDomainPtr dom, const char *path, virReportSystemError(errno, _("unable to open %s"), path); goto endjob; } - if ((rc = qemudDomainSaveFileOpHook(fd, &hdata)) != 0) { + if (qemudDomainSaveFileOpHook(fd, &hdata) != 0) { close(fd); goto endjob; } -- 1.7.1.328.g9993c

2 2

[libvirt] [PATCH 0/5] build: rely more on gnulib
by Eric Blake 30 Apr '10

30 Apr '10

I can't yet upgrade to the latest gnulib due to some LGPLv2+ issues being worked out upstream. But in the meantime, here's some cleanups that will make it easier to upgrade when gnulib is ready. I always like patch series with a net reduction in lines. I suppose I should try to get a mingw or cygwin build finished with these in place, before pushing anything, but that will have to be tomorrow (I tested on Linux, but it's late for me now). bootstrap.conf | 3 +++ configure.ac | 39 +++++++++++++-------------------------- src/Makefile.am | 3 ++- src/libvirt.c | 4 +--- src/nodeinfo.c | 12 ++---------- src/remote/remote_driver.c | 11 ++++------- src/storage/storage_backend.c | 4 +--- src/util/ebtables.c | 7 ++----- src/util/hooks.c | 4 +--- src/util/iptables.c | 7 ++----- src/util/threads.c | 4 ++-- src/util/threads.h | 4 ++-- src/util/util.c | 14 ++++++-------- 13 files changed, 41 insertions(+), 75 deletions(-) [PATCH 1/5] build: rely on gnulib's pthread module [PATCH 2/5] build: replace redundant header check with function check [PATCH 3/5] build: use gnulib's uname [PATCH 4/5] build: use gnulib's sys/wait.h [PATCH 5/5] build: drop more redundant configure checks

4 14

[libvirt] [PATCH] Fix handling of disk backing stores with cgroups
by Daniel P. Berrange 30 Apr '10

30 Apr '10

The cgroups ACL code was only allowing the primary disk image. It is possible to chain images together, so we need to search for backing stores and add them to the ACL too. Since the ACL only handles block devices, we ignore the EINVAL we get from plain files. * src/qemu/qemu_driver.c: Allow backing stores in cgroup ACLs --- src/qemu/qemu_driver.c | 47 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 326cb58..ae6addd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -84,6 +84,7 @@ #include "macvtap.h" #include "nwfilter/nwfilter_gentech_driver.h" #include "hooks.h" +#include "storage_file.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -2957,18 +2958,40 @@ static int qemuSetupCgroup(struct qemud_driver *driver, } for (i = 0; i < vm->def->ndisks ; i++) { - if (vm->def->disks[i]->type != VIR_DOMAIN_DISK_TYPE_BLOCK || - vm->def->disks[i]->src == NULL) - continue; + char *path = vm->def->disks[i]->src; + while (path != NULL) { + virStorageFileMetadata meta; + int ret; + + VIR_DEBUG("Process path %s for disk %d", path, i); + rc = virCgroupAllowDevicePath(cgroup, path); + if (rc != 0) { + /* Get this for non-block devices */ + if (rc == -EINVAL) { + VIR_DEBUG("Ignoring EINVAL for %s", path); + } else { + virReportSystemError(-rc, + _("Unable to allow device %s for %s"), + path, vm->def->name); + if (path != vm->def->disks[i]->src) + VIR_FREE(path); + goto cleanup; + } + } - rc = virCgroupAllowDevicePath(cgroup, - vm->def->disks[i]->src); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to allow device %s for %s"), - vm->def->disks[i]->src, vm->def->name); - goto cleanup; - } + memset(&meta, 0, sizeof(meta)); + + ret = virStorageFileGetMetadata(path, &meta); + + if (path != vm->def->disks[i]->src) + VIR_FREE(path); + path = NULL; + + if (ret < 0) + goto cleanup; + + path = meta.backingStore; + } while (path != NULL); } rc = virCgroupAllowDeviceMajor(cgroup, 'c', DEVICE_PTY_MAJOR); -- 1.6.5.2

2 2

[libvirt] [PATCH v2 0/8]: Add arbitrary qemu command-line and monitor commands
by Chris Lalancette 30 Apr '10

30 Apr '10

As we discussed previously, here is the patch series to add the ability to specify arbitrary qemu command-line parameters and environment variables, and also give arbitrary monitor commands to a guest. Because these extra arguments have a good shot at confusing libvirt, the use of them is not supported, but left available for advanced users and developers. They are also in a separate library and have a separate on-the-wire protocol. There is one bug left that I have not yet been able to fix. Because of the complicated way that virsh parses command-line arguments, it is not possible to pass through spaces and quotes when using the qemu-monitor-command. Unfortunately, the qemu monitor commands (and in particular when using QMP) depend heavily on quoting and spacing, so using virsh to send through command-lines is difficult. I'll have to think about how to better resolve this issue, but it should not hold up the rest of the series. Thanks to Dan Berrange and Eric Blake for their reviews already, and to DV for the Relax NG schema changes. Changes since v1 are listed in the individual patches.

2 10

[libvirt] [PATCH] Report better error if qemuSnapshotIsAllowed failed.
by Chris Lalancette 29 Apr '10

29 Apr '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f7084ca..5ab211a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10782,8 +10782,8 @@ static int qemuDomainSnapshotIsAllowed(virDomainObjPtr vm) (!vm->def->disks[i]->driverType || STRNEQ(vm->def->disks[i]->driverType, "qcow2"))) { qemuReportError(VIR_ERR_OPERATION_INVALID, - _("Disk device '%s' does not support snapshotting"), - vm->def->disks[i]->info.alias); + _("Disk '%s' does not support snapshotting"), + vm->def->disks[i]->src); return 0; } } -- 1.6.6.1

3 3

[libvirt] nwfilter: Also pick IP address from a DHCP ACK message
by Stefan Berger 29 Apr '10

29 Apr '10

The local DHCP server on virtbr0 sends DHCP ACK messages when a VM is started and requests an IP address while the initial DHCP lease on the VM's MAC address hasn't expired. So, also pick the IP address of the VM if that type of message is seen. Thanks to Gerhard Stenzel for providing a test case for this. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -98,6 +98,7 @@ struct dhcp { } ATTRIBUTE_PACKED; #define DHCP_MSGT_DHCPOFFER 2 +#define DHCP_MSGT_DHCPACK 5 struct ether_vlan_header { @@ -347,6 +348,7 @@ procDHCPOpts(struct dhcp *dhcp, int dhcp if (dhcp_opts_len >= 3) { uint8_t *val = (uint8_t *)&dhcpopt->value; switch (*val) { + case DHCP_MSGT_DHCPACK: case DHCP_MSGT_DHCPOFFER: *vmaddr = dhcp->yiaddr; *howDetected = DETECT_DHCP;

1 0

[libvirt] [PATCH] Fix build on Ubuntu.
by Chris Lalancette 29 Apr '10

29 Apr '10

When building on Ubuntu with make -j3 (or more), it would always fail when trying to build virt-aa-helper. I'm not an expert in automake by any means, but I think the entry for virt-aa-helper is mis-using LDADD; it shouldn't be putting direct paths to libvirt_conf.la and libvirt_util.la, but instead referencing those names. With this patch in place, I'm able to successfully build on Ubuntu 9.04 with make -j3. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/Makefile.am | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d8466f0..2531ac5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1005,9 +1005,9 @@ virt_aa_helper_LDFLAGS = $(WARN_CFLAGS) virt_aa_helper_LDADD = \ $(WARN_CFLAGS) \ $(LIBXML_LIBS) \ - @top_srcdir@/src/libvirt_conf.la \ - @top_srcdir@/src/libvirt_util.la \ - @top_srcdir@/gnulib/lib/libgnu.la + libvirt_conf.la \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la virt_aa_helper_CFLAGS = \ -I@top_srcdir@/src/conf \ -I@top_srcdir@/src/security -- 1.6.6.1

2 2

[libvirt] [PATCH] Fix a memory leak in the node_device_udev code
by Chris Lalancette 29 Apr '10

29 Apr '10

We were over-writing a pointer without freeing it in case of a disk device, leading to a memory leak. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/node_device/node_device_udev.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 3a5a7e2..bcfe991 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -815,13 +815,6 @@ static int udevProcessDisk(struct udev_device *device, union _virNodeDevCapData *data = &def->caps->data; int ret = 0; - data->storage.drive_type = strdup("disk"); - if (data->storage.drive_type == NULL) { - virReportOOMError(); - ret = -1; - goto out; - } - if (udevGetUint64SysfsAttr(device, "size", &data->storage.num_blocks) == PROPERTY_ERROR) { -- 1.6.6.1

2 2

[libvirt] [PATCH] Fix a qemuDomainPCIAddressSetFree memory leak
by Chris Lalancette 29 Apr '10

29 Apr '10

qemuDomainPCIAddressSetFree was freeing up the hash table for the pci addresses, but not freeing up the addr structure. Looking over the callers of this function, it seems like they expect it to also free up the structure, so do that here. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ed24916..5fa8c0a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2110,7 +2110,7 @@ void qemuDomainPCIAddressSetFree(qemuDomainPCIAddressSetPtr addrs) return; virHashFree(addrs->used, qemuDomainPCIAddressSetFreeEntry); - addrs->used = NULL; + VIR_FREE(addrs); } -- 1.6.6.1

2 2

[libvirt] [PATCH] nwfilter: python bindings for nwfilter
by Stefan Berger 29 Apr '10

29 Apr '10

I have primarily followed the pattern of the 'secret' driver to provide support for the missing python bindings for the network filter API. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- python/generator.py | 35 ++++++++++- python/libvirt-override-api.xml | 21 ++++++ python/libvirt-override.c | 124 ++++++++++++++++++++++++++++++++++++++++ python/typewrappers.c | 13 ++++ python/typewrappers.h | 9 ++ 5 files changed, 198 insertions(+), 4 deletions(-) Index: libvirt-acl/python/generator.py =================================================================== --- libvirt-acl.orig/python/generator.py +++ libvirt-acl/python/generator.py @@ -175,7 +175,6 @@ skipped_types = { 'virConnectDomainEventIOErrorCallback': "No function types in python", 'virConnectDomainEventGraphicsCallback': "No function types in python", 'virEventAddHandleFunc': "No function types in python", - 'virNWFilterPtr': "No function types in python", } ####################################################################### @@ -237,6 +236,11 @@ py_types = { 'virSecret *': ('O', "virSecret", "virSecretPtr", "virSecretPtr"), 'const virSecret *': ('O', "virSecret", "virSecretPtr", "virSecretPtr"), + 'virNWFilterPtr': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), + 'const virNWFilterPtr': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), + 'virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), + 'const virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"), + 'virStreamPtr': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'const virStreamPtr': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), @@ -308,6 +312,9 @@ skip_impl = ( 'virSecretGetUUID', 'virSecretGetUUIDString', 'virSecretLookupByUUID', + 'virNWFilterGetUUID', + 'virNWFilterGetUUIDString', + 'virNWFilterLookupByUUID', 'virStreamRecv', 'virStreamSend', 'virStoragePoolGetUUID', @@ -361,6 +368,7 @@ skip_function = ( "virNetworkRef", "virNodeDeviceRef", "virSecretRef", + "virNWFilterRef", "virStoragePoolRef", "virStorageVolRef", @@ -371,6 +379,7 @@ skip_function = ( "virInterfaceGetConnect", "virNetworkGetConnect", "virSecretGetConnect", + "virNWFilterGetConnect", "virStoragePoolGetConnect", "virStorageVolGetConnect", ) @@ -643,6 +652,8 @@ classes_type = { "virNodeDevice *": ("._o", "virNodeDevice(self, _obj=%s)", "virNodeDevice"), "virSecretPtr": ("._o", "virSecret(self, _obj=%s)", "virSecret"), "virSecret *": ("._o", "virSecret(self, _obj=%s)", "virSecret"), + "virNWFilterPtr": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), + "virNWFilter *": ("._o", "virNWFilter(self, _obj=%s)", "virNWFilter"), "virStreamPtr": ("._o", "virStream(self, _obj=%s)", "virStream"), "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), @@ -657,7 +668,7 @@ converter_type = { primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", - "virStream", "virDomainSnapshot"] + "virNWFilter", "virStream", "virDomainSnapshot"] classes_ancestor = { } @@ -669,6 +680,7 @@ classes_destructors = { "virStorageVol": "virStorageVolFree", "virNodeDevice" : "virNodeDeviceFree", "virSecret": "virSecretFree", + "virNWFilter": "virNWFilterFree", "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", @@ -691,6 +703,7 @@ functions_noexcept = { 'virNodeDeviceGetParent': True, 'virSecretGetUsageType': True, 'virSecretGetUsageID': True, + 'virNWFilterGetName': True, } reference_keepers = { @@ -756,6 +769,12 @@ def nameFixup(name, classe, type, file): elif name[0:15] == "virSecretLookup": func = name[3:] func = string.lower(func[0:1]) + func[1:] + elif name[0:17] == "virNWFilterDefine": + func = name[3:] + func = string.lower(func[0:3]) + func[3:] + elif name[0:17] == "virNWFilterLookup": + func = name[3:] + func = string.lower(func[0:3]) + func[3:] elif name[0:20] == "virStoragePoolDefine": func = name[3:] func = string.lower(func[0:1]) + func[1:] @@ -813,6 +832,12 @@ def nameFixup(name, classe, type, file): elif name[0:9] == 'virSecret': func = name[9:] func = string.lower(func[0:1]) + func[1:] + elif name[0:14] == 'virNWFilterGet': + func = name[14:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:11] == 'virNWFilter': + func = name[11:] + func = string.lower(func[0:1]) + func[1:] elif name[0:12] == 'virStreamNew': func = "newStream" elif name[0:9] == 'virStream': @@ -1099,7 +1124,8 @@ def buildWrappers(): else: classes.write("class %s:\n" % (classname)) if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", - "virStorageVol", "virNodeDevice", "virSecret","virStream" ]: + "virStorageVol", "virNodeDevice", "virSecret","virStream", + "virNWFilter" ]: classes.write(" def __init__(self, conn, _obj=None):\n") else: classes.write(" def __init__(self, _obj=None):\n") @@ -1108,7 +1134,8 @@ def buildWrappers(): for ref in list: classes.write(" self.%s = None\n" % ref[1]) if classname in [ "virDomain", "virNetwork", "virInterface", - "virNodeDevice", "virSecret", "virStream" ]: + "virNodeDevice", "virSecret", "virStream", + "virNWFilter" ]: classes.write(" self._conn = conn\n") elif classname in [ "virStorageVol", "virStoragePool" ]: classes.write(" self._conn = conn\n" + \ Index: libvirt-acl/python/typewrappers.c =================================================================== --- libvirt-acl.orig/python/typewrappers.c +++ libvirt-acl/python/typewrappers.c @@ -215,6 +215,19 @@ libvirt_virSecretPtrWrap(virSecretPtr no } PyObject * +libvirt_virNWFilterPtrWrap(virNWFilterPtr node) +{ + PyObject *ret; + + if (node == NULL) { + Py_INCREF(Py_None); + return Py_None; + } + ret = PyCObject_FromVoidPtrAndDesc(node, (char *) "virNWFilterPtr", NULL); + return (ret); +} + +PyObject * libvirt_virStreamPtrWrap(virStreamPtr node) { PyObject *ret; Index: libvirt-acl/python/typewrappers.h =================================================================== --- libvirt-acl.orig/python/typewrappers.h +++ libvirt-acl/python/typewrappers.h @@ -91,6 +91,14 @@ typedef struct { virSecretPtr obj; } PyvirSecret_Object; +#define PyvirNWFilter_Get(v) (((v) == Py_None) ? NULL : \ + (((PyvirNWFilter_Object *)(v))->obj)) + +typedef struct { + PyObject_HEAD + virNWFilterPtr obj; +} PyvirNWFilter_Object; + #define PyvirStream_Get(v) (((v) == Py_None) ? NULL : \ (((PyvirStream_Object *)(v))->obj)) @@ -163,6 +171,7 @@ PyObject * libvirt_virFreeCallbackWrap(v PyObject * libvirt_virVoidPtrWrap(void* node); PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node); PyObject * libvirt_virSecretPtrWrap(virSecretPtr node); +PyObject * libvirt_virNWFilterPtrWrap(virNWFilterPtr node); PyObject * libvirt_virStreamPtrWrap(virStreamPtr node); PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node); Index: libvirt-acl/python/libvirt-override.c =================================================================== --- libvirt-acl.orig/python/libvirt-override.c +++ libvirt-acl/python/libvirt-override.c @@ -1957,6 +1957,126 @@ libvirt_virSecretSetValue(PyObject *self } static PyObject * +libvirt_virNWFilterGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + unsigned char uuid[VIR_UUID_BUFLEN]; + virNWFilterPtr nwfilter; + PyObject *pyobj_nwfilter; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"O:virNWFilterGetUUID", &pyobj_nwfilter)) + return(NULL); + nwfilter = (virNWFilterPtr) PyvirNWFilter_Get(pyobj_nwfilter); + + if (nwfilter == NULL) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNWFilterGetUUID(nwfilter, &uuid[0]); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN); + + return(py_retval); +} + +static PyObject * +libvirt_virNWFilterGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virNWFilterPtr nwfilter; + PyObject *pyobj_nwfilter; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"O:virNWFilterGetUUIDString", + &pyobj_nwfilter)) + return(NULL); + nwfilter = (virNWFilterPtr) PyvirNWFilter_Get(pyobj_nwfilter); + + if (nwfilter == NULL) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNWFilterGetUUIDString(nwfilter, &uuidstr[0]); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + py_retval = PyString_FromString((char *) &uuidstr[0]); + return(py_retval); +} + +static PyObject * +libvirt_virNWFilterLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + virNWFilterPtr c_retval; + virConnectPtr conn; + PyObject *pyobj_conn; + unsigned char * uuid; + int len; + + if (!PyArg_ParseTuple(args, (char *)"Oz#:virNWFilterLookupByUUID", &pyobj_conn, &uuid, &len)) + return(NULL); + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + if ((uuid == NULL) || (len != VIR_UUID_BUFLEN)) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNWFilterLookupByUUID(conn, uuid); + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_virNWFilterPtrWrap((virNWFilterPtr) c_retval); + return(py_retval); +} + + +static PyObject * +libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char **uuids = NULL; + virConnectPtr conn; + int c_retval, i; + PyObject *pyobj_conn; + + if (!PyArg_ParseTuple(args, (char *)"O:virConnectListNWFilters", &pyobj_conn)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virConnectNumOfNWFilters(conn); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + + if (c_retval) { + uuids = malloc(sizeof(*uuids) * c_retval); + if (!uuids) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virConnectListNWFilters(conn, uuids, c_retval); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { + free(uuids); + return VIR_PY_NONE; + } + } + py_retval = PyList_New(c_retval); + + if (uuids) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(uuids[i])); + free(uuids[i]); + } + free(uuids); + } + + return py_retval; +} + +static PyObject * libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; @@ -3316,6 +3436,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectListSecrets", libvirt_virConnectListSecrets, METH_VARARGS, NULL}, {(char *) "virSecretGetValue", libvirt_virSecretGetValue, METH_VARARGS, NULL}, {(char *) "virSecretSetValue", libvirt_virSecretSetValue, METH_VARARGS, NULL}, + {(char *) "virNWFilterGetUUID", libvirt_virNWFilterGetUUID, METH_VARARGS, NULL}, + {(char *) "virNWFilterGetUUIDString", libvirt_virNWFilterGetUUIDString, METH_VARARGS, NULL}, + {(char *) "virNWFilterLookupByUUID", libvirt_virNWFilterLookupByUUID, METH_VARARGS, NULL}, + {(char *) "virConnectListNWFilters", libvirt_virConnectListNWFilters, METH_VARARGS, NULL}, {(char *) "virConnectListInterfaces", libvirt_virConnectListInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectBaselineCPU", libvirt_virConnectBaselineCPU, METH_VARARGS, NULL}, Index: libvirt-acl/python/libvirt-override-api.xml =================================================================== --- libvirt-acl.orig/python/libvirt-override-api.xml +++ libvirt-acl/python/libvirt-override-api.xml @@ -226,6 +226,27 @@ <return type='char *' info='the UUID string or None in case of error'/> <arg name='secret' type='virSecretPtr' info='a secret object'/> </function> + <function name='virConnectListNWFilters' file='libvirt' module='libvirt'> + <info>List the defined network filters</info> + <arg name='conn' type='virConnectPtr' info='virConnect connection'/> + <return type='str *' info='the list of network filter IDs or None in case of error'/> + </function> + <function name='virNWFilterLookupByUUID' file='python'> + <info>Try to lookup a network filter on the given hypervisor based on its UUID.</info> + <return type='virNWFilterPtr' info='a new network filter object or NULL in case of failure'/> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <arg name='uuid' type='const unsigned char *' info='the UUID string for the secret, must be 16 bytes'/> + </function> + <function name='virNWFilterGetUUID' file='python'> + <info>Extract the UUID unique Identifier of a network filter.</info> + <return type='char *' info='the 16 bytes string or None in case of error'/> + <arg name='nwfilter' type='virNWFilterPtr' info='a network filter object'/> + </function> + <function name='virNWFilterGetUUIDString' file='python'> + <info>Fetch globally unique ID of the network filter as a string.</info> + <return type='char *' info='the UUID string or None in case of error'/> + <arg name='nwfilter' type='virNWFilterPtr' info='a network filter object'/> + </function> <function name='virConnectListInterfaces' file='python'> <info>list the running interfaces, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>

2 2

[libvirt] FW: Creating multiple network interfaces in libvirt Domain.
by Kumar L Srikanth-B22348 29 Apr '10

29 Apr '10

Hi All, Can anybody please help me in the issue? Regards, Srikanth. From: Kumar L Srikanth-B22348 Sent: Wednesday, April 28, 2010 4:47 PM To: 'Daniel P. Berrange' Subject: FW: Creating multiple network interfaces in libvirt Domain. Also, can you please let me know, how can I create multiple interfaces in the guest domain using Domain XML? Regards, Srikanth. From: Kumar L Srikanth-B22348 Sent: Wednesday, April 28, 2010 2:26 PM To: 'berrange(a)redhat.com' Cc: 'libvir-list(a)redhat.com' Subject: Creating multiple network interfaces in libvirt Domain. Hi, I want to create a Domain with two interfaces. I am using LXC hypervisor in the libvirt. My domain XML is shown below: <domain type='lxc' id='1'> <name>srikanth_vm2</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/sh</init> </os> <vcpu>1</vcpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/root/lxc/fedora1'/> <target dir='/'/> </filesystem> <interface type='network'> <source network='default'/> </interface> <interface type='network'> <source network='default'/> </interface> <console type='pty' /> </devices> </domain> I am able to define the Domain. But, I am not able to start the Domain. While starting the domain, I am getting the following error: error: Failed to start domain srikanth_vm2 error: internal error Failed to create veth device pair: 512 Can you please let me know where I am going wrong? Regards, Srikanth.

1 0

[libvirt] [PATCH] cygwin/mingw: Fix version script handling
by Matthias Bolte 29 Apr '10

29 Apr '10

Let configure detect ld instead of hardcoding /usr/bin/ld, because MinGW may have ld in /bin. Only use a .def file to export symbols on MinGW. Cygwin's ld supports the normal .syms file used on Linux. --- configure.ac | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 955a9e9..7121c3e 100644 --- a/configure.ac +++ b/configure.ac @@ -73,9 +73,10 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL AM_PROG_CC_C_O +AM_PROG_LD VERSION_SCRIPT_FLAGS=-Wl,--version-script= -`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \ +`$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," AC_SUBST(VERSION_SCRIPT_FLAGS) @@ -1804,9 +1805,17 @@ case "$host" in if test "x$enable_shared" = "xno"; then WIN32_EXTRA_CFLAGS="-DLIBVIRT_STATIC" fi +esac +case "$host" in + *-*-mingw* | *-*-msvc* ) # Also set the symbol file to .def, so src/Makefile generates libvirt.def # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the linker LIBVIRT_SYMBOL_FILE=libvirt.def + # mingw's ld has the --version-script parameter, but it requires a .def file + # instead to work properly, therefore clear --version-script here + # cygwin's ld has the --version-script parameter too, but for some reason + # it's working there as expected + VERSION_SCRIPT_FLAGS= ;; esac AC_SUBST([CYGWIN_EXTRA_LDFLAGS]) -- 1.6.3.3

2 2

[libvirt] new NULL-dereference in qemu_driver.c
by Jim Meyering 29 Apr '10

29 Apr '10

I ran clang on the very latest and it spotted this problem: >From qemu_driver.c, around line 11100, else { /* qemu is a little funny with running guests and the restoration * of snapshots. If the snapshot was taken online, * then after a "loadvm" monitor command, the VM is set running * again. If the snapshot was taken offline, then after a "loadvm" * monitor command the VM is left paused. Unpausing it leads to * the memory state *before* the loadvm with the disk *after* the * loadvm, which obviously is bound to corrupt something. * Therefore we destroy the domain and set it to "off" in this case. */ if (virDomainObjIsActive(vm)) { qemudShutdownVMDaemon(driver, vm); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); if (!vm->persistent) { if (qemuDomainObjEndJob(vm) > 0) virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } } if (qemuDomainSnapshotSetActive(vm, driver->snapshotDir) < 0) goto endjob; } vm->state = snap->def->state; ret = 0; endjob: if (vm && qemuDomainObjEndJob(vm) == 0) vm = NULL; Note how "vm" is set to NULL. Then, it can be dereferenced both via qemuDomainSnapshotSetActive and via the vm->state = ... assignment.

3 7

[libvirt] [PATCH TCK] Add a test for QCow2 files with a backing store
by Daniel P. Berrange 29 Apr '10

29 Apr '10

This test case verifies that it is possible to run QEMU guest from a qcow2 file with a backing store pointing to a physical disk. This verifies backing store handling with SELinux, UID/GID changing code and CGroups ACLs * scripts/qemu/150-disk-backingstore.t: New test case * lib/Sys/Virt/TCK/StorageVolBuilder.pm: Allow volume backing store to be set in XML --- lib/Sys/Virt/TCK/StorageVolBuilder.pm | 14 +++++ scripts/qemu/150-disk-backingstore.t | 97 +++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 0 deletions(-) create mode 100644 scripts/qemu/150-disk-backingstore.t diff --git a/lib/Sys/Virt/TCK/StorageVolBuilder.pm b/lib/Sys/Virt/TCK/StorageVolBuilder.pm index 00680ed..2772d51 100644 --- a/lib/Sys/Virt/TCK/StorageVolBuilder.pm +++ b/lib/Sys/Virt/TCK/StorageVolBuilder.pm @@ -68,6 +68,14 @@ sub secret { return $self; } +sub backing_store { + my $self = shift; + + $self->{backingStore} = shift; + + return $self; +} + sub as_xml { my $self = shift; @@ -95,6 +103,12 @@ sub as_xml { $w->endTag("target"); } + if ($self->{backingStore}) { + $w->startTag("backingStore"); + $w->dataElement("path", $self->{backingStore}); + $w->endTag("backingStore"); + } + $w->endTag("volume"); return $data; diff --git a/scripts/qemu/150-disk-backingstore.t b/scripts/qemu/150-disk-backingstore.t new file mode 100644 index 0000000..62d8faf --- /dev/null +++ b/scripts/qemu/150-disk-backingstore.t @@ -0,0 +1,97 @@ +# -*- perl -*- +# +# Copyright (C) 2009-2010 Red Hat, Inc. +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +qemu/150-disk-backingstore.t - qcow2 image with a backing store on physical disk + +=head1 DESCRIPTION + +The test case validates that a guest can be booted from a +qcow2 file with a backing store pointing to a physical disk. +This verifies that SELinux labelling, uid/gid changes and +cgroups ACL setup is working correctly with backing stores + +=cut + +use strict; +use warnings; + +use Test::More tests => 8; + +use Sys::Virt::TCK; +use Test::Exception; +use File::Spec::Functions qw(catfile); + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +my $dev = $tck->get_host_block_device(); + +SKIP: { + skip "no block device available", 8 unless $dev; + skip "Only relevant to QEMU driver", 8 unless $conn->get_type() eq "QEMU"; + + ok(-b $dev, "$dev is a block device"); + + my $dir = $tck->bucket_dir("150-disk-backingstore"); + my $disk = catfile($dir, "demo.qcow2"); + + my $poolXML = Sys::Virt::TCK::StoragePoolBuilder->new() + ->source_dir($dir)->target($dir)->as_xml(); + + my $pool; + + diag "Creating pool $poolXML"; + lives_ok(sub { $pool = $conn->create_storage_pool($poolXML) }, "pool created"); + + + my $volXML = Sys::Virt::TCK::StorageVolBuilder->new(name => "demo.qcow2") + ->capacity(1024*1024*1024) + ->format("qcow2") + ->backing_store($dev) + ->as_xml(); + + my $vol; + + diag "Creating volume $volXML"; + lives_ok(sub { $vol = $pool->create_volume($volXML) }, "volume created"); + + my $xml = $tck->generic_domain("tck") + ->disk(format => ["qemu", "qcow2"], + type => "file", + src => $disk, + dst => "hdb") + ->as_xml; + + diag "Creating a transient guest with config $xml"; + my $dom; + ok_domain(sub { $dom = $conn->create_domain($xml) }, "started transient domain config"); + + ok($dom->get_id() > 0, "running domain has an ID > 0"); + + diag "Trying another domain lookup by name"; + my $dom1; + ok_domain(sub { $dom1 = $conn->get_domain_by_name("tck") }, "the running domain object"); + ok($dom1->get_id() > 0, "running domain has an ID > 0"); + + + diag "Destroying the running domain"; + $dom->destroy(); + + ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); +} -- 1.6.5.2

2 2

[libvirt] [PATCH 0/4] Multiple problems with saving to block devices (v2)
by Daniel P. Berrange 29 Apr '10

29 Apr '10

Update of https://www.redhat.com/archives/libvir-list/2010-April/msg00912.html Changes this time: - Pad header/xml to multiple of 512 - Set dd block size & seek as a muliplier of that - Invert check for block dev, to check for regular file instead

3 12

[libvirt] [PATCH 0/6]: Add a API for query domain disk sizing info (v2)
by Daniel P. Berrange 29 Apr '10

29 Apr '10

A second version of: https://www.redhat.com/archives/libvir-list/2010-April/msg01248.html In this series - Add python binding - Add virsh.pod entry - Fix help text in virsh.c command description - Document flags parameter in libvirt.c

3 12

[libvirt] [PATCH] Fix detection of disk in IO events
by Daniel P. Berrange 29 Apr '10

29 Apr '10

When using -device syntax, the IO event will have a different prefix, 'drive-' that needs to be skipped over before matching against the libvirt disk alias * src/qemu/qemu_driver.c: Skip QEMU_DRIVE_HOST_PREFIX in IO event --- src/qemu/qemu_driver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3e0a38a..9434e00 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -763,6 +763,9 @@ findDomainDiskByAlias(virDomainObjPtr vm, { int i; + if (STRPREFIX(alias, QEMU_DRIVE_HOST_PREFIX)) + alias += strlen(QEMU_DRIVE_HOST_PREFIX); + for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk; -- 1.6.6.1

2 1

[libvirt] [PATCH 0/3] Add dnsmasq module (v2)
by Satoru SATOH 29 Apr '10

29 Apr '10

The following series of patches is a prototype implementation of dnsmasq module. It implements an idea to save dhcp hosts' macaddr vs. ipaddr mappings to static file and make dnsmasq loading it with "--dhcp-hostsfile" option, originally suggested by Dan-san, and can address the problem that too many "--dhcp-host" args hitting ARG_MAX limit I reported last year [1]. This is a updated version reflecting some advices from Jim-san [2] and Eric-san [3]. [1] https://www.redhat.com/archives/libvir-list/2009-October/msg00216.html [2] https://www.redhat.com/archives/libvir-list/2010-April/msg00849.html [3] https://www.redhat.com/archives/libvir-list/2010-April/msg00850.html - satoru

4 15

[libvirt] [PATCH] nwfilter: allow to mix filterrefs and rules in the schema
by Stefan Berger 28 Apr '10

28 Apr '10

So far the references to other filters needed to appear before filtering rules. With the below patch they can now appear in any order. Also I forgot to add a couple of 'rarp's. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- docs/schemas/nwfilter.rng | 472 +++++++++++++++++++++++----------------------- 1 file changed, 237 insertions(+), 235 deletions(-) Index: libvirt-acl/docs/schemas/nwfilter.rng =================================================================== --- libvirt-acl.orig/docs/schemas/nwfilter.rng +++ libvirt-acl/docs/schemas/nwfilter.rng @@ -6,249 +6,249 @@ <define name="filter"> <element name="filter"> <ref name="filter-node-attributes"/> + <optional> + <element name="uuid"> + <ref name="UUID"/> + </element> + </optional> <zeroOrMore> <choice> <element name="filterref"> <ref name="filterref-node-attributes"/> </element> - <element name="uuid"> - <ref name="UUID"/> + <element name="rule"> + <ref name="rule-node-attributes"/> + <optional> + <zeroOrMore> + <element name="mac"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="mac-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="arp"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="arp-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="rarp"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="arp-attributes"/>  + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ip"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-port-attributes"/> + <ref name="ip-attributes"/> + <ref name="dscp-attribute"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ipv6"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-port-attributes"/> + <ref name="ip-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="tcp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="sctp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="icmp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + <ref name="icmp-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="igmp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="all"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="esp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ah"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udplite"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="tcp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="sctp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="icmpv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + <ref name="icmp-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="all-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="esp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ah-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udplite-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> </element> </choice> </zeroOrMore> - <zeroOrMore> - <element name="rule"> - <ref name="rule-node-attributes"/> - <optional> - <zeroOrMore> - <element name="mac"> - <ref name="match-attribute"/> - <ref name="common-l2-attributes"/> - <ref name="mac-attributes"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="arp"> - <ref name="match-attribute"/> - <ref name="common-l2-attributes"/> - <ref name="arp-attributes"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="rarp"> - <ref name="match-attribute"/> - <ref name="common-l2-attributes"/> - <ref name="arp-attributes"/>  - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="ip"> - <ref name="match-attribute"/> - <ref name="common-l2-attributes"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-port-attributes"/> - <ref name="ip-attributes"/> - <ref name="dscp-attribute"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="ipv6"> - <ref name="match-attribute"/> - <ref name="common-l2-attributes"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-port-attributes"/> - <ref name="ip-attributes"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="tcp"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-port-attributes"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="udp"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-port-attributes"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="sctp"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-port-attributes"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="icmp"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - <ref name="icmp-attributes"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="igmp"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="all"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="esp"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="ah"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="udplite"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ip-attributes-p1"/> - <ref name="common-ip-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="tcp-ipv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-port-attributes"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="udp-ipv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-port-attributes"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="sctp-ipv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-port-attributes"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="icmpv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - <ref name="icmp-attributes"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="all-ipv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="esp-ipv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="ah-ipv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> - <element name="udplite-ipv6"> - <ref name="match-attribute"/> - <ref name="srcmac-attribute"/> - <ref name="common-ipv6-attributes-p1"/> - <ref name="common-ipv6-attributes-p2"/> - </element> - </zeroOrMore> - </optional> - </element> - </zeroOrMore> </element> </define> @@ -263,6 +263,7 @@ <choice> <value>root</value> <value>arp</value> + <value>rarp</value> <value>ipv4</value> <value>ipv6</value> </choice> @@ -690,6 +691,7 @@ <choice> <value>arp</value> + <value>rarp</value> <value>ipv4</value> <value>ipv6</value> </choice>

2 2

[libvirt] [PATCH 00/10]: Add arbitrary qemu command-line and monitor commands
by Chris Lalancette 28 Apr '10

28 Apr '10

As we discussed previously, here is the patch series to add the ability to specify arbitrary qemu command-line parameters and environment variables, and also give arbitrary monitor commands to a guest. Because these extra arguments have a good shot at confusing libvirt, the use of them is not supported, but left available for advanced users and developers. They are also in a separate library and have a separate on-the-wire protocol. There is one bug left that I have not yet been able to fix. Because of the complicated way that virsh parses command-line arguments, it is not possible to pass through spaces and quotes when using the qemu-monitor-command. Unfortunately, the qemu monitor commands (and in particular when using QMP) depend heavily on quoting and spacing, so using virsh to send through command-lines is difficult. I'll have to think about how to better resolve this issue, but it should not hold up the rest of the series. Thanks to Dan Berrange for his review already, and to DV for the Relax NG schema changes.

4 33

[libvirt] [PATCH 0/5]: Add a API for query domain disk sizing info
by Daniel P. Berrange 28 Apr '10

28 Apr '10

This is somewhat late for the 0.8.1 release, but this is a rather critical API for some of the use cases of RHEV. It introduces a new API against a virDomainPtr to allow the direct querying of the size of guest block devices. This is modelled on the virStorageVol API for getting size, so I'm pretty confident on the design and impl here.

3 15

[libvirt] [PATCH] qemudDomainCreate: correct a slightly misdirected goto
by Jim Meyering 28 Apr '10

28 Apr '10

I was looking at other uses of qemuDomainObjEndJob and saw this: >From f8ccc44e7890c1b2ae2ebc266ca5d6215fe9c80d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 27 Apr 2010 22:16:02 +0200 Subject: [PATCH] qemudDomainCreate: correct a slightly misdirected goto * src/qemu/qemu_driver.c (qemudDomainCreate): Goto cleanup, not "endjob", since we know "vm" is already NULL. No semantic change. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e1b1af3..2daf038 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4033,35 +4033,35 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, goto cleanup; if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, def, false))) goto cleanup; def = NULL; if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) goto cleanup; /* XXXX free the 'vm' we created ? */ if (qemudStartVMDaemon(conn, driver, vm, NULL, -1) < 0) { if (qemuDomainObjEndJob(vm) > 0) virDomainRemoveInactive(&driver->domains, vm); vm = NULL; - goto endjob; + goto cleanup; } event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_BOOTED); dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; endjob: if (vm && qemuDomainObjEndJob(vm) == 0) vm = NULL; cleanup: virDomainDefFree(def); if (vm) -- 1.7.1.328.g9993c

2 1

[libvirt] using clang
by Jim Meyering 28 Apr '10

28 Apr '10

Some people have expressed an interest in setting up a libvirt autobuilder using clang. If you do that, be aware that you'll see an ugly looking NULL-deref problem when using the clang that comes with F12 or F13, but if you're using a new enough version (rawhide), it's gone. The offending code is in qemu_monitor.c around line 377 and involves the CMSG_* macros: 365 memset(&msg, 0, sizeof(msg)); 366 367 iov[0].iov_base = (void *)data; 368 iov[0].iov_len = len; 369 370 msg.msg_iov = iov; 371 msg.msg_iovlen = 1; 372 373 msg.msg_control = control; 374 msg.msg_controllen = sizeof(control); 375 376 cmsg = CMSG_FIRSTHDR(&msg)((size_t) (&msg)->msg_controllen >= sizeof (struct cmsghdr ) ? (struct cmsghdr *) (&msg)->msg_control : (struct cmsghdr *) 0); *** 2 Null pointer value stored to 'cmsg' 377 cmsg->cmsg_len = CMSG_LEN(sizeof(int))((((sizeof (struct cmsghdr)) + sizeof (size_t) - 1) & (size_t) ~(sizeof (size_t) - 1)) + (sizeof(int))); *** 3 Dereference of null pointer Presuming this code is actually exercised, it's obviously not dereferencing NULL, so it would be a false positive. I looked at a few usage examples and it seems like glibc's own tests do allocate more storage. If this code is *not* currently being used, we should model it after the glibc test code. ----------------------------------------- FYI, anyone can (and all developers should) run clang. It's simple, but does require a configure-from-scratch, so it's good to keep a separate Build like this: scan-build -o clang ./autogen.sh --enable-compile-warnings=maximum && scan-build -o clang make The "-o clang" tells it to put results in a new directory named "clang".

2 1

[libvirt] [PATCH] nwfilter: let qemu's after-migration packet pass
by Stefan Berger 28 Apr '10

28 Apr '10

Qemu currently sends an Ethernet packet with protocol id 0x835 once a VM was successfully migrated. The content of the packet looks like a gratuitous RARP, just with the wrong protocol ID, which should be 0x8035. I wrote some filters to let either one of the packets pass and am adapting the clean-traffic sample filter to use it. I am also doing some changes on the existing ARP filter which was lacking a test for source MAC address. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- examples/xml/nwfilter/Makefile.am | 5 ++++- examples/xml/nwfilter/clean-traffic.xml | 3 +++ examples/xml/nwfilter/no-arp-spoofing.xml | 13 ++++++++----- examples/xml/nwfilter/no-other-rarp-traffic.xml | 4 ++++ examples/xml/nwfilter/qemu-announce-self-rarp.xml | 14 ++++++++++++++ examples/xml/nwfilter/qemu-announce-self.xml | 13 +++++++++++++ 6 files changed, 46 insertions(+), 6 deletions(-) Index: libvirt-acl/examples/xml/nwfilter/Makefile.am =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/Makefile.am +++ libvirt-acl/examples/xml/nwfilter/Makefile.am @@ -11,7 +11,10 @@ FILTERS = \ no-ip-spoofing.xml \ no-mac-broadcast.xml \ no-mac-spoofing.xml \ - no-other-l2-traffic.xml + no-other-l2-traffic.xml \ + no-other-rarp-traffic.xml \ + qemu-announce-self.xml \ + qemu-announce-self-rarp.xml EXTRA_DIST=$(FILTERS) Index: libvirt-acl/examples/xml/nwfilter/qemu-announce-self-rarp.xml =================================================================== --- /dev/null +++ libvirt-acl/examples/xml/nwfilter/qemu-announce-self-rarp.xml @@ -0,0 +1,14 @@ +<filter name='qemu-announce-self-rarp' chain='rarp'> + <rule action='accept' direction='out' priority='500'> + <rarp opcode='Request_Reverse' + srcmacaddr='$MAC' dstmacaddr='ff:ff:ff:ff:ff:ff' + arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' + arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <rarp opcode='Request_Reverse' + dstmacaddr='ff:ff:ff:ff:ff:ff' + arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' + arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/> + </rule> +</filter> Index: libvirt-acl/examples/xml/nwfilter/clean-traffic.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/clean-traffic.xml +++ libvirt-acl/examples/xml/nwfilter/clean-traffic.xml @@ -14,4 +14,7 @@  <filterref filter='no-other-l2-traffic'/> +  + <filterref filter='qemu-announce-self'/> + </filter> Index: libvirt-acl/examples/xml/nwfilter/no-arp-spoofing.xml =================================================================== --- libvirt-acl.orig/examples/xml/nwfilter/no-arp-spoofing.xml +++ libvirt-acl/examples/xml/nwfilter/no-arp-spoofing.xml @@ -1,27 +1,30 @@ <filter name='no-arp-spoofing' chain='arp'> <uuid>f88f1932-debf-4aa1-9fbe-f10d3aa4bc95</uuid> + <rule action='drop' direction='out' priority='300' > + <mac match='no' srcmacaddr='$MAC'/> + </rule>   - <rule action='drop' direction='out' priority='400' > + <rule action='drop' direction='out' priority='350' > <arp match='no' arpsrcmacaddr='$MAC'/> </rule> <rule action='drop' direction='out' priority='400' > <arp match='no' arpsrcipaddr='$IP' /> </rule>  - <rule action='drop' direction='in' priority='400' > + <rule action='drop' direction='in' priority='450' > <arp match='no' arpdstmacaddr='$MAC'/> <arp opcode='reply'/> </rule> - <rule action='drop' direction='in' priority='400' > + <rule action='drop' direction='in' priority='500' > <arp match='no' arpdstipaddr='$IP' /> </rule>  - <rule action='accept' direction='inout' priority='500' > + <rule action='accept' direction='inout' priority='600' > <arp opcode='request'/> </rule> - <rule action='accept' direction='inout' priority='500' > + <rule action='accept' direction='inout' priority='650' > <arp opcode='reply'/> </rule>  Index: libvirt-acl/examples/xml/nwfilter/no-other-rarp-traffic.xml =================================================================== --- /dev/null +++ libvirt-acl/examples/xml/nwfilter/no-other-rarp-traffic.xml @@ -0,0 +1,4 @@ +<filter name='no-other-rarp-traffic' chain='rarp'> + <rule action='drop' direction='inout' priority='1000'/> +</filter> + Index: libvirt-acl/examples/xml/nwfilter/qemu-announce-self.xml =================================================================== --- /dev/null +++ libvirt-acl/examples/xml/nwfilter/qemu-announce-self.xml @@ -0,0 +1,13 @@ +<filter name='qemu-announce-self' chain='root'> +  +  + <rule action='accept' direction='out'> + <mac protocolid='0x835'/> + </rule> + +  + <filterref filter='qemu-announce-self-rarp'/> + <filterref filter='no-other-rarp-traffic'/> + +</filter>

2 2

[libvirt] [PATCH 0/8]: Snapshot fixes
by Chris Lalancette 28 Apr '10

28 Apr '10

Hello, This series of patches fixes up a number of problems discovered while testing the snapshot code. Descriptions of the fixes are in the individual patches. Please review. Thanks, Chris Lalancette

3 24

[libvirt] nwfilter: add test case for RARP protocol
by Stefan Berger 28 Apr '10

28 Apr '10

This patch adds a test case for the RARP protocol. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- tests/nwfilterxml2xmlin/rarp-test.xml | 33 +++++++++++++++++++++++++++++++++ tests/nwfilterxml2xmlout/rarp-test.xml | 18 ++++++++++++++++++ tests/nwfilterxml2xmltest.c | 1 + 3 files changed, 52 insertions(+) Index: libvirt-acl/tests/nwfilterxml2xmlin/rarp-test.xml =================================================================== --- /dev/null +++ libvirt-acl/tests/nwfilterxml2xmlin/rarp-test.xml @@ -0,0 +1,33 @@ +<filter name='testcase'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + protocolid='rarp' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + hwtype='12' + protocoltype='34' + opcode='Request' + arpsrcmacaddr='1:2:3:4:5:6' + arpdstmacaddr='a:b:c:d:e:f'/> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='1' hwtype='255' protocoltype='255'/> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='11' hwtype='256' protocoltype='256'/> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='65535' hwtype='65535' protocoltype='65535' /> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='65536' hwtype='65536' protocoltype='65536' /> + </rule> +</filter> Index: libvirt-acl/tests/nwfilterxml2xmlout/rarp-test.xml =================================================================== --- /dev/null +++ libvirt-acl/tests/nwfilterxml2xmlout/rarp-test.xml @@ -0,0 +1,18 @@ +<filter name='testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='12' protocoltype='34' opcode='Request' arpsrcmacaddr='01:02:03:04:05:06' arpdstmacaddr='0a:0b:0c:0d:0e:0f'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' hwtype='255' protocoltype='255' opcode='Request'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' hwtype='256' protocoltype='256' opcode='11'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' hwtype='65535' protocoltype='65535' opcode='65535'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff'/> + </rule> +</filter> Index: libvirt-acl/tests/nwfilterxml2xmltest.c =================================================================== --- libvirt-acl.orig/tests/nwfilterxml2xmltest.c +++ libvirt-acl/tests/nwfilterxml2xmltest.c @@ -90,6 +90,7 @@ mymain(int argc, char **argv) DO_TEST("mac-test"); DO_TEST("arp-test"); + DO_TEST("rarp-test"); DO_TEST("ip-test"); DO_TEST("ipv6-test");

2 1

[libvirt] [PATCH] nwfilter: add support for RAPR protocol
by Stefan Berger 28 Apr '10

28 Apr '10

This patch adds support for the RARP protocol. This may be needed due to qemu sending out a RARP packet (at least that's what it seems to want to do even though the protocol id is wrong) when migration finishes and we'd need a rule to let the packets pass. Unfortunately my installation of ebtables does not understand -p RARP and also seems to otherwise depend on strings in /etc/ethertype translated to protocol identifiers. Therefore I need to pass -p 0x8035 for RARP. To generally get rid of the dependency of that file I switch all so far supported protocols to use their protocol identifier in the -p parameter rather than the string. I am also extending the schema. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- docs/schemas/nwfilter.rng | 9 ++ src/conf/nwfilter_conf.c | 29 ++----- src/conf/nwfilter_conf.h | 22 +++++- src/nwfilter/nwfilter_ebiptables_driver.c | 109 ++++++++++++++++++------------ 4 files changed, 106 insertions(+), 63 deletions(-) Index: libvirt-acl/docs/schemas/nwfilter.rng =================================================================== --- libvirt-acl.orig/docs/schemas/nwfilter.rng +++ libvirt-acl/docs/schemas/nwfilter.rng @@ -39,6 +39,15 @@ </optional> <optional> <zeroOrMore> + <element name="rarp"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="arp-attributes"/>  + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> <element name="ip"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -46,22 +46,6 @@ #include "domain_conf.h" -/* XXX - * The config parser/structs should not be using platform specific - * constants. Win32 lacks these constants, breaking the parser, - * so temporarily define them until this can be re-written to use - * locally defined enums for all constants - */ -#ifndef ETHERTYPE_IP -# define ETHERTYPE_IP 0x0800 -#endif -#ifndef ETHERTYPE_ARP -# define ETHERTYPE_ARP 0x0806 -#endif -#ifndef ETHERTYPE_IPV6 -# define ETHERTYPE_IPV6 0x86dd -#endif - #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -90,6 +74,7 @@ VIR_ENUM_IMPL(virNWFilterEbtablesTable, VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST, "root", "arp", + "rarp", "ipv4", "ipv6"); @@ -97,6 +82,7 @@ VIR_ENUM_IMPL(virNWFilterRuleProtocol, V "none", "mac", "arp", + "rarp", "ip", "ipv6", "tcp", @@ -412,11 +398,10 @@ struct _virXMLAttr2Struct static const struct int_map macProtoMap[] = { - INTMAP_ENTRY(ETHERTYPE_ARP , "arp"), - INTMAP_ENTRY(ETHERTYPE_IP , "ipv4"), -#ifdef ETHERTYPE_IPV6 - INTMAP_ENTRY(ETHERTYPE_IPV6, "ipv6"), -#endif + INTMAP_ENTRY(ETHERTYPE_ARP , "arp"), + INTMAP_ENTRY(ETHERTYPE_REVARP, "rarp"), + INTMAP_ENTRY(ETHERTYPE_IP , "ipv4"), + INTMAP_ENTRY(ETHERTYPE_IPV6 , "ipv6"), INTMAP_ENTRY_LAST }; @@ -1084,6 +1069,7 @@ struct _virAttributes { static const virAttributes virAttr[] = { PROTOCOL_ENTRY("arp" , arpAttributes , VIR_NWFILTER_RULE_PROTOCOL_ARP), + PROTOCOL_ENTRY("rarp" , arpAttributes , VIR_NWFILTER_RULE_PROTOCOL_RARP), PROTOCOL_ENTRY("mac" , macAttributes , VIR_NWFILTER_RULE_PROTOCOL_MAC), PROTOCOL_ENTRY("ip" , ipAttributes , VIR_NWFILTER_RULE_PROTOCOL_IP), PROTOCOL_ENTRY("ipv6" , ipv6Attributes , VIR_NWFILTER_RULE_PROTOCOL_IPV6), @@ -1434,6 +1420,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD break; case VIR_NWFILTER_RULE_PROTOCOL_ARP: + case VIR_NWFILTER_RULE_PROTOCOL_RARP: case VIR_NWFILTER_RULE_PROTOCOL_NONE: break; Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -35,6 +35,24 @@ # include "xml.h" # include "network.h" +/* XXX + * The config parser/structs should not be using platform specific + * constants. Win32 lacks these constants, breaking the parser, + * so temporarily define them until this can be re-written to use + * locally defined enums for all constants + */ +# ifndef ETHERTYPE_IP +# define ETHERTYPE_IP 0x0800 +# endif +# ifndef ETHERTYPE_ARP +# define ETHERTYPE_ARP 0x0806 +# endif +# ifndef ETHERTYPE_REVARP +# define ETHERTYPE_REVARP 0x8035 +# endif +# ifndef ETHERTYPE_IPV6 +# define ETHERTYPE_IPV6 0x86dd +# endif /** * Chain suffix size is: @@ -290,6 +308,7 @@ enum virNWFilterRuleProtocolType { VIR_NWFILTER_RULE_PROTOCOL_NONE = 0, VIR_NWFILTER_RULE_PROTOCOL_MAC, VIR_NWFILTER_RULE_PROTOCOL_ARP, + VIR_NWFILTER_RULE_PROTOCOL_RARP, VIR_NWFILTER_RULE_PROTOCOL_IP, VIR_NWFILTER_RULE_PROTOCOL_IPV6, VIR_NWFILTER_RULE_PROTOCOL_TCP, @@ -334,7 +353,7 @@ struct _virNWFilterRuleDef { enum virNWFilterRuleProtocolType prtclType; union { ethHdrFilterDef ethHdrFilter; - arpHdrFilterDef arpHdrFilter; + arpHdrFilterDef arpHdrFilter; /* also used for rarp */ ipHdrFilterDef ipHdrFilter; ipv6HdrFilterDef ipv6HdrFilter; tcpHdrFilterDef tcpHdrFilter; @@ -371,6 +390,7 @@ struct _virNWFilterEntry { enum virNWFilterChainSuffixType { VIR_NWFILTER_CHAINSUFFIX_ROOT = 0, VIR_NWFILTER_CHAINSUFFIX_ARP, + VIR_NWFILTER_CHAINSUFFIX_RARP, VIR_NWFILTER_CHAINSUFFIX_IPv4, VIR_NWFILTER_CHAINSUFFIX_IPv6, Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -32,6 +32,7 @@ #include "logging.h" #include "virterror_internal.h" #include "domain_conf.h" +#include "nwfilter_conf.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" @@ -103,11 +104,28 @@ static int ebiptablesDriverInit(void); static void ebiptablesDriverShutdown(void); -static const char *supported_protocols[] = { - "ipv4", - "ipv6", - "arp", - NULL, +struct ushort_map { + unsigned short attr; + const char *val; +}; + + +enum l3_proto_idx { + L3_PROTO_IPV4_IDX = 0, + L3_PROTO_IPV6_IDX, + L3_PROTO_ARP_IDX, + L3_PROTO_RARP_IDX, + L3_PROTO_LAST_IDX +}; + +#define USHORTMAP_ENTRY_IDX(IDX, ATT, VAL) [IDX] = { .attr = ATT, .val = VAL } + +static const struct ushort_map l3_protocols[] = { + USHORTMAP_ENTRY_IDX(L3_PROTO_IPV4_IDX, ETHERTYPE_IP , "ipv4"), + USHORTMAP_ENTRY_IDX(L3_PROTO_IPV6_IDX, ETHERTYPE_IPV6 , "ipv6"), + USHORTMAP_ENTRY_IDX(L3_PROTO_ARP_IDX , ETHERTYPE_ARP , "arp"), + USHORTMAP_ENTRY_IDX(L3_PROTO_RARP_IDX, ETHERTYPE_REVARP, "rarp"), + USHORTMAP_ENTRY_IDX(L3_PROTO_LAST_IDX, 0 , NULL), }; @@ -1609,6 +1627,7 @@ ebtablesCreateRuleInstance(char chainPre break; case VIR_NWFILTER_RULE_PROTOCOL_ARP: + case VIR_NWFILTER_RULE_PROTOCOL_RARP: virBufferVSprintf(&buf, CMD_DEF_PRE "%s -t %s -%%c %s %%s", @@ -1620,7 +1639,10 @@ ebtablesCreateRuleInstance(char chainPre reverse)) goto err_exit; - virBufferAddLit(&buf, " -p arp"); + virBufferVSprintf(&buf, " -p 0x%x", + (rule->prtclType == VIR_NWFILTER_RULE_PROTOCOL_ARP) + ? l3_protocols[L3_PROTO_ARP_IDX].attr + : l3_protocols[L3_PROTO_RARP_IDX].attr); if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataHWType)) { if (printDataType(vars, @@ -2034,6 +2056,7 @@ ebiptablesCreateRuleInstance(virConnectP case VIR_NWFILTER_RULE_PROTOCOL_IP: case VIR_NWFILTER_RULE_PROTOCOL_MAC: case VIR_NWFILTER_RULE_PROTOCOL_ARP: + case VIR_NWFILTER_RULE_PROTOCOL_RARP: case VIR_NWFILTER_RULE_PROTOCOL_NONE: case VIR_NWFILTER_RULE_PROTOCOL_IPV6: @@ -2425,7 +2448,7 @@ static int ebtablesCreateTmpSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol, + enum l3_proto_idx protoidx, int stopOnError) { char rootchain[MAX_CHAINNAME_LENGTH], chain[MAX_CHAINNAME_LENGTH]; @@ -2433,13 +2456,13 @@ ebtablesCreateTmpSubChain(virBufferPtr b : CHAINPREFIX_HOST_OUT_TEMP; PRINT_ROOT_CHAIN(rootchain, chainPrefix, ifname); - PRINT_CHAIN(chain, chainPrefix, ifname, protocol); + PRINT_CHAIN(chain, chainPrefix, ifname, l3_protocols[protoidx].val); virBufferVSprintf(buf, CMD_DEF("%s -t %s -N %s") CMD_SEPARATOR CMD_EXEC "%s" - CMD_DEF("%s -t %s -A %s -p %s -j %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -p 0x%x -j %s") CMD_SEPARATOR CMD_EXEC "%s", @@ -2448,7 +2471,7 @@ ebtablesCreateTmpSubChain(virBufferPtr b CMD_STOPONERR(stopOnError), ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, - rootchain, protocol, chain, + rootchain, l3_protocols[protoidx].attr, chain, CMD_STOPONERR(stopOnError)); @@ -2460,11 +2483,12 @@ static int _ebtablesRemoveSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol, + enum l3_proto_idx protoidx, int isTempChain) { char rootchain[MAX_CHAINNAME_LENGTH], chain[MAX_CHAINNAME_LENGTH]; char chainPrefix; + if (isTempChain) { chainPrefix =(incoming) ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_OUT_TEMP; @@ -2474,14 +2498,14 @@ _ebtablesRemoveSubChain(virBufferPtr buf } PRINT_ROOT_CHAIN(rootchain, chainPrefix, ifname); - PRINT_CHAIN(chain, chainPrefix, ifname, protocol); + PRINT_CHAIN(chain, chainPrefix, ifname, l3_protocols[protoidx].val); virBufferVSprintf(buf, - "%s -t %s -D %s -p %s -j %s" CMD_SEPARATOR + "%s -t %s -D %s -p 0x%x -j %s" CMD_SEPARATOR "%s -t %s -F %s" CMD_SEPARATOR "%s -t %s -X %s" CMD_SEPARATOR, ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, - rootchain, protocol, chain, + rootchain, l3_protocols[protoidx].attr, chain, ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, @@ -2495,10 +2519,10 @@ static int ebtablesRemoveSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol) + enum l3_proto_idx protoidx) { return _ebtablesRemoveSubChain(buf, - incoming, ifname, protocol, 0); + incoming, ifname, protoidx, 0); } @@ -2506,10 +2530,11 @@ static int ebtablesRemoveSubChains(virBufferPtr buf, const char *ifname) { - int i; - for (i = 0; supported_protocols[i]; i++) { - ebtablesRemoveSubChain(buf, 1, ifname, supported_protocols[i]); - ebtablesRemoveSubChain(buf, 0, ifname, supported_protocols[i]); + enum l3_proto_idx i; + + for (i = 0; i < L3_PROTO_LAST_IDX; i++) { + ebtablesRemoveSubChain(buf, 1, ifname, i); + ebtablesRemoveSubChain(buf, 0, ifname, i); } return 0; @@ -2520,10 +2545,10 @@ static int ebtablesRemoveTmpSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol) + enum l3_proto_idx protoidx) { return _ebtablesRemoveSubChain(buf, - incoming, ifname, protocol, 1); + incoming, ifname, protoidx, 1); } @@ -2531,12 +2556,11 @@ static int ebtablesRemoveTmpSubChains(virBufferPtr buf, const char *ifname) { - int i; - for (i = 0; supported_protocols[i]; i++) { - ebtablesRemoveTmpSubChain(buf, 1, ifname, - supported_protocols[i]); - ebtablesRemoveTmpSubChain(buf, 0, ifname, - supported_protocols[i]); + enum l3_proto_idx i; + + for (i = 0; i < L3_PROTO_LAST_IDX; i++) { + ebtablesRemoveTmpSubChain(buf, 1, ifname, i); + ebtablesRemoveTmpSubChain(buf, 0, ifname, i); } return 0; @@ -2574,12 +2598,11 @@ static int ebtablesRenameTmpSubChains(virBufferPtr buf, const char *ifname) { - int i; - for (i = 0; supported_protocols[i]; i++) { - ebtablesRenameTmpSubChain (buf, 1, ifname, - supported_protocols[i]); - ebtablesRenameTmpSubChain (buf, 0, ifname, - supported_protocols[i]); + enum l3_proto_idx i; + + for (i = 0; i < L3_PROTO_LAST_IDX; i++) { + ebtablesRenameTmpSubChain (buf, 1, ifname, l3_protocols[i].val); + ebtablesRenameTmpSubChain (buf, 0, ifname, l3_protocols[i].val); } return 0; @@ -2909,20 +2932,24 @@ ebiptablesApplyNewRules(virConnectPtr co ebtablesCreateTmpRootChain(&buf, 0, ifname, 1); if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv4)) - ebtablesCreateTmpSubChain(&buf, 1, ifname, "ipv4", 1); + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_IPV4_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv4)) - ebtablesCreateTmpSubChain(&buf, 0, ifname, "ipv4", 1); + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_IPV4_IDX, 1); if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv6)) - ebtablesCreateTmpSubChain(&buf, 1, ifname, "ipv6", 1); + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_IPV6_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv6)) - ebtablesCreateTmpSubChain(&buf, 0, ifname, "ipv6", 1); + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_IPV6_IDX, 1); - // keep arp as last + // keep arp,rarp as last if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_ARP)) - ebtablesCreateTmpSubChain(&buf, 1, ifname, "arp", 1); + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_ARP_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_ARP)) - ebtablesCreateTmpSubChain(&buf, 0, ifname, "arp", 1); + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_ARP_IDX, 1); + if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_RARP)) + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_RARP_IDX, 1); + if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_RARP)) + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_RARP_IDX, 1); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpebchains;

2 1

[libvirt] [Klaus@Ethgen.de: [Pkg-libvirt-maintainers] Bug#579208: USB Class/Number/... is base 16, not base 10 (Failed to convert 'ff' to unsigned int)]
by Guido Günther 28 Apr '10

28 Apr '10

Hi, this patch from Klau Ethgen looks right to me. O.k. to apply? I'll remove the comment with this patch then. Cheers, -- Guido ----- Forwarded message from Klaus Ethgen <Klaus(a)Ethgen.de> ----- in node_device_udev.c is the base 10 used for conversion of USB values. But they are hex values so that the conversion fail in the most of time. Funny is that the upstream did know that but didn't fix it (comment in line 551). The patch will fix that. But it do not remove the comment. --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -559,28 +559,28 @@ static int udevProcessUSBInterface(struc if (udevGetUintSysfsAttr(device, "bInterfaceNumber", &data->usb_if.number, - 10) == PROPERTY_ERROR) { + 16) == PROPERTY_ERROR) { goto out; } if (udevGetUintSysfsAttr(device, "bInterfaceClass", &data->usb_if._class, - 10) == PROPERTY_ERROR) { + 16) == PROPERTY_ERROR) { goto out; } if (udevGetUintSysfsAttr(device, "bInterfaceSubClass", &data->usb_if.subclass, - 10) == PROPERTY_ERROR) { + 16) == PROPERTY_ERROR) { goto out; } if (udevGetUintSysfsAttr(device, "bInterfaceProtocol", &data->usb_if.protocol, - 10) == PROPERTY_ERROR) { + 16) == PROPERTY_ERROR) { goto out; }

4 4

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 28 Apr '10

28 Apr '10

* cfg.mk (gnulib_dir): Override default in maint.mk. * .gnulib: Update to latest. Reported by Jim Meyering. --- Update to the latest gnulib for some portability fixes. Thankfully, we already pass all of the new syntax checks, but Jim did note (on the gnulib list) that we failed to define $(gnulib_dir) correctly. .gnulib | 2 +- cfg.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 7c1b995..411e141 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 7c1b995a7041ea366acafeb8632e1080f349f03f +Subproject commit 411e141164861435385bb9bbb10012da28a077c0 diff --git a/cfg.mk b/cfg.mk index 105b625..9e8909b 100644 --- a/cfg.mk +++ b/cfg.mk @@ -24,6 +24,9 @@ gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE)) url_dir_list = \ ftp://$(gnu_rel_host)/gnu/coreutils +# We use .gnulib, not gnulib. +gnulib_dir = $(srcdir)/.gnulib + # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ -- 1.6.6.1

2 1

[libvirt] [PATCH] Cygwin's GCC doesn't like this .sa_handler initialization for some reason
by Matthias Bolte 28 Apr '10

28 Apr '10

--- examples/domain-events/events-c/event-test.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 53a3195..74eabba 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -380,10 +380,11 @@ int main(int argc, char **argv) int callback5ret = -1; int callback6ret = -1; int callback7ret = -1; + struct sigaction action_stop; - struct sigaction action_stop = { - .sa_handler = stop - }; + memset(&action_stop, 0, sizeof action_stop); + + action_stop.sa_handler = stop; if(argc > 1 && STREQ(argv[1],"--help")) { usage(argv[0]); -- 1.6.3.3

5 10

[libvirt] [PATCH] cleanup the download section
by Daniel Veillard 27 Apr '10

27 Apr '10

Just removing reverences to the deprecated CVS server and the old git on et.redhat.com Daniel diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 493923c..a0cb6fc 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -43,19 +43,6 @@ <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">http://libvirt.org/git/?p=libvirt.git;a=summary</a> </pre> - <h2>CVS repository access (Deprecated) </h2> - <p> - The master source repository used to be under <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a> - with anonymous access at: - </p> - <pre> - - # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs co libvirt - </pre> - <p> The server is maintainened temporarilly for existing uses, but all - changes are only commited to git now and we expect to deprecate the CVS - server during summer 2009. </p> - <h2>Building from a source code checkout</h2> <p> The libvirt build process uses GNU autotools, so after obtaining a checkout it is necessary to generate the configure script and Makefile.in @@ -68,27 +55,5 @@ make make install </pre> - - <h2>GIT repository mirror</h2> - - <p> - Jim Mereying was maintaining a CVS to git mirror on - <a href="http://git.et.redhat.com/?p=libvirt.git">git.et.redhat.com</a>. - Existing users should migrate to the new libvirt.org git server, as the - old one is now deprecated. For the sake of old links including now- - rewritten SHA1s, we'll leave the old repository on-line for some time. - It is available as: - </p> - <pre> - - git clone git://git.et.redhat.com/libvirt.git - </pre> - <p> - It can also be browsed at - </p> - <pre> - <a href="http://git.et.redhat.com/?p=libvirt.git;a=summary">http://git.et.redhat.com/?p=libvirt.git;a=summary</a> - </pre> - </body> </html> -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH v2] nwfilter: add support for RAPR protocol
by Stefan Berger 27 Apr '10

27 Apr '10

This patch adds support for the RARP protocol. This may be needed due to qemu sending out a RARP packet (at least that's what it seems to want to do even though the protocol id is wrong) when migration finishes and we'd need a rule to let the packets pass. Unfortunately my installation of ebtables does not understand -p RARP and also seems to otherwise depend on strings in /etc/ethertype translated to protocol identifiers. Therefore I need to pass -p 0x8035 for RARP. To generally get rid of the dependency of that file I switch all so far supported protocols to use their protocol identifier in the -p parameter rather than the string. I am also extending the schema and added a test case. changes from v1 to v2: - added test case into patch Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- docs/schemas/nwfilter.rng | 9 ++ src/conf/nwfilter_conf.c | 29 ++----- src/conf/nwfilter_conf.h | 22 +++++- src/nwfilter/nwfilter_ebiptables_driver.c | 109 ++++++++++++++++++------------ tests/nwfilterxml2xmlin/rarp-test.xml | 33 +++++++++ tests/nwfilterxml2xmlout/rarp-test.xml | 18 ++++ tests/nwfilterxml2xmltest.c | 1 7 files changed, 158 insertions(+), 63 deletions(-) Index: libvirt-acl/docs/schemas/nwfilter.rng =================================================================== --- libvirt-acl.orig/docs/schemas/nwfilter.rng +++ libvirt-acl/docs/schemas/nwfilter.rng @@ -39,6 +39,15 @@ </optional> <optional> <zeroOrMore> + <element name="rarp"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="arp-attributes"/>  + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> <element name="ip"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -46,22 +46,6 @@ #include "domain_conf.h" -/* XXX - * The config parser/structs should not be using platform specific - * constants. Win32 lacks these constants, breaking the parser, - * so temporarily define them until this can be re-written to use - * locally defined enums for all constants - */ -#ifndef ETHERTYPE_IP -# define ETHERTYPE_IP 0x0800 -#endif -#ifndef ETHERTYPE_ARP -# define ETHERTYPE_ARP 0x0806 -#endif -#ifndef ETHERTYPE_IPV6 -# define ETHERTYPE_IPV6 0x86dd -#endif - #define VIR_FROM_THIS VIR_FROM_NWFILTER @@ -90,6 +74,7 @@ VIR_ENUM_IMPL(virNWFilterEbtablesTable, VIR_ENUM_IMPL(virNWFilterChainSuffix, VIR_NWFILTER_CHAINSUFFIX_LAST, "root", "arp", + "rarp", "ipv4", "ipv6"); @@ -97,6 +82,7 @@ VIR_ENUM_IMPL(virNWFilterRuleProtocol, V "none", "mac", "arp", + "rarp", "ip", "ipv6", "tcp", @@ -412,11 +398,10 @@ struct _virXMLAttr2Struct static const struct int_map macProtoMap[] = { - INTMAP_ENTRY(ETHERTYPE_ARP , "arp"), - INTMAP_ENTRY(ETHERTYPE_IP , "ipv4"), -#ifdef ETHERTYPE_IPV6 - INTMAP_ENTRY(ETHERTYPE_IPV6, "ipv6"), -#endif + INTMAP_ENTRY(ETHERTYPE_ARP , "arp"), + INTMAP_ENTRY(ETHERTYPE_REVARP, "rarp"), + INTMAP_ENTRY(ETHERTYPE_IP , "ipv4"), + INTMAP_ENTRY(ETHERTYPE_IPV6 , "ipv6"), INTMAP_ENTRY_LAST }; @@ -1096,6 +1081,7 @@ struct _virAttributes { static const virAttributes virAttr[] = { PROTOCOL_ENTRY("arp" , arpAttributes , VIR_NWFILTER_RULE_PROTOCOL_ARP), + PROTOCOL_ENTRY("rarp" , arpAttributes , VIR_NWFILTER_RULE_PROTOCOL_RARP), PROTOCOL_ENTRY("mac" , macAttributes , VIR_NWFILTER_RULE_PROTOCOL_MAC), PROTOCOL_ENTRY("ip" , ipAttributes , VIR_NWFILTER_RULE_PROTOCOL_IP), PROTOCOL_ENTRY("ipv6" , ipv6Attributes , VIR_NWFILTER_RULE_PROTOCOL_IPV6), @@ -1450,6 +1436,7 @@ virNWFilterRuleDefFixup(virNWFilterRuleD break; case VIR_NWFILTER_RULE_PROTOCOL_ARP: + case VIR_NWFILTER_RULE_PROTOCOL_RARP: case VIR_NWFILTER_RULE_PROTOCOL_NONE: break; Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -35,6 +35,24 @@ # include "xml.h" # include "network.h" +/* XXX + * The config parser/structs should not be using platform specific + * constants. Win32 lacks these constants, breaking the parser, + * so temporarily define them until this can be re-written to use + * locally defined enums for all constants + */ +# ifndef ETHERTYPE_IP +# define ETHERTYPE_IP 0x0800 +# endif +# ifndef ETHERTYPE_ARP +# define ETHERTYPE_ARP 0x0806 +# endif +# ifndef ETHERTYPE_REVARP +# define ETHERTYPE_REVARP 0x8035 +# endif +# ifndef ETHERTYPE_IPV6 +# define ETHERTYPE_IPV6 0x86dd +# endif /** * Chain suffix size is: @@ -292,6 +310,7 @@ enum virNWFilterRuleProtocolType { VIR_NWFILTER_RULE_PROTOCOL_NONE = 0, VIR_NWFILTER_RULE_PROTOCOL_MAC, VIR_NWFILTER_RULE_PROTOCOL_ARP, + VIR_NWFILTER_RULE_PROTOCOL_RARP, VIR_NWFILTER_RULE_PROTOCOL_IP, VIR_NWFILTER_RULE_PROTOCOL_IPV6, VIR_NWFILTER_RULE_PROTOCOL_TCP, @@ -336,7 +355,7 @@ struct _virNWFilterRuleDef { enum virNWFilterRuleProtocolType prtclType; union { ethHdrFilterDef ethHdrFilter; - arpHdrFilterDef arpHdrFilter; + arpHdrFilterDef arpHdrFilter; /* also used for rarp */ ipHdrFilterDef ipHdrFilter; ipv6HdrFilterDef ipv6HdrFilter; tcpHdrFilterDef tcpHdrFilter; @@ -373,6 +392,7 @@ struct _virNWFilterEntry { enum virNWFilterChainSuffixType { VIR_NWFILTER_CHAINSUFFIX_ROOT = 0, VIR_NWFILTER_CHAINSUFFIX_ARP, + VIR_NWFILTER_CHAINSUFFIX_RARP, VIR_NWFILTER_CHAINSUFFIX_IPv4, VIR_NWFILTER_CHAINSUFFIX_IPv6, Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -32,6 +32,7 @@ #include "logging.h" #include "virterror_internal.h" #include "domain_conf.h" +#include "nwfilter_conf.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" @@ -103,11 +104,28 @@ static int ebiptablesDriverInit(void); static void ebiptablesDriverShutdown(void); -static const char *supported_protocols[] = { - "ipv4", - "ipv6", - "arp", - NULL, +struct ushort_map { + unsigned short attr; + const char *val; +}; + + +enum l3_proto_idx { + L3_PROTO_IPV4_IDX = 0, + L3_PROTO_IPV6_IDX, + L3_PROTO_ARP_IDX, + L3_PROTO_RARP_IDX, + L3_PROTO_LAST_IDX +}; + +#define USHORTMAP_ENTRY_IDX(IDX, ATT, VAL) [IDX] = { .attr = ATT, .val = VAL } + +static const struct ushort_map l3_protocols[] = { + USHORTMAP_ENTRY_IDX(L3_PROTO_IPV4_IDX, ETHERTYPE_IP , "ipv4"), + USHORTMAP_ENTRY_IDX(L3_PROTO_IPV6_IDX, ETHERTYPE_IPV6 , "ipv6"), + USHORTMAP_ENTRY_IDX(L3_PROTO_ARP_IDX , ETHERTYPE_ARP , "arp"), + USHORTMAP_ENTRY_IDX(L3_PROTO_RARP_IDX, ETHERTYPE_REVARP, "rarp"), + USHORTMAP_ENTRY_IDX(L3_PROTO_LAST_IDX, 0 , NULL), }; @@ -1611,6 +1629,7 @@ ebtablesCreateRuleInstance(char chainPre break; case VIR_NWFILTER_RULE_PROTOCOL_ARP: + case VIR_NWFILTER_RULE_PROTOCOL_RARP: virBufferVSprintf(&buf, CMD_DEF_PRE "%s -t %s -%%c %s %%s", @@ -1622,7 +1641,10 @@ ebtablesCreateRuleInstance(char chainPre reverse)) goto err_exit; - virBufferAddLit(&buf, " -p arp"); + virBufferVSprintf(&buf, " -p 0x%x", + (rule->prtclType == VIR_NWFILTER_RULE_PROTOCOL_ARP) + ? l3_protocols[L3_PROTO_ARP_IDX].attr + : l3_protocols[L3_PROTO_RARP_IDX].attr); if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataHWType)) { if (printDataType(vars, @@ -2036,6 +2058,7 @@ ebiptablesCreateRuleInstance(virConnectP case VIR_NWFILTER_RULE_PROTOCOL_IP: case VIR_NWFILTER_RULE_PROTOCOL_MAC: case VIR_NWFILTER_RULE_PROTOCOL_ARP: + case VIR_NWFILTER_RULE_PROTOCOL_RARP: case VIR_NWFILTER_RULE_PROTOCOL_NONE: case VIR_NWFILTER_RULE_PROTOCOL_IPV6: @@ -2427,7 +2450,7 @@ static int ebtablesCreateTmpSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol, + enum l3_proto_idx protoidx, int stopOnError) { char rootchain[MAX_CHAINNAME_LENGTH], chain[MAX_CHAINNAME_LENGTH]; @@ -2435,13 +2458,13 @@ ebtablesCreateTmpSubChain(virBufferPtr b : CHAINPREFIX_HOST_OUT_TEMP; PRINT_ROOT_CHAIN(rootchain, chainPrefix, ifname); - PRINT_CHAIN(chain, chainPrefix, ifname, protocol); + PRINT_CHAIN(chain, chainPrefix, ifname, l3_protocols[protoidx].val); virBufferVSprintf(buf, CMD_DEF("%s -t %s -N %s") CMD_SEPARATOR CMD_EXEC "%s" - CMD_DEF("%s -t %s -A %s -p %s -j %s") CMD_SEPARATOR + CMD_DEF("%s -t %s -A %s -p 0x%x -j %s") CMD_SEPARATOR CMD_EXEC "%s", @@ -2450,7 +2473,7 @@ ebtablesCreateTmpSubChain(virBufferPtr b CMD_STOPONERR(stopOnError), ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, - rootchain, protocol, chain, + rootchain, l3_protocols[protoidx].attr, chain, CMD_STOPONERR(stopOnError)); @@ -2462,11 +2485,12 @@ static int _ebtablesRemoveSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol, + enum l3_proto_idx protoidx, int isTempChain) { char rootchain[MAX_CHAINNAME_LENGTH], chain[MAX_CHAINNAME_LENGTH]; char chainPrefix; + if (isTempChain) { chainPrefix =(incoming) ? CHAINPREFIX_HOST_IN_TEMP : CHAINPREFIX_HOST_OUT_TEMP; @@ -2476,14 +2500,14 @@ _ebtablesRemoveSubChain(virBufferPtr buf } PRINT_ROOT_CHAIN(rootchain, chainPrefix, ifname); - PRINT_CHAIN(chain, chainPrefix, ifname, protocol); + PRINT_CHAIN(chain, chainPrefix, ifname, l3_protocols[protoidx].val); virBufferVSprintf(buf, - "%s -t %s -D %s -p %s -j %s" CMD_SEPARATOR + "%s -t %s -D %s -p 0x%x -j %s" CMD_SEPARATOR "%s -t %s -F %s" CMD_SEPARATOR "%s -t %s -X %s" CMD_SEPARATOR, ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, - rootchain, protocol, chain, + rootchain, l3_protocols[protoidx].attr, chain, ebtables_cmd_path, EBTABLES_DEFAULT_TABLE, chain, @@ -2497,10 +2521,10 @@ static int ebtablesRemoveSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol) + enum l3_proto_idx protoidx) { return _ebtablesRemoveSubChain(buf, - incoming, ifname, protocol, 0); + incoming, ifname, protoidx, 0); } @@ -2508,10 +2532,11 @@ static int ebtablesRemoveSubChains(virBufferPtr buf, const char *ifname) { - int i; - for (i = 0; supported_protocols[i]; i++) { - ebtablesRemoveSubChain(buf, 1, ifname, supported_protocols[i]); - ebtablesRemoveSubChain(buf, 0, ifname, supported_protocols[i]); + enum l3_proto_idx i; + + for (i = 0; i < L3_PROTO_LAST_IDX; i++) { + ebtablesRemoveSubChain(buf, 1, ifname, i); + ebtablesRemoveSubChain(buf, 0, ifname, i); } return 0; @@ -2522,10 +2547,10 @@ static int ebtablesRemoveTmpSubChain(virBufferPtr buf, int incoming, const char *ifname, - const char *protocol) + enum l3_proto_idx protoidx) { return _ebtablesRemoveSubChain(buf, - incoming, ifname, protocol, 1); + incoming, ifname, protoidx, 1); } @@ -2533,12 +2558,11 @@ static int ebtablesRemoveTmpSubChains(virBufferPtr buf, const char *ifname) { - int i; - for (i = 0; supported_protocols[i]; i++) { - ebtablesRemoveTmpSubChain(buf, 1, ifname, - supported_protocols[i]); - ebtablesRemoveTmpSubChain(buf, 0, ifname, - supported_protocols[i]); + enum l3_proto_idx i; + + for (i = 0; i < L3_PROTO_LAST_IDX; i++) { + ebtablesRemoveTmpSubChain(buf, 1, ifname, i); + ebtablesRemoveTmpSubChain(buf, 0, ifname, i); } return 0; @@ -2576,12 +2600,11 @@ static int ebtablesRenameTmpSubChains(virBufferPtr buf, const char *ifname) { - int i; - for (i = 0; supported_protocols[i]; i++) { - ebtablesRenameTmpSubChain (buf, 1, ifname, - supported_protocols[i]); - ebtablesRenameTmpSubChain (buf, 0, ifname, - supported_protocols[i]); + enum l3_proto_idx i; + + for (i = 0; i < L3_PROTO_LAST_IDX; i++) { + ebtablesRenameTmpSubChain (buf, 1, ifname, l3_protocols[i].val); + ebtablesRenameTmpSubChain (buf, 0, ifname, l3_protocols[i].val); } return 0; @@ -2911,20 +2934,24 @@ ebiptablesApplyNewRules(virConnectPtr co ebtablesCreateTmpRootChain(&buf, 0, ifname, 1); if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv4)) - ebtablesCreateTmpSubChain(&buf, 1, ifname, "ipv4", 1); + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_IPV4_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv4)) - ebtablesCreateTmpSubChain(&buf, 0, ifname, "ipv4", 1); + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_IPV4_IDX, 1); if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv6)) - ebtablesCreateTmpSubChain(&buf, 1, ifname, "ipv6", 1); + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_IPV6_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_IPv6)) - ebtablesCreateTmpSubChain(&buf, 0, ifname, "ipv6", 1); + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_IPV6_IDX, 1); - // keep arp as last + // keep arp,rarp as last if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_ARP)) - ebtablesCreateTmpSubChain(&buf, 1, ifname, "arp", 1); + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_ARP_IDX, 1); if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_ARP)) - ebtablesCreateTmpSubChain(&buf, 0, ifname, "arp", 1); + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_ARP_IDX, 1); + if (chains_in & (1 << VIR_NWFILTER_CHAINSUFFIX_RARP)) + ebtablesCreateTmpSubChain(&buf, 1, ifname, L3_PROTO_RARP_IDX, 1); + if (chains_out & (1 << VIR_NWFILTER_CHAINSUFFIX_RARP)) + ebtablesCreateTmpSubChain(&buf, 0, ifname, L3_PROTO_RARP_IDX, 1); if (ebiptablesExecCLI(&buf, &cli_status) || cli_status != 0) goto tear_down_tmpebchains; Index: libvirt-acl/tests/nwfilterxml2xmlin/rarp-test.xml =================================================================== --- /dev/null +++ libvirt-acl/tests/nwfilterxml2xmlin/rarp-test.xml @@ -0,0 +1,33 @@ +<filter name='testcase'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + protocolid='rarp' + dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' + hwtype='12' + protocoltype='34' + opcode='Request' + arpsrcmacaddr='1:2:3:4:5:6' + arpdstmacaddr='a:b:c:d:e:f'/> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='1' hwtype='255' protocoltype='255'/> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='11' hwtype='256' protocoltype='256'/> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='65535' hwtype='65535' protocoltype='65535' /> + </rule> + + <rule action='accept' direction='out'> + <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' + opcode='65536' hwtype='65536' protocoltype='65536' /> + </rule> +</filter> Index: libvirt-acl/tests/nwfilterxml2xmlout/rarp-test.xml =================================================================== --- /dev/null +++ libvirt-acl/tests/nwfilterxml2xmlout/rarp-test.xml @@ -0,0 +1,18 @@ +<filter name='testcase' chain='root'> + <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='12' protocoltype='34' opcode='Request' arpsrcmacaddr='01:02:03:04:05:06' arpdstmacaddr='0a:0b:0c:0d:0e:0f'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' hwtype='255' protocoltype='255' opcode='Request'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' hwtype='256' protocoltype='256' opcode='11'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' hwtype='65535' protocoltype='65535' opcode='65535'/> + </rule> + <rule action='accept' direction='out' priority='500'> + <rarp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff'/> + </rule> +</filter> Index: libvirt-acl/tests/nwfilterxml2xmltest.c =================================================================== --- libvirt-acl.orig/tests/nwfilterxml2xmltest.c +++ libvirt-acl/tests/nwfilterxml2xmltest.c @@ -90,6 +90,7 @@ mymain(int argc, char **argv) DO_TEST("mac-test"); DO_TEST("arp-test"); + DO_TEST("rarp-test"); DO_TEST("ip-test"); DO_TEST("ipv6-test");

2 2

[libvirt] [PATCH] Fix build with DEBUG_RAW_IO=1
by jdenemar＠redhat.com 27 Apr '10

27 Apr '10

From: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) At the top of qemu_monitor.c the following lines can be seen: #define DEBUG_IO 0 #define DEBUG_RAW_IO 0 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c4f2725..38ee058 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -166,7 +166,7 @@ char *qemuMonitorEscapeShell(const char *in) } -#if QEMU_DEBUG_RAW_IO +#if DEBUG_RAW_IO # include <c-ctype.h> static char * qemuMonitorEscapeNonPrintable(const char *text) { -- 1.7.0.4

3 2

[libvirt] [PATCH 0/1] Fix encryption XML indentation
by David Allan 27 Apr '10

27 Apr '10

The following patch fixes the storage XML indentation problem caused by my earlier patch to fix domain XML indentation problems. I liked the style of Laine's suggestion of passing in the number of spaces to indent, so I adopted that approach. I also added a regression test for the domain XML. Dave David Allan (1): Fix indentation for storage conf XML src/conf/domain_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/conf/storage_encryption_conf.c | 16 +++++++---- src/conf/storage_encryption_conf.h | 3 +- .../qemuxml2argv-encrypted-disk.args | 1 + .../qemuxml2argv-encrypted-disk.xml | 27 ++++++++++++++++++++ tests/qemuxml2xmltest.c | 2 + 7 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml

2 3