- Devel - libvirt List Archives

[libvirt] [PATCH v2] libvirtd: Better initscript error reporting
by Cole Robinson 24 Feb '10

24 Feb '10

>From time to time I bork my install, and hate it when the initscript returns no info. This patch removes the sanity check, which lets the shell give us 'command not found' or 'permission denied' errors. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.init.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 071fe2c..b808ab3 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -32,9 +32,6 @@ # pidfile: @localstatedir@/run/libvirtd.pid # -# Sanity checks. -[ -x @sbindir@/libvirtd ] || exit 0 - # Source function library. . @sysconfdir@/rc.d/init.d/functions -- 1.6.5.2

1 0

[libvirt] [PATCH] remote: Improve error message when libvirtd isn't running
by Cole Robinson 24 Feb '10

24 Feb '10

While this could lead people in the wrong direction, people most commonly hit this error when libvirtd isn't running, so let's mention a possible fix. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/remote/remote_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8914c39..e10312c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -723,8 +723,8 @@ doRemoteOpen (virConnectPtr conn, } } virReportSystemError(errno, - _("unable to connect to '%s'"), - sockname); + _("unable to connect to '%s', libvirtd may need to be started"), + sockname); goto failed; } -- 1.6.5.2

2 1

[libvirt] [PATCH] libvirtd: Better initscript error reporting
by Cole Robinson 24 Feb '10

24 Feb '10

>From time to time I bork my install, and hate it when the initscript returns no info. This patch makes things a bit more clear. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.init.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 071fe2c..c5d4eee 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -32,8 +32,10 @@ # pidfile: @localstatedir@/run/libvirtd.pid # +LIBVIRTD_BIN="@sbindir@/libvirtd" + # Sanity checks. -[ -x @sbindir@/libvirtd ] || exit 0 +[ ! -e $LIBVIRTD_BIN ] && echo "$LIBVIRTD_BIN not found." && exit 1 # Source function library. . @sysconfdir@/rc.d/init.d/functions -- 1.6.5.2

2 2

[libvirt] [PATCH] Ignore SIGWINCH in remote client call to poll(2) (RHBZ#567931).
by Richard W.M. Jones 24 Feb '10

24 Feb '10

-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

3 6

[libvirt] [PATCH] conf: storage: Remove iSCSI <auth> parsing
by Cole Robinson 24 Feb '10

24 Feb '10

This was never wired up, and even generated broken XML until 0.7.2, so clearly no one was trying to use it. Dan recommended its removal, so lets drop it. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/schemas/storagepool.rng | 19 --------- src/conf/storage_conf.c | 48 ----------------------- src/conf/storage_conf.h | 18 -------- tests/storagepoolxml2xmlin/pool-iscsi-auth.xml | 17 -------- tests/storagepoolxml2xmlout/pool-iscsi-auth.xml | 20 --------- tests/storagepoolxml2xmltest.c | 1 - 6 files changed, 0 insertions(+), 123 deletions(-) delete mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth.xml delete mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth.xml diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 247664e..bcdca62 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -234,22 +234,6 @@ </element> </define> - <define name='sourceinfoauth'> - <element name='auth'> - <attribute name='type'> - <choice> - <value>chap</value> - </choice> - </attribute> - <attribute name='login'> - <text/> - </attribute> - <attribute name='passwd'> - <text/> - </attribute> - </element> - </define> - <define name='sourcefmtfs'> <optional> <element name='format'> @@ -374,9 +358,6 @@ <optional> <ref name='initiatorinfoiqn'/> </optional> - <optional> - <ref name='sourceinfoauth'/> - </optional> </element> </define> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 19a1db9..dd375b9 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -283,11 +283,6 @@ virStoragePoolSourceFree(virStoragePoolSourcePtr source) { VIR_FREE(source->name); VIR_FREE(source->adapter); VIR_FREE(source->initiator.iqn); - - if (source->authType == VIR_STORAGE_POOL_AUTH_CHAP) { - VIR_FREE(source->auth.chap.login); - VIR_FREE(source->auth.chap.passwd); - } } void @@ -363,26 +358,6 @@ virStoragePoolObjRemove(virStoragePoolObjListPtr pools, static int -virStoragePoolDefParseAuthChap(xmlXPathContextPtr ctxt, - virStoragePoolAuthChapPtr auth) { - auth->login = virXPathString("string(./auth/@login)", ctxt); - if (auth->login == NULL) { - virStorageReportError(VIR_ERR_XML_ERROR, - "%s", _("missing auth host attribute")); - return -1; - } - - auth->passwd = virXPathString("string(./auth/@passwd)", ctxt); - if (auth->passwd == NULL) { - virStorageReportError(VIR_ERR_XML_ERROR, - "%s", _("missing auth passwd attribute")); - return -1; - } - - return 0; -} - -static int virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, virStoragePoolSourcePtr source, int pool_type, @@ -445,25 +420,6 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, source->dir = virXPathString("string(./dir/@path)", ctxt); source->adapter = virXPathString("string(./adapter/@name)", ctxt); - authType = virXPathString("string(./auth/@type)", ctxt); - if (authType == NULL) { - source->authType = VIR_STORAGE_POOL_AUTH_NONE; - } else { - if (STREQ(authType, "chap")) { - source->authType = VIR_STORAGE_POOL_AUTH_CHAP; - } else { - virStorageReportError(VIR_ERR_XML_ERROR, - _("unknown auth type '%s'"), - (const char *)authType); - goto cleanup; - } - } - - if (source->authType == VIR_STORAGE_POOL_AUTH_CHAP) { - if (virStoragePoolDefParseAuthChap(ctxt, &source->auth.chap) < 0) - goto cleanup; - } - ret = 0; cleanup: ctxt->node = relnode; @@ -867,10 +823,6 @@ virStoragePoolSourceFormat(virBufferPtr buf, } - if (src->authType == VIR_STORAGE_POOL_AUTH_CHAP) - virBufferVSprintf(buf," <auth type='chap' login='%s' passwd='%s'/>\n", - src->auth.chap.login, - src->auth.chap.passwd); virBufferAddLit(buf," </source>\n"); return 0; diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index c643984..1408128 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -134,19 +134,6 @@ enum virStoragePoolDeviceType { }; -enum virStoragePoolAuthType { - VIR_STORAGE_POOL_AUTH_NONE, - VIR_STORAGE_POOL_AUTH_CHAP, -}; - -typedef struct _virStoragePoolAuthChap virStoragePoolAuthChap; -typedef virStoragePoolAuthChap *virStoragePoolAuthChapPtr; -struct _virStoragePoolAuthChap { - char *login; - char *passwd; -}; - - /* * For remote pools, info on how to reach the host */ @@ -232,11 +219,6 @@ struct _virStoragePoolSource { /* Initiator IQN */ virStoragePoolSourceInitiatorAttr initiator; - int authType; /* virStoragePoolAuthType */ - union { - virStoragePoolAuthChap chap; - } auth; - int format; /* Pool type specific format such as filesystem type, or lvm version, etc */ }; diff --git a/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml b/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml deleted file mode 100644 index f7d4d52..0000000 --- a/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml +++ /dev/null @@ -1,17 +0,0 @@ -<pool type='iscsi'> - <name>virtimages</name> - <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> - <source> - <host name="iscsi.example.com"/> - <device path="demo-target"/> - <auth type='chap' login='foobar' passwd='frobbar'/> - </source> - <target> - <path>/dev/disk/by-path</path> - <permissions> - <mode>0700</mode> - <owner>0</owner> - <group>0</group> - </permissions> - </target> -</pool> diff --git a/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml b/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml deleted file mode 100644 index 557295d..0000000 --- a/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml +++ /dev/null @@ -1,20 +0,0 @@ -<pool type='iscsi'> - <name>virtimages</name> - <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> - <capacity>0</capacity> - <allocation>0</allocation> - <available>0</available> - <source> - <host name='iscsi.example.com'/> - <device path='demo-target'/> - <auth type='chap' login='foobar' passwd='frobbar'/> - </source> - <target> - <path>/dev/disk/by-path</path> - <permissions> - <mode>0700</mode> - <owner>0</owner> - <group>0</group> - </permissions> - </target> -</pool> diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 4550407..1d7094b 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -91,7 +91,6 @@ mymain(int argc, char **argv) DO_TEST("pool-logical-create"); DO_TEST("pool-disk"); DO_TEST("pool-iscsi"); - DO_TEST("pool-iscsi-auth"); DO_TEST("pool-netfs"); DO_TEST("pool-scsi"); DO_TEST("pool-mpath"); -- 1.6.6

3 3

[libvirt] [PATCH 1/2] build: avoid non-srcdir installation failure (apibuild.py)
by Jim Meyering 24 Feb '10

24 Feb '10

Running "make distcheck" from a non-srcdir build was failing like this: /bin/sh: ./apibuild.py: No such file or directory Fixed that with the first patch below (the apibuild.py script is not in ".", but in $(srcdir)). Then retrying, it got a little further but failed like this: (../../docs/apibuild.py) make[3]: *** No rule to make target `sitemap.html.in', needed by `html/index.html'. Stop. That was because sitemap.html.in was not being distributed. Adding it to EXTRA_DIST solved that: >From f0fb87ed1838a9a67d03985e35a4c7625da9d95e Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 14:18:40 +0100 Subject: [PATCH 1/2] build: avoid non-srcdir installation failure (apibuild.py) * docs/Makefile.am (libvirt-api.xml): Insert missing "$(srcdir)/". --- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index cce7a48..26b1d29 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -131,7 +131,7 @@ devhelp/index.html devhelp/libvirt.devhelp: libvirt-api.xml $(devhelpxsl) libvirt-api.xml libvirt-refs.xml: apibuild.py \ $(srcdir)/../include/libvirt/*.h \ $(srcdir)/../src/libvirt.c $(srcdir)/../src/util/virterror.c - -(./apibuild.py) + -($(srcdir)/apibuild.py) clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt -- 1.7.0.367.g566c3 >From 8e948091c4c3b2346be8ede0309ce768136621e9 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 14:15:26 +0100 Subject: [PATCH 2/2] build: avoid non-srcdir installation failure (sitemap.html.in) * docs/Makefile.am (EXTRA_DIST): Add sitemap.html.in. --- docs/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 26b1d29..4828752 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -76,6 +76,7 @@ EXTRA_DIST= \ $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \ $(xml) $(fig) $(png) \ $(patches) \ + sitemap.html.in \ ChangeLog.awk CLEANFILES = $(dot_html) $(apihtml) $(devhelphtml) -- 1.7.0.367.g566c3

2 2

[libvirt] [PATCH] build: make git submodule checking more reliable
by Jim Meyering 24 Feb '10

24 Feb '10

After investigating some autogen.sh/bootstrap-vs-new-gnulib problems today, I realized that libvirt's SHA1-comparing code lacked improvements I'd made in libguestfs, which does the same thing. AFAIK, this is not related to the problems we've seen today, but it might well help someone down the road. Here's the result of that synchronization: >From fada075bcaf46d1bd0c51165475594544e18ecfd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 12:01:09 +0100 Subject: [PATCH] build: make git submodule checking more reliable * cfg.mk (_curr_status): Accommodate leading "+" or "-" in the output of git submodule status. * autogen.sh: Likewise. --- autogen.sh | 2 +- cfg.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 833b1d1..9ae8d67 100755 --- a/autogen.sh +++ b/autogen.sh @@ -65,7 +65,7 @@ fi # Ensure that whenever we pull in a gnulib update or otherwise change to a # different version (i.e., when switching branches), we also rerun ./bootstrap. curr_status=.git-module-status -t=$(git submodule status) +t=$(git submodule status|sed 's/^[ +-]//;s/ .*//') if test "$t" = "$(cat $curr_status 2>/dev/null)"; then : # good, it's up to date, all we need is autoreconf autoreconf -if diff --git a/cfg.mk b/cfg.mk index 17bb341..8317ae2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -262,7 +262,9 @@ ifeq (0,$(MAKELEVEL)) # submodule name. Contrast these: # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib # b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda) - _submodule_hash = sed 's/.//;s/ .*//' + # $ cat .git-module-status + # b653eda3ac4864de205419d9f41eec267cb89eeb + _submodule_hash = sed 's/^[ +-]//;s/ .*//' _update_required := $(shell \ actual=$$(git submodule status | $(_submodule_hash)); \ stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \ -- 1.7.0.377.g90adb

2 1

[libvirt] [PATCH] build: avoid non-srcdir "make distcheck" failures (XML_EXAMPLES)
by Jim Meyering 24 Feb '10

24 Feb '10

This avoids two of the 3 remaining failures, -error: loading host definition file '/t/libvirt-0.7.6/examples/xml/test/testnode.xml': No such file or directory -error: failed to connect to the hypervisor +error: failed to get domain '4294967298' >From b2318b64abc8ac23b4fa43dc52d3c2a32226b8cb Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 15:52:44 +0100 Subject: [PATCH] build: avoid non-srcdir "make distcheck" failures (XML_EXAMPLES) * Makefile.am (XML_EXAMPLES): Use $(wildcard in $(srcdir)-aware manner. --- Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index a02cd26..09439c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,9 @@ SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \ ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 -XML_EXAMPLES = $(wildcard examples/xml/test/*.xml) $(wildcard examples/xml/storage/*.xml) +XML_EXAMPLES = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \ + test/*.xml storage/*.xml))) EXTRA_DIST = \ ChangeLog-old \ -- 1.7.0.367.g566c3

2 2

[libvirt] [PATCH 1/4] Avoid searching for windres when not building for cygwin or mingw.
by Diego Elio Pettenò 24 Feb '10

24 Feb '10

Just checking for a windres tool might hit even on Linux systems when building for Linux (e.g.: when using Gentoo and having built binutils with multitarget support), and will then fail to link properly at the end of the build. Check the host string before deciding whether to look for windres or not. --- configure.ac | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 117cb20..5b1eb5f 100644 --- a/configure.ac +++ b/configure.ac @@ -1682,8 +1682,13 @@ AC_SUBST([CYGWIN_EXTRA_PYTHON_LIBADD]) AC_SUBST([MINGW_EXTRA_LDFLAGS]) dnl Look for windres to build a Windows icon resource. -AC_CHECK_TOOL([WINDRES], [windres], [no]) -AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "no"]) +case "$host" in + *cygwin* | *mingw* ) + AC_CHECK_TOOL([WINDRES], [windres], []) + ;; +esac + +AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""]) -- 1.7.0

5 18

[libvirt] [PATCH] build: fix typos in configure-set makefile variable names
by Jim Meyering 24 Feb '10

24 Feb '10

Without this change, the ..._MODULES_... variables are set in configure.ac, but never used. The variables that are actually used in src/Makefile.am are named _MODULE_... >From a3361a6ce032f71273d6f7a6b4b4f54438b1dd73 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 12:04:27 +0100 Subject: [PATCH] build: fix typos in makefile variable names * configure.ac: Fix typos: s/DRIVER_MODULES_CFLAGS/DRIVER_MODULE_CFLAGS/ s/DRIVER_MODULES_LIBS/DRIVER_MODULE_LIBS/ --- configure.ac | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 2f79970..43ea771 100644 --- a/configure.ac +++ b/configure.ac @@ -1695,8 +1695,8 @@ AC_ARG_WITH([driver-modules], [], [with_driver_modules=no]) -DRIVER_MODULES_CFLAGS= -DRIVER_MODULES_LIBS= +DRIVER_MODULE_CFLAGS= +DRIVER_MODULE_LIBS= if test "x$with_driver_modules" = "xyes" ; then old_cflags="$CFLAGS" old_libs="$LIBS" @@ -1710,13 +1710,13 @@ if test "x$with_driver_modules" = "xyes" ; then LIBS="$old_libs" fi if test "$with_driver_modules" = "yes"; then - DRIVER_MODULES_CFLAGS="-export-dynamic" - DRIVER_MODULES_LIBS="-ldl" + DRIVER_MODULE_CFLAGS="-export-dynamic" + DRIVER_MODULE_LIBS="-ldl" AC_DEFINE_UNQUOTED([WITH_DRIVER_MODULES], 1, [whether to build drivers as modules]) fi AM_CONDITIONAL([WITH_DRIVER_MODULES], [test "$with_driver_modules" != "no"]) -AC_SUBST([DRIVER_MODULES_CFLAGS]) -AC_SUBST([DRIVER_MODULES_LIBS]) +AC_SUBST([DRIVER_MODULE_CFLAGS]) +AC_SUBST([DRIVER_MODULE_LIBS]) # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether @@ -1931,7 +1931,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Driver Loadable Modules]) AC_MSG_NOTICE([]) if test "$with_driver_modules" != "no" ; then -AC_MSG_NOTICE([ dlopen: $DRIVER_MODULES_CFLAGS $DRIVER_MODULES_LIBS]) +AC_MSG_NOTICE([ dlopen: $DRIVER_MODULE_CFLAGS $DRIVER_MODULE_LIBS]) else AC_MSG_NOTICE([ dlopen: no]) fi -- 1.7.0.367.g566c3

3 6

[libvirt] [PATCH] build: avoid non-srcdir installation failure
by Jim Meyering 24 Feb '10

24 Feb '10

>From 28193acd8f1cab9b91cde77afef68781e5c740b2 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 14:01:58 +0100 Subject: [PATCH] build: avoid non-srcdir installation failure * docs/Makefile.am (html/index.html): Insert missing $(srcdir)/ on argument to $(XSLTPROC). This would make "make distcheck" fail when run from a non-srcdir build. Reported by Amit Shah --- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 4df5154..cce7a48 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -115,7 +115,7 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in -@(if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ - $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi ) + $(XSLTPROC) --nonet $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml; fi) -@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \ if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating the resulting XHTML pages" ; \ -- 1.7.0.367.g566c3

2 1

[libvirt] libvirt/dnsmasq integration (formatting fixed).
by Simon Kelley 24 Feb '10

24 Feb '10

(apologies for first attempt: I was using a strange mailer.) As the principal maintainer of dnsmasq, I'm seeing increasing reports of problems on systems which run both dnsmasq and libvirt. I'm fairly sure I understand what's going on in these cases, and I have a few proposals for changes in libvir and dnsmasq that should fix things. The problem is that libvirt runs a private instance of dnsmasq: on machines which are also running a "system" dnsmasq daemon, this can cause problems. Some background: dnsmasq can run in two modes. Default mode: dnsmasq binds the wildcard address and does network magic to determine which interface request packets actually come from, so that the results can be sent back with the correct source address. This has the advantage that network interfaces can come and go and change IP address and dnsmasq will keep working. It's possible to restrict dnsmasq to only reply to requests on some interfaces; requests from other interfaces will be read by dnsmasq and then silently dropped. Telling dnsmasq to use an interface which doesn't exist but might in the future will result in a logged warning, but dnsmasq will still start and when the interface comes up it will work. Bind-interfaces mode: This is the traditional way to do UDP servers. At startup dnsmasq enumerates all the extant interfaces and then opens a socket for each one, listening on the interfaces's IP address. Interfaces may be skipped if excluded by the --interface and --except-interface flags, and any interface specified in --interface which doesn't exist at start-up will generate a fatal error. In almost all cases, default mode is better: --bind-interfaces is only there to cope with old platforms which don't support enough socket options to do default mode. The only time when --bind-interfaces works better is when it's desirable to run more than one instance of dnsmasq or have dnsmasq co-exist with another DNS server. This is not possible in default mode, but it does work in bind-interfaces mode, providing than _all_ instances of dnsmasq are in bind-interfaces mode, and that they listen on a disjoint set of interfaces. Therefore, to allow multiple dnsmasq instances libvirt's private dnsmasq instance is started in bind-interfaces mode: that forces one of the dnsmasq instances to do bind-interfaces. Many of the Linux distibution dnsmasq packages have now implemented an /etc/dnsmasq.d directory where configuration fragments can be dropped. Their libvirt packages are putting a file there which contains a bind-interfaces command, so that the "system" dnsmasq is automatically forced into the same mode, and the two can co-exist. This works, sort-of, but there some disadvantages. Installing libvirt drops the configuration change for the system dnsmasq, but the packages frequently don't restart the system daemon, so that things transiently fail until everything has rebooted. Much worse, the system dnsmasq is forced into bind-interfaces mode and then service to transient interfaces (usb, ad-hoc wifi) no longer works, or, because those interfaces are mentioned in the dnsmasq configuration, dnsmasq now fails at start-up when the interfaces don't exist. I don't think there is a solution to this problem wholly within dnsmasq: the nature of the BSD-sockets universe means that there never be two instances of dnsmasq without bind-interfaces, and it's, at best, difficult to get round the limitations of that WRT transient network interfaces. There is, an alternative solution, which would involve changes to both dnsmasq, libvirt and their packaging. Hence this mail. My proposal is to get rid of the necessity for two dnsmasq instances. Libvirt should check for the existance of a "system" dnsmasq and, if the system daemon exists, libvirt should drop the required configuration into /etc/dnsmasq.d and then restart it. If the system daemon is not installed or enabled, libvirt can start a private instance as now. The difficulty with this scheme is that libvirt needs to create some configuration which enables the services it needs on the virtual network without disturbing, or being disturbed by, whatever configuration exists for the system daemon. That's not currently possible, but it can be made possible. I'm assuming that libvirt needs to provide a set of IP address / MAC address mappings, and range of IP addresses on a virtual network. It needs DHCP and DNS service on the virtual network. The dhcp-host IP/MAC mappings are a non-problem: they will be ignored for any other subnet where the IP addresses don't fit, and any other dhcp-hosts in the system configuration will be similarly ignored for DHCP on the virtual network subnet. The dhcp-range is more of a problem. Service to particular networks in dnsmasq is controlled by interface=<interface name"> lines in the configuration. If there are none of these, service is provided to all interfaces. If they exist, service is limited to the interfaces specified. The existence of any dhcp-range line in dnsmasq's configuration enables the DHCP server for any subnet unless explicitly limited to particular interfaces. So a default dnsmasq installation, (with no interface=<interface>) which provides DNS everywhere but DHCP nowhere would be turned into one which provided DHCP on every interface by libvirt adding a dhcp-range. Since there wouldn't be a suitable DHCP range for most subnets, this would only result in logged errors, but it is still not good. Worse, there's no good answer to the question 'should libvirt include interface=virt0"' in the configuration it supplies? If it does, then the "enable DHCP on all interfaces" problem is solved, but a default system configuration with no interface declaration is transformed from one which provides DNS everywhere to one which provides DNS only to the virtual interface. If libvirt doesn't provide "interface=virt0" and the system configuration includes interface declarations, then there will be no DNS or DHCP service to the virtual network. To solve this, I propose to add an optional interface name to the dhcp-range declaration. The semantics of this would be rather odd, but solve the problem perfectly. 1) for DHCP, if any other dhcp-range exists _without_ an interface name, them the interface name is ignored and and things behave as before, otherwise DHCP is only provided to interfaces mentioned in dhcp-range declarations. 2) for DNS, if there are no interface declarations, things work as before. If there are interface declarations, the interfaces mentioned in dhcp-ranges are added to the set which get DNS service. With these rules, it should be possible for libvirt to drop eg dhcp-range=interface:virt0,192.168.0.1,192.168.0.240 into the configuration of the system dnsmasq and get DHCP and DNS service for virt0, irrespective of any other configuration in the system dnsmasq, and doing so shouldn't affect the services supplied elsewhere. The code in libvirt to make this work looks like this: echo dhcp-range=interface:virt0,<ip range> >>/etc/dnsmasq.d/libvirt if <system dnsmasq is not installed or not enabled> dnsmasq --interface=virt0\ --bind-interfaces --conf-file=/etc/dnsmasq.d/libvirt else /etc/init.d/dnsmasq restart (The --bind-interfaces in the private-dnsmasq instance keeps dnsmasq from clashing with other nameservers eg BIND which may be running.) The system dnsmasq package has to ensure that /etc/dnsmasq.d is read for configuration fragments, and the dnsmasq package and the libvirt package will have to co-operate to manage transitions between private and system dnsmasq mode caused by package installation or removal. Does that make sense? It's a long and involved explanation to come to cold. I fear I may have over-simplified what libvirt is doing with dnsmasq, in which case please enlighten me and I'll modify my scheme to take that into account. If this looks good I can easily have the necessary dnsmasq changes in the next release. Cheers, Simon.

1 0

[libvirt] [PATCH] build: avoid non-srcdir "make distcheck" failures (srcdir vs wildcard)
by Jim Meyering 24 Feb '10

24 Feb '10

With this, I'm down to 3 of 43 test failures. >From dd6f73de8afe2bcac80cc0a5b7f60bc83e0e30fc Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 15:18:51 +0100 Subject: [PATCH] build: avoid non-srcdir "make distcheck" failures (srcdir vs wildcard) * tests/xencapsdata/Makefile.am: Use $(wildcard in $(srcdir)-aware manner * tests/xmconfigdata/Makefile.am: Likewise. * tests/xml2sexprdata/Makefile.am: Likewise. --- tests/xencapsdata/Makefile.am | 5 +++-- tests/xmconfigdata/Makefile.am | 4 ++-- tests/xml2sexprdata/Makefile.am | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/xencapsdata/Makefile.am b/tests/xencapsdata/Makefile.am index 7d77575..ed08bc4 100644 --- a/tests/xencapsdata/Makefile.am +++ b/tests/xencapsdata/Makefile.am @@ -1,2 +1,3 @@ - -EXTRA_DIST = $(wildcard *.xml) $(wildcard *.cpuinfo) $(wildcard *.caps) +EXTRA_DIST = \ + $(patsubst $(srcdir)/%,%,$(wildcard \ + $(srcdir)/*.xml $(srcdir)/*.cpuinfo $(srcdir)/*.caps)) diff --git a/tests/xmconfigdata/Makefile.am b/tests/xmconfigdata/Makefile.am index 05201a0..af0cb09 100644 --- a/tests/xmconfigdata/Makefile.am +++ b/tests/xmconfigdata/Makefile.am @@ -1,2 +1,2 @@ - -EXTRA_DIST = $(wildcard *.xml) $(wildcard *.cfg) +EXTRA_DIST = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.cfg)) diff --git a/tests/xml2sexprdata/Makefile.am b/tests/xml2sexprdata/Makefile.am index 43117d5..20028bb 100644 --- a/tests/xml2sexprdata/Makefile.am +++ b/tests/xml2sexprdata/Makefile.am @@ -1,2 +1,2 @@ - -EXTRA_DIST = $(wildcard *.xml) $(wildcard *.sexpr) +EXTRA_DIST = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr)) -- 1.7.0.367.g566c3

1 0

[libvirt] [PATCH] build: avoid non-srcdir "make distcheck" failure (test_conf.sh)
by Jim Meyering 24 Feb '10

24 Feb '10

"make distcheck" from a non-srcdir build dir was failing the "test_conf.sh" test TEST: test_conf.sh Failed to process /t/libvirt/.j/libvirt-0.7.6/tests/confdata/*.conf diff: /t/libvirt/.j/libvirt-0.7.6/tests/confdata/*.out: No such file or directory! 1 FAILED due to the fact that tests/confdata/Makefile.am was specifying its files via this: EXTRA_DIST = $(wildcard *.conf) $(wildcard *.out) That led to a distribution tarball that lacked those files, which are required by the test_conf.sh test. Automake normally warns us not to use $(wildcard ...), but we've suppressed the warning. This is one case in which using $(wildcard...) really should be avoided. In a non-srcdir build, each of those expands to the empty string, since the actual files are not in that directory, but in $(srcdir). My first reflex was to just hard-code the 4 file names: -EXTRA_DIST = $(wildcard *.conf) $(wildcard *.out) +EXTRA_DIST = \ + fc4.conf \ + fc4.out \ + libvirtd.conf \ + libvirtd.out But that'd make for more maintenance overhead if/when we add more files. Here it doesn't really matter, but in the next patch you'll see that it really does, in general. So here's a better way: Account for the fact that the files are available in $(srcdir): EXTRA_DIST = \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.out $(srcdir)/*.conf)) >From ecce58c9432e83386f2a9ee275c873775577152b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 24 Feb 2010 15:01:11 +0100 Subject: [PATCH] build: avoid non-srcdir "make distcheck" failure (test_conf.sh) * tests/confdata/Makefile.am (EXTRA_DIST): Apply $(wildcard... to $(srcdir)/..., and then remove the prefix. --- tests/confdata/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/confdata/Makefile.am b/tests/confdata/Makefile.am index 5e97605..eaaadbc 100644 --- a/tests/confdata/Makefile.am +++ b/tests/confdata/Makefile.am @@ -1,2 +1,2 @@ - -EXTRA_DIST = $(wildcard *.conf) $(wildcard *.out) +EXTRA_DIST = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.out $(srcdir)/*.conf)) -- 1.7.0.367.g566c3

1 0

[libvirt] [PATCH 0/4] maint: improve bootstrap
by Eric Blake 24 Feb '10

24 Feb '10

My biggest motivation in writing this patch series is the fact that I already have the complete gnulib.git on my hard drive, and repeatedly doing shallow clones of gnulib into multiple projects gets expensive in both network traffic and disk space. With this series, it is now possible to do: GNULIB_SRCDIR=/path/to/reference/gnulib.git ./autogen.sh so that the .gnulib subdirectory will exploit git's --reference capabilities rather than re-download all the files from scratch; it also results in less disk usage. The only caveat is that you should make sure that your reference gnulib.git is never rewound beyond contents referred to by a submodule, so that you never risk creating delta objects in the client repositories that would break if the reference module eventually prunes objects rendered unused by the rewind (in practice, this is only a problem if you are prone to pointing the .gnulib submodule to a non-published commit, in order to test out pending changes to gnulib.git, and can be avoided by doing your gnulib development in a different directory than in the reference gnulib.git that only tracks upstream). .gitignore | 20 +- autogen.sh | 21 +- bootstrap | 852 +++++++++++++++++++++++++++++++++++++++++++++----- bootstrap.conf | 145 +++++++++ build-aux/.gitignore | 12 +- po/.gitignore | 26 +- po/Makevars | 41 --- 7 files changed, 967 insertions(+), 150 deletions(-) Eric Blake (4): maint: fix quoting in autogen.sh maint: start factoring bootstrap maint: import modern bootstrap maint: sort .gitignore -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

4 19

[libvirt] RFC: Libvirt FAQ
by Cole Robinson 24 Feb '10

24 Feb '10

Hi all, If you spend enough time on #virt and various virt mailing lists, there are quite a few libvirt questions that come up regularly. So, largely in an effort to save myself and everyone from repeating ourselves, I've put together a libvirt FAQ, found here: http://wiki.libvirt.org/page/FAQ Some of the really common questions that I tried to answer (paraphrased): Q) Where does libvirt store the VM XML? A) You shouldn't really care, use virsh edit/dumpxml/define/undefine Q) How do I access the qemu monitor with libvirt? A) You don't, monitor commands should be provided by libvirt APIs, take a look at this complete list... Q) Why is libvirt messing with iptables? A) Providing NAT based network access for your VMs. If you don't want it, here's how to get rid of it. I've also tried to answer some questions that I don't feel have good straightforward answers in a highly visible place, like: - What is libvirt? - What is some of the major functionality provided by libvirt? - What does it mean when someone says 'I use libvirt'? - Difference between qemu:///system and qemu:///session Feel free to make any additions or mention any feedback. At the very least, please take a glance, so when someone inevitably asks one of these questions, you know to point them to the FAQ, rather than type out an answer. If people think this is useful, we can link to it from the main libvirt.org page, and merge the current static FAQ content linked from the sidebar into the wiki page. Thanks, Cole

2 1

[libvirt] [PATCH 00/10] Various documentation updates
by Cole Robinson 24 Feb '10

24 Feb '10

Over the months I've noticed a few XML pieces that aren't documented, so I finally sat down to hammer these out. Patch #1 is actually a bug I noticed in the process of trying to document the affected attribute. Thanks, Cole Cole Robinson (10): storage: conf: Correctly calculate exabyte unit docs: storage: Document capacity/alloc 'unit' docs: storage: <volume><key> is always generated. docs: storage: Fix backingStore <format> docs docs: storage: Document <auth> element docs: storage: Document SCSI pools docs: storage: Document multipath pools docs: domain: Document <description> element docs: network: Document STP and delay attributes docs: network: Document <domain> element docs/formatdomain.html.in | 7 ++++ docs/formatnetwork.html.in | 12 ++++++- docs/formatstorage.html.in | 34 ++++++++++++++++--- docs/storage.html.in | 76 ++++++++++++++++++++++++++++++++++++++++++++ src/conf/storage_conf.c | 4 +- 5 files changed, 124 insertions(+), 9 deletions(-)

4 18

[libvirt] PATCH [0/1] Filesystem pool formatting
by David Allan 24 Feb '10

24 Feb '10

Here's an updated patch based on the feedback from DV and danpb. I haven't added support for any additional filesystems beyond what mke2fs supports. The addition of additional filesystems is easily done and better as a separate patch. Dave

4 7

[libvirt] [PATCH] virsh.c: avoid leak on OOM error path
by Jim Meyering 23 Feb '10

23 Feb '10

No one really cares if we leak memory while dying, but who knows... freeing that buffer may let us go down more gracefully. FYI, the leak is triggered when virFileReadAll succeeds (it allocates "buffer"), yet xmlNewDoc fails: if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return FALSE; doc = xmlNewDoc(NULL); if (doc == NULL) goto no_memory; >From 03c7a44e3d5b2e7c992bebc98fc8c6a7bf63881e Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 19 Feb 2010 18:03:41 +0100 Subject: [PATCH] virsh.c: avoid leak on OOM error path * tools/virsh.c (cmdCPUBaseline): Also free "buffer" upon OOM. --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index dd916f3..8756a7a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7139,6 +7139,7 @@ cleanup: return ret; no_memory: + VIR_FREE(buffer); vshError(ctl, "%s", _("Out of memory")); ret = FALSE; return ret; -- 1.7.0.233.g05e1a

3 6

[libvirt] [PATCH] Create raw storage files with O_DSYNC (again)
by Jiri Denemark 22 Feb '10

22 Feb '10

Recently we introduced O_DYSNC flag when creating raw storage files to avoid filling all disk cache with dirty pages. However, the patch got lost when virStorageBackendCreateRaw was reworked using virFileOperation. Let's use O_DYSNC again. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/storage/storage_backend.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 8b9ed5d..3742493 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -356,7 +356,8 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; } - if ((createstat = virFileOperation(vol->target.path, O_RDWR | O_CREAT | O_EXCL, + if ((createstat = virFileOperation(vol->target.path, + O_RDWR | O_CREAT | O_EXCL | O_DSYNC, vol->target.perms.mode, vol->target.perms.uid, vol->target.perms.gid, createRawFileOpHook, &hdata, -- 1.7.0

3 3

[libvirt] domain restore race condition
by Laine Stump 22 Feb '10

22 Feb '10

As noted in another message, the problem I was seeing is a race condition in qemudDomainRestore(), not with my modifications to qemudDmainSave(). Here's some discussion about that problem from IRC, with a question at the bottom: > <laine> Does anyone else see a failure of domain restore (immediately > after domain save? I'm very definitely seeing it on my machine with > F12+updates testing and libvirt built from unpatched sources. > <laine> It's very reproduceable - with virsh I do "save domain > filename", then "restore filename" and it pretty much always gives me > a black screen. Then I force shutdown the guest (with virt-manager) > and do "restore filename" again. Tada! It's restored and running! > [...] > <danpb> laine: possible race condition > <danpb> laine: try putting a sleep(10) before the qemuMonitorStartCPUs > in qemuDomainRestore() Dan's suggestion *did* eliminate the failures. > [...] > <danpb> laine: this sounds like the issue with libvirt prematurely > starting execution of the CPUs before QEMU has even started restoring > (or soemthing like that) > <danpb> laine: search the archives for a mail from Charles Duffy on > this subject some time ago > Here's the BZ filed by Charles Duffy https://bugzilla.redhat.com/show_bug.cgi?id=537938 It looks like he's dealing with a race condition earlier in the restore, since his solution was to wait for the migration process to terminate somewhere inside qemudStartVMDaemon(), rather than waiting until qemudStartVMDaemon() was finished (which is what it does now). Since this wait has already been done anyway by the time of Dan's sleep(10) in my test, I don't think Charles' patch would help this situation. So is there something that libvirt can wait on here to ensure proper start? Or is there a problem in qemu? (I'm still running 0.11. I'll also try upgrading to 0.12 and see if there are changes in behavior.)

1 0

[libvirt] PATCH [0/3] Filesystem pool formatting
by David Allan 22 Feb '10

22 Feb '10

I finished these patches this afternoon, and I need to do a bit more testing before I'm comfortable having these patches committed, but I'm sending them along so I can get everybody's feedback overnight. In particular, I'm wondering if my move of the pool unref call is correct. Dave

5 11

[libvirt] Failures in existing qemu domain save/restore.
by Laine Stump 21 Feb '10

21 Feb '10

After running a bunch more tests, I am now noticing failures in domain save/restore *without* my patch (ie sources built straight from git), not 100% in either case (with or without patches), and the same saved domain sometimes fails to restore and sometimes is successful. (Most of the time (but not all), when I try to restore a domain immediately after a save, it fails, but if I then force shutdown of that failed restore and restore again from the same file, it succeeds. (Note that this is all to/from a local disk - it's not related to NFS) Is there a known problem in domain save/restore? Is anyone else seeing any failures? On 02/19/2010 02:30 AM, Laine Stump wrote: > (This patch requires that you first apply the virFileOperation patches > that I sent to the list yesterday.) > > I'm hoping someone else's keen eye can see what I'm failing to see > here. > > The patch following this message makes domain save "work" on > root-squash NFS (both the libvirt header and the QEMU state are saved > to the file), but the files that it saves don't restore properly, even > when simply saving to a local directory w/o forking - the guest screen > comes up black, or reboots immediately, or some other such thing. I've > looked at the data files and the code, and can't see what difference > is causing this - at least the header written by libvirt seems to be > the same, and the part written by qemu starts in the same place and > looks similar. > > If anyone's got an idea, please let me know! I'd like to get this > figured out and a working patch submitted before the day is done. > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list > >

1 0

[libvirt] [PATCH] docs: add 3 missing spaces
by Dan Kenigsberg 21 Feb '10

21 Feb '10

From: danken <danken(a)redhat.com> --- docs/architecture.html.in | 2 +- docs/auth.html.in | 2 +- docs/logging.html.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/architecture.html.in b/docs/architecture.html.in index 8eb6458..f5cc520 100644 --- a/docs/architecture.html.in +++ b/docs/architecture.html.in @@ -83,7 +83,7 @@ drivers present in driver.h: <li>xen_internal: provide the implementation of the functions possible via direct hypervisor access</li> <li>proxy_internal: provide read-only Xen access via a proxy, the proxy code - is in the <code>proxy/</code>directory.</li> + is in the <code>proxy/</code> directory.</li> <li>xm_internal: provide support for Xen defined but not running domains.</li> <li>qemu_internal: implement the driver functions for QEmu and diff --git a/docs/auth.html.in b/docs/auth.html.in index 3ca40c3..ab6c3e9 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -72,7 +72,7 @@ available. The two libvirt daemon actions available are named <code>org.libvirt. for the RO socket, and <code>org.libvirt.unix.manage</code> for the RW socket. -As an example, to allow a user <code>fred</code>full access to the RW socket, +As an example, to allow a user <code>fred</code> full access to the RW socket, while requiring <code>joe</code> to authenticate with the admin password, would require adding the following snippet to <code>PolicyKit.conf</code>. diff --git a/docs/logging.html.in b/docs/logging.html.in index 63a0b05..f4a5878 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -96,7 +96,7 @@ <li><code>x:stderr</code> output goes to stderr</li> <li><code>x:syslog:name</code> use syslog for the output and use the given <code>name</code> as the ident</li> - <li><code>x:file:file_path</code>output to a file, with the given + <li><code>x:file:file_path</code> output to a file, with the given filepath</li> </ul> In all cases the x prefix is the minimal level, acting as a filter: -- 1.6.6

2 1

[libvirt] [RFC][PATCH 2/2] Automatically recreate macvtap interface and reconnect to qemu
by Ed Swierk 20 Feb '10

20 Feb '10

This patch implements a thread for each VM that iterates through the list of macvtap interfaces, attempting to recreate each one and reconnect it to qemu. See the PATCH 0 email for discussion. --- Index: libvirt-0.7.6/src/qemu/qemu_driver.c =================================================================== --- libvirt-0.7.6.orig/src/qemu/qemu_driver.c +++ libvirt-0.7.6/src/qemu/qemu_driver.c @@ -76,6 +76,7 @@ #include "xml.h" #include "cpu/cpu.h" #include "macvtap.h" +#include "threads.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -96,6 +97,8 @@ struct _qemuDomainObjPrivate { int *vcpupids; qemuDomainPCIAddressSetPtr pciaddrs; + + pthread_t reconnectNetBackendsThread; }; static int qemudShutdown(void); @@ -143,6 +146,8 @@ static int qemudDomainDisconnectNetBacke virDomainObjPtr vm, virDomainNetDefPtr net); +static void *qemudDomainReconnectNetBackends(void *opaque); + static struct qemud_driver *qemu_driver = NULL; @@ -2794,6 +2799,10 @@ static int qemudStartVMDaemon(virConnect if (virDomainSaveStatus(conn, driver->caps, driver->stateDir, vm) < 0) goto abort; + if (pthread_create(&priv->reconnectNetBackendsThread, NULL, + qemudDomainReconnectNetBackends, vm->def->uuid)) + goto abort; + return 0; cleanup: @@ -5627,7 +5636,7 @@ static int qemudDomainConnectNetBackend( unsigned int qemuCmdFlags) { qemuDomainObjPrivatePtr priv = vm->privateData; - char *tapfd_name = NULL; + char *hostnet_name = NULL; int tapfd = -1; char *netstr = NULL; int ret = -1; @@ -5664,27 +5673,30 @@ static int qemudDomainConnectNetBackend( if (tapfd < 0) return -1; - if (virAsprintf(&tapfd_name, "fd-%s", net->info.alias) < 0) { + if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0) { virReportOOMError(conn); close(tapfd); return -1; } if (!(netstr = qemuBuildHostNetStr(conn, net, ' ', - vlan, tapfd_name))) { - VIR_FREE(tapfd_name); + vlan, hostnet_name))) { + VIR_FREE(hostnet_name); close(tapfd); return -1; } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorSendFileHandle(priv->mon, tapfd_name, tapfd) < 0) + if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) + VIR_INFO0("Did not remove existing host network"); + + if (qemuMonitorSendFileHandle(priv->mon, hostnet_name, tapfd) < 0) goto out; if (qemuMonitorAddHostNetwork(priv->mon, netstr) < 0) { - if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0) - VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name); + if (qemuMonitorCloseFileHandle(priv->mon, hostnet_name) < 0) + VIR_WARN(_("Failed to close tapfd with '%s'"), hostnet_name); goto out; } @@ -5693,7 +5705,7 @@ static int qemudDomainConnectNetBackend( out: qemuDomainObjExitMonitorWithDriver(driver, vm); VIR_FREE(netstr); - VIR_FREE(tapfd_name); + VIR_FREE(hostnet_name); close(tapfd); return ret; } @@ -8549,6 +8561,72 @@ out: return ret; } +static void *qemudDomainReconnectNetBackends(void *opaque) +{ + virConnectPtr conn = virConnectOpen("qemu:///system"); + struct qemud_driver *driver = conn->privateData; + const unsigned char *uuid = opaque; + + while (1) { + virDomainObjPtr vm; + unsigned int qemuCmdFlags; + int i; + + usleep(1000000); + + VIR_ERROR(_("qemuDomainReconnectNetBackends (%p %p)"), + conn, driver); + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, uuid); + if (!vm) { + VIR_ERROR0("qemuDomainReconnectNetBackends done"); + qemuDriverUnlock(driver); + break; + } + + VIR_ERROR(_("qemuDomainReconnectNetBackends (%s)"), + vm->def->name); + + if (qemudExtractVersionInfo(vm->def->emulator, + NULL, + &qemuCmdFlags) < 0) + goto cleanup; + + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) + goto endjob; + + for (i = 0 ; i < vm->def->nnets ; i++) { + virDomainNetDefPtr net = vm->def->nets[i]; + + VIR_ERROR(_("qemuDomainReconnectNetBackends (%s)"), net->ifname); + + if (net->type != VIR_DOMAIN_NET_TYPE_DIRECT) + continue; + + if (qemudDomainConnectNetBackend(conn, driver, vm, + net, qemuCmdFlags) < 0) + VIR_ERROR(_("qemudDomainConnectNetBackend failed (%s)"), + net->ifname); + } + + endjob: + if (vm && + qemuDomainObjEndJob(vm) == 0) + vm = NULL; + + cleanup: + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + } + + return NULL; +} + static int qemuCPUCompare(virConnectPtr conn, const char *xmlDesc,

1 0