- Devel - libvirt List Archives

[libvirt] [PATCH] tests: correct PATH in new test, for when running manually
by Jim Meyering 11 May '10

11 May '10

I'd prepended a *file* to PATH, not the containing directory. The bug would have shown up only when running this test manually. >From 9339dec535beeeb18c96380f0163d3aeb604a0dc Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 11 May 2010 17:43:16 +0200 Subject: [PATCH] tests: correct PATH in new test, for when running manually * tests/virsh-schedinfo: This test sets PATH internally, just in case you're running it manually. Normally, the PATH setting from tests/Makefile.am's TESTS_ENVIRONMENT is sufficient. Prepend the correct directory, and take advantage of the PATH setting in one more case. --- tests/virsh-schedinfo | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo index b276a2e..a2ec193 100755 --- a/tests/virsh-schedinfo +++ b/tests/virsh-schedinfo @@ -20,17 +20,17 @@ : ${abs_top_srcdir=$(pwd)/..} : ${abs_top_builddir=$(pwd)/..} -# If $abs_top_builddir/tools/virsh is not early in $PATH, put it there, +# If $abs_top_builddir/tools 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 ;; + $abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;; + $abs_top_builddir/tools:*) ;; + *) PATH=$abs_top_builddir/tools:$PATH; export PATH ;; esac if test "$VERBOSE" = yes; then set -x - $abs_top_builddir/tools/virsh --version + virsh --version fi . "$srcdir/test-lib.sh" -- 1.7.1.189.g07419

2 2

[libvirt] [0/2] Fix 2 possible crashes in JSON event dispatch
by Daniel P. Berrange 11 May '10

11 May '10

A couple of places didn't do sufficient NULL checks in handling dispatch of JSON events, so can crash under certain conditions.

2 4

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

11 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 11 May '10

11 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 10 May '10

10 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 10 May '10

10 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 10 May '10

10 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 07 May '10

07 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 06 May '10

06 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 06 May '10

06 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