- Devel - libvirt List Archives

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

25 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 25 Feb '10

25 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 25 Feb '10

25 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 25 Feb '10

25 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 25 Feb '10

25 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 25 Feb '10

25 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 25 Feb '10

25 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ò 25 Feb '10

25 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 25 Feb '10

25 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 25 Feb '10

25 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