- Devel - libvirt List Archives

[libvirt] [PATCH] build: shipped files must not depend on BUILT_SOURCES
by Eric Blake 31 Aug '13

31 Aug '13

'make distcheck' was failing with: make[3]: Entering directory `/home/eblake/libvirt-tmp2/libvirt-1.1.1/_build/docs' perl ../../docs/genaclperms.pl ../../src/access/viraccessperm.h > ../../docs/aclperms.htmlinc /bin/sh: ../../docs/aclperms.htmlinc: Permission denied when simulating the case of a user doing a VPATH build from a read-only source tree. The culprit? BUILT_SOURCES are _always_ built, and so must NOT be built into srcdir and need not be part of the tarball. On the other hand, shipped files must never depend on files in the builddir. While it would be possible to fix the problem by generating aclperms.htmlinc into builddir, we then have the problem that we ship acl.html - we'd have to rejigger a lot of things to not ship pre-built html. So this patch goes the other direction - we don't need BUILT_SOURCES, but instead ensure that we have proper dependencies so that all files in srcdir are up-to-date at the time the tarball is created. And because we ship html files in the tarball, that implies we don't expect users to be able to rebuild them, so we must not clean any files that would trigger a rebuild except under the maintainer rules. * docs/Makefile.am (BUILT_SOURCES): Delete. (CLEANFILES): Downgrade aclperms.htmlinc cleanup... (maintainer-clean-local): ...and move hvsupport.html.in... (MAINTAINERCLEANFILES): ...to a maintainer action. (hvsupport.html.in): Write into srcdir. (hvsupport.html): Ensure files are built in order. (aclperms.htmlinc): Honor silent make. (EXTRA_DIST): Ship aclperms.htmlinc. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. Still not there, but getting much closer; now 'make distcheck' fails with: rm -f Makefile ERROR: files left in build directory after distclean: ./src/virtlockd.8 docs/Makefile.am | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9939cc8..410c256 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -25,8 +25,6 @@ DOC_SOURCE_DIR=../src DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt -BUILT_SOURCES=hvsupport.html.in - apihtml = \ html/index.html \ html/libvirt-libvirt.html \ @@ -89,9 +87,15 @@ internals_html_in = \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) internals_html = $(internals_html_in:%.html.in=%.html) +# todo.html is special - it is shipped in the tarball, but we +# have a dedicated 'todo' target to rebuild it from a proper +# config file, all other users are able to build it locally. +# For all other files, since we ship pre-built html in the +# tarball, we must also ship the sources, even when those +# sources are themselves generated. dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) \ todo.html.in \ - hvsupport.html.in + $(srcdir)/hvsupport.html.in dot_html = $(dot_html_in:%.html.in=%.html) dot_php_in = $(notdir $(wildcard $(srcdir)/*.php.in)) @@ -136,25 +140,22 @@ EXTRA_DIST= \ $(xml) $(qemu_xml) $(lxc_xml) $(fig) $(png) $(css) \ $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ $(internals_html_in) $(internals_html) \ - sitemap.html.in \ + sitemap.html.in aclperms.htmlinc \ todo.pl hvsupport.pl todo.cfg-example -BUILT_SOURCES += aclperms.htmlinc - -CLEANFILES = $(srcdir)/aclperms.htmlinc - acl.html:: $(srcdir)/aclperms.htmlinc $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(srcdir)/genaclperms.pl Makefile.am - $(PERL) $(srcdir)/genaclperms.pl $< > $@ + $(AM_V_GEN)$(PERL) $(srcdir)/genaclperms.pl $< > $@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_html)) \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml)) \ $(addprefix $(srcdir)/,$(internals_html)) \ - $(addprefix $(srcdir)/,$(dot_php)) + $(addprefix $(srcdir)/,$(dot_php)) \ + $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc all-am: web @@ -183,7 +184,9 @@ todo: rm -f todo.html.in $(MAKE) todo.html -hvsupport.html.in: $(srcdir)/hvsupport.pl \ +hvsupport.html:: $(srcdir)/hvsupport.html.in + +$(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl \ $(srcdir)/../src/libvirt_public.syms \ $(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/libvirt_lxc.syms \ $(srcdir)/../src/driver.h @@ -295,7 +298,7 @@ clean-local: maintainer-clean-local: clean-local rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml \ - todo.html.in hvsupport.html.in + todo.html.in rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml rm -rf $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml rm -rf $(APIBUILD_STAMP) -- 1.8.3.1

1 1

[libvirt] [PATCH] build: fix virtlockd file distribution
by Eric Blake 31 Aug '13

31 Aug '13

Since virtlockd is only built when libvirtd is built, we should not install its auxiliary files unconditionally. This solves two failures. 1. 'make distcheck' complains: rm -f Makefile ERROR: files left in build directory after distclean: ./src/virtlockd.8 2. './autobuild.sh' complains: Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/eblake/rpmbuild/BUILDROOT/mingw-libvirt-1.1.1-1.fc19.eblake1377879911.x86_64 error: Installed (but unpackaged) file(s) found: /usr/i686-w64-mingw32/sys-root/mingw/etc/libvirt/virtlockd.conf /usr/i686-w64-mingw32/sys-root/mingw/share/augeas/lenses/tests/test_virtlockd.aug /usr/i686-w64-mingw32/sys-root/mingw/share/augeas/lenses/virtlockd.aug /usr/i686-w64-mingw32/sys-root/mingw/share/man/man8/virtlockd.8 /usr/x86_64-w64-mingw32/sys-root/mingw/etc/libvirt/virtlockd.conf /usr/x86_64-w64-mingw32/sys-root/mingw/share/augeas/lenses/tests/test_virtlockd.aug /usr/x86_64-w64-mingw32/sys-root/mingw/share/augeas/lenses/virtlockd.aug /usr/x86_64-w64-mingw32/sys-root/mingw/share/man/man8/virtlockd.8 * src/Makefile.am (CLEANFILES): Add virtlockd.8. (man8_MANS, conf_DATA, augeas_DATA, augeastest_DATA): Only install virtlockd files when daemon is built. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule, once my testing completes. src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index d8b943d..636bcbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2046,14 +2046,16 @@ virtlockd.8: $(srcdir)/virtlockd.8.in < $< > $@-t && \ mv $@-t $@ +if WITH_LIBVIRTD man8_MANS = virtlockd.8 conf_DATA += locking/virtlockd.conf augeas_DATA += locking/virtlockd.aug augeastest_DATA += test_virtlockd.aug +endif WITH_LIBVIRTD -CLEANFILES += test_virtlockd.aug +CLEANFILES += test_virtlockd.aug virtlockd.8 MAINTAINERCLEANFILES += $(srcdir)/virtlockd.8.in EXTRA_DIST += \ -- 1.8.3.1

1 0

[libvirt] [PATCH] build: fix 'make distcheck' out of the box
by Eric Blake 31 Aug '13

31 Aug '13

With the 1.1.1 tarball, if a user does 'make && make distcheck', things pass, but if they do 'make distcheck' after 'make clean', there is an odd failure: GEN ../../docs/devhelp/index.html I/O error : Permission denied I/O error : Permission denied runtime error: file ../../docs/devhelp/devhelp.xsl line 43 element document xsltDocumentElem: unable to save to ../../docs/devhelp/libvirt-virterror.html I/O error : Permission denied I/O error : Permission denied This implies that the rules for 'make dist' are missing a dependency - the generated documentation needs to be up-to-date before creating the tarball, or else the tarball will be missing files, where the end user will end up trying to rebuild files in srcdir, and that fails when srcdir is read-only. 1.1.1 plus this patch now works without issues (other issues have crept in to 1.1.2-rc1 that prevent 'make distcheck' from working, but those will be cleaned up in later patches). * docs/Makefile.am (dist-local): New dependency. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- All that explanation, and just one line to change. :) Pushing under the build-breaker rule. docs/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0b0d2d4..9939cc8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -288,6 +288,7 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ check-local: all +dist-local: all clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html -- 1.8.3.1

1 0

[libvirt] [PATCH] cgroup: Don't fail to start a VM when DBus isn't compiled in or running
by Peter Krempa 31 Aug '13

31 Aug '13

The systemd code to create cgroups has fallback means built in, but fails to engage them if a host isn't running DBus or libvirtd is compiled without DBus (yes, you still don't need to run DBus). This patch changes the return value in case DBus isn't available to so that the fallback code can be activated and cgroups are created manually. --- src/util/virsystemd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 251b846..25fcf96 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -145,8 +145,10 @@ int virSystemdCreateMachine(const char *name, char *username = NULL; char *slicename = NULL; - if (!(conn = virDBusGetSystemBus())) - return -1; + if (!(conn = virDBusGetSystemBus())) { + virResetLastError(); + return -2; + } if (privileged) { if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) -- 1.8.3.2

2 2

[libvirt] [PATCH] doc: Update help for virsh_desc command
by Yanbing Du 31 Aug '13

31 Aug '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ccb6080..47fd6cb 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6657,19 +6657,19 @@ static const vshCmdOptDef opts_desc[] = { }, {.name = "live", .type = VSH_OT_BOOL, - .help = N_("modify/get running state") + .help = N_("get/set description of running state domain") }, {.name = "config", .type = VSH_OT_BOOL, - .help = N_("modify/get persistent configuration") + .help = N_("get/set description of persistent definition domain") }, {.name = "current", .type = VSH_OT_BOOL, - .help = N_("modify/get current state configuration") + .help = N_("get/set description of current state domain") }, {.name = "title", .type = VSH_OT_BOOL, - .help = N_("modify/get the title instead of description") + .help = N_("get/set the title instead of description") }, {.name = "edit", .type = VSH_OT_BOOL, -- 1.7.1

2 1

[libvirt] [PATCH] Add documentation for access control system
by Daniel P. Berrange 31 Aug '13

31 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This adds two new pages to the website, acl.html describing the general access control framework and permissions models, and aclpolkit.html describing the use of polkit as an access control driver. page.xsl is modified to support a new syntax <div id="include" filename="somefile.htmlinc"/> which will cause the XSL transform to replace that <div> with the contents of 'somefile.htmlinc'. We use this in the acl.html.in file, to pull the table of permissions for each libvirt object. This table is autogenerated from the enums in src/access/viraccessperms.h by the genaclperms.pl script. newapi.xsl is modified so that the list of permissions checks shown against each API will link to the description of the permissions in acl.html Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + docs/Makefile.am | 12 +- docs/acl.html.in | 100 ++++++++++++ docs/aclpolkit.html.in | 414 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/auth.html.in | 6 +- docs/genaclperms.pl | 124 +++++++++++++++ docs/newapi.xsl | 4 +- docs/page.xsl | 11 ++ docs/sitemap.html.in | 10 ++ 9 files changed, 677 insertions(+), 5 deletions(-) create mode 100644 docs/acl.html.in create mode 100644 docs/aclpolkit.html.in create mode 100644 docs/genaclperms.pl diff --git a/.gitignore b/.gitignore index ae9de0b..4216bf1 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ /daemon/libvirtd.policy /daemon/libvirtd.service /daemon/test_libvirtd.aug +/docs/aclperms.htmlinc /docs/apibuild.py.stamp /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in diff --git a/docs/Makefile.am b/docs/Makefile.am index aabee44..9057432 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -128,7 +128,7 @@ fig = \ migration-unmanaged-direct.fig EXTRA_DIST= \ - apibuild.py \ + apibuild.py genaclperms.pl \ site.xsl newapi.xsl news.xsl page.xsl \ hacking1.xsl hacking2.xsl wrapstring.xsl \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ @@ -139,6 +139,16 @@ EXTRA_DIST= \ sitemap.html.in \ todo.pl hvsupport.pl todo.cfg-example +BUILT_SOURCES += aclperms.htmlinc + +CLEANFILES = aclperms.htmlinc + +acl.html:: aclperms.htmlinc + +aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ + genaclperms.pl Makefile.am + $(PERL) genaclperms.pl $< > $@ + MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_html)) \ $(addprefix $(srcdir)/,$(apihtml)) \ diff --git a/docs/acl.html.in b/docs/acl.html.in new file mode 100644 index 0000000..5fb633d --- /dev/null +++ b/docs/acl.html.in @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Client access control</h1> + <p> + Libvirt's client access control framework allows administrators + to setup fine grained permission rules across client users, + managed objects and API operations. This allows client connections + to be locked down to a minimal set of privileges. + </p> + + <ul id="toc"></ul> + + <h2><a name="intro">Access control introduction</a></h2> + + <p> + In a default configuration, the libvirtd daemon have three levels + of access control. All connections start off in an unauthenticated + state, where the only API operations allowed are those required + to complete authentication. After successful authentication, a + connection either has full, unrestricted access to all libvirt + API calls, or is locked down to only "read only" operations, + according to what socket a client connection originated on. + </p> + + <p> + The access control framework allows authenticated connections to + have fine grained permission rules to be defined by the administrator. + Every API call in libvirt has a set of permissions that will + be validated against the object being used. For example, the + <code>virDomainSetSchedulerParametersFlags</code> method will + check whether the client user has the <code>write</code> + permission on the <code>domain</code> object instance passed + in as a parameter. Further permissions will also be checked + if certain flags are set in the API call. In addition to + checks on the object passed into an API call, some methods + will filter their results. For example the <code>virConnectListAllDomains</code> + method will check the <code>search_domains</code> on the <code>connect</code> + object, but will also filter the returned <code>domain</code> + objects to only those on which the client user has the + <code>getattr</code> permission. + </p> + + <h2><a name="drivers">Access control drivers</a></h2> + + <p> + The access control framework is designed as a pluggable + system to enable future integration with arbitrary access + control technologies. By default, the <code>none</code> + driver is used, which does not access controll checks at + all. At this time, libvirt ships with support for using + <a href="http://www.freedesktop.org/wiki/Software/polkit/">polkit</a> as a real access + control driver. To learn how to use the polkit access + driver consult <a href="aclpolkit.html">the configuration + docs</a>. + </p> + + <p> + The access driver is configured in the <code>libvirtd.conf</code> + configuration file, using the <code>access_drivers</code> + parameter. This parameter accepts an array of access control + driver names. If more than one access driver is requested, + then all must succeed in order for access to be granted. + To enable 'polkit' as the driver + </p> + + <pre> +# augtool -s set '/files/etc/libvirt/libvirtd.conf/access_drivers[1]' polkit + </pre> + + <p> + And to reset back to the default (no-op) driver + </p> + + + <pre> +# augtool -s rm /files/etc/libvirt/libvirtd.conf/access_drivers + </pre> + + <p> + <strong>Note:</strong> changes to libvirtd.conf require that + the libvirtd daemon be restarted. + </p> + + <h2><a name="perms">Objects and permissions</a></h2> + + <p> + Libvirt applies access control to all the main object + types in its API. Each object type, in turn, has a set + of permissions defined. To determine what permissions + are checked for specific API call, consult the + <a href="html/libvirt-libvirt.html">API reference manual</a> + documentation for the API in question. + </p> + + <div id="include" filename="aclperms.htmlinc"/> + + </body> +</html> diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in new file mode 100644 index 0000000..d7be0bd --- /dev/null +++ b/docs/aclpolkit.html.in @@ -0,0 +1,414 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Polkit access control</h1> + + <p> + Libvirt's client <a href="acl.html">access control framework</a> allows + administrators to setup fine grained permission rules across client users, + managed objects and API operations. This allows client connections + to be locked down to a minimal set of privileges. The polkit driver + provides a simple implementation of the access control framework + </p> + + <ul id="toc"></ul> + + <h2><a name="intro">Introduction</a></h2> + + <p> + A default install of libvirt will typically use + <a href="http://www.freedesktop.org/wiki/Software/polkit/">polkit</a> + to authenticate the initial user connection to libvirtd. This is a + very coarse grained check though either allowing full read-write + access to all APIs, or just read-only access. The polkit access + control driver in libvirt builds on this capability to allow for + fine grained control over the operations a user may perform on an + object. + </p> + + <h2><a name="perms">Permission names</a></h2> + + <p> + The libvirt <a href="acl.html#perms">object names and permission names</a> + are mapped onto polkit action names using the simple pattern: + </p> + + <pre>org.libvirt.api.$object.$permission +</pre> + + <p> + The only caveat is that any underscore characters in the + object or permission names are converted to hyphens. So, + for example, the <code>search_storage_vols</code> permission + on the <code>storage_pool</code> object maps to the polkit + action: + </p> + <pre>org.libvirt.api.storage-pool.search-storage-vols +</pre> + + <p> + The default policy for any permission which corresponds to + an "read only" operation, is to allow access. All other + permissions default to deny access. + </p> + + <h2><a name="attrs">Object identity attributes</a></h2> + + <p> + To allow polkit authorization rules to be written to match + against individual object instances, libvirt provides a number + of authorization detail attributes when performing a permission + check. The set of attributes varies according to the type + of object being checked + </p> + + <h3><a name="object_connect">virConnectPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + </tbody> + </table> + + <h3><a name="object_domain">virDomainPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>domain_name</td> + <td>Name of the domain, unique to the local host</td> + </tr> + <tr> + <td>domain_uuid</td> + <td>UUID of the domain, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_interface">virInterfacePtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>interface_name</td> + <td>Name of the network interface, unique to the local host</td> + </tr> + <tr> + <td>interface_mac</td> + <td>MAC address of the network interface, not unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_network">virNetworkPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>network_name</td> + <td>Name of the network, unique to the local host</td> + </tr> + <tr> + <td>network_uuid</td> + <td>UUID of the network, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_node_device">virNodeDevicePtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>node_device_name</td> + <td>Name of the node device, unique to the local host</td> + </tr> + </tbody> + </table> + + <h3><a name="object_nwfilter">virNWFilterPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>nwfilter_name</td> + <td>Name of the network filter, unique to the local host</td> + </tr> + <tr> + <td>nwfilter_uuid</td> + <td>UUID of the network filter, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_secret">virSecretPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>secret_uuid</td> + <td>UUID of the secret, globally unique</td> + </tr> + <tr> + <td>secret_usage_volume</td> + <td>Name of the associated volume, if any</td> + </tr> + <tr> + <td>secret_usage_ceph</td> + <td>Name of the associated Ceph server, if any</td> + </tr> + <tr> + <td>secret_usage_target</td> + <td>Name of the associated iSCSI target, if any</td> + </tr> + <tr> + <td></td> + <td></td> + </tr> + </tbody> + </table> + + <h3><a name="object_storage_pool">virStoragePoolPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>pool_name</td> + <td>Name of the storage pool, unique to the local host</td> + </tr> + <tr> + <td>pool_uuid</td> + <td>UUID of the storage pool, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_storage_vol">virStorageVolPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>pool_name</td> + <td>Name of the storage pool, unique to the local host</td> + </tr> + <tr> + <td>pool_uuid</td> + <td>UUID of the storage pool, globally unique</td> + </tr> + <tr> + <td>vol_name</td> + <td>Name of the storage volume, unique to the pool</td> + </tr> + <tr> + <td>vol_key</td> + <td>Key of the storage volume, globally unique</td> + </tr> + </tbody> + </table> + + + <h2><a name="user">User identity attributes</a></h2> + + <p> + At this point in time, the only attribute provided by + libvirt to identify the user invoking the operation + is the PID of the client program. This means that the + polkit access control driver is only useful if connections + to libvirt are restricted to its UNIX domain socket. If + connections are being made to a TCP socket, no identifying + information is available & access will be denied. + Also note that if the client is connecting via an SSH + tunnel, it is the local SSH user that will be identified. + In future versions, it is expected that more information + about the client user will be provided, including the + SASAL / Kerberos username and/or x509 distinguished + name obtained from the authentication provider in use. + </p> + + + <h2><a name="checks">Writing acces control policies</a></h2> + + <p> + If using versions of polkit prior to 0.106 then it is only + possible to validate (user, permission) pairs via the <code>.pkla</code> + files. Fully validation of the (user, permission, object) triple + requires the new JavaScript <code>.rules</code> support that + was introduced in version 0.106. That latter is what will be + described here. + </p> + + <p> + Libvirt does not ship any rules files by default. It merely + provides a definition of the default behaviour for each + action (permission). As noted earlier, permissions which + correspond to read-only operations in libvirt will be allowed + to all users by default; everything else is denied by default. + Defining custom rules requires creation of a file in the + <code>/etc/polkit-1/rules.d</code> directory with a name + chosen by the administrator (<code>100-libvirt-acl.rules</code> + would be a reasonable choice). See the <code>polkit(8)</code> + manual page for a description of how to write these files + in general. The key idea is to create a file containing + something like + </p> + + <pre> + polkit.addRule(function(action, subject) { + ....logic to check 'action' and 'subject'... + }); + </pre> + + <p> + In this code snippet above, the <code>action</code> object + instance will represent the libvirt permission being checked + along with identifying attributes for the object it is being + applied to. The <code>subject</code> meanwhile will identify + the libvirt client app (with the caveat above about it only + dealing with local clients connected via the UNIX socket). + On the <code>action</code> object, the permission name is + accessible via the <code>id</code> attribute, while the + object identifying attributes are exposed via a set of + attributes with the naming convention <code>_detail_[attrname]</code>. + For example, the 'domain_name' attribute would be exposed via + a property <code>_detail_domain_name</code>. + </p> + + <h3><a name="exconnect">Example: restricting ability to connect to drivers</a></h3> + + <p> + Consider a local user <code>berrange</code> + who has been granted permission to connect to libvirt in + full read-write mode. The goal is to only allow them to + use the <code>QEMU</code> driver and not the Xen or LXC + drivers which are also available in libvirtd. + To achieve this we need to write a rule which checks + whether the <code>_detail_connect_driver</code> attribute + is <code>QEMU</code>, and match on a action + name of <code>org.libvirt.api.connect.getattr</code>. Using + the javascript rules format, this ends up written as + </p> + + <pre> +polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.api.connect.getattr" && + subject.user == "berrange") { + if (action._detail_connect_driver == 'QEMU') { + return polkit.Result.YES; + } else { + return polkit.Result.NO; + } + } +}); + </pre> + + <h3><a name="exdomain">Example: restricting access to a single domain</a></h3> + + <p> + Consider a local user <code>berrange</code> + who has been granted permission to connect to libvirt in + full read-write mode. The goal is to only allow them to + see the domain called <code>demo</code> on the LXC driver. + To achieve this we need to write a rule which checks + whether the <code>_detail_connect_driver</code> attribute + is <code>LXC</code> and the <code>_detail_domain_name</code> + attribute is <code>demo</code>, and match on a action + name of <code>org.libvirt.api.domain.getattr</code>. Using + the javascript rules format, this ends up written as + </p> + + <pre> +polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.api.domain.getattr" && + subject.user == "berrange") { + if (action._detail_connect_driver == 'LXC' && + action._detail_domain_name == 'busy') { + return polkit.Result.YES; + } else { + return polkit.Result.NO; + } + } +}); + </pre> + </body> +</html> diff --git a/docs/auth.html.in b/docs/auth.html.in index e5703c7..37f2978 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -2,12 +2,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <h1 >Authentication & access control</h1> + <h1>Connection authentication</h1> <p> When connecting to libvirt, some connections may require client authentication before allowing use of the APIs. The set of possible authentication mechanisms is administrator controlled, independent - of applications using libvirt. + of applications using libvirt. Once authenticated, libvirt can apply + fine grained <a href="acl.html">access control</a> to the operations + performed by a client. </p> <ul id="toc"></ul> diff --git a/docs/genaclperms.pl b/docs/genaclperms.pl new file mode 100644 index 0000000..244a68e --- /dev/null +++ b/docs/genaclperms.pl @@ -0,0 +1,124 @@ +#!/usr/bin/perl +# +# Copyright (C) 2013 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. +# + +use strict; +use warnings; + +my @objects = ( + "CONNECT", "DOMAIN", "INTERFACE", + "NETWORK","NODE_DEVICE", "NWFILTER", + "SECRET", "STORAGE_POOL", "STORAGE_VOL", + ); + +my %class; + +foreach my $object (@objects) { + my $class = lc $object; + + $class =~ s/(^\w|_\w)/uc $1/eg; + $class =~ s/_//g; + $class =~ s/Nwfilter/NWFilter/; + $class = "vir" . $class . "Ptr"; + + $class{$object} = $class; +} + +my $objects = join ("|", @objects); + +my %opts; +my $in_opts = 0; + +my %perms; + +while (<>) { + if ($in_opts) { + if (m,\*/,) { + $in_opts = 0; + } elsif (/\*\s*\@(\w+):\s*(.*?)\s*$/) { + $opts{$1} = $2; + } + } elsif (m,/\*\*,) { + $in_opts = 1; + } elsif (/VIR_ACCESS_PERM_($objects)_((?:\w|_)+),/) { + my $object = $1; + my $perm = lc $2; + next if $perm eq "last"; + + $perm =~ s/_/-/g; + + $perms{$object} = {} unless exists $perms{$object}; + $perms{$object}->{$perm} = { + desc => $opts{desc}, + message => $opts{message}, + anonymous => $opts{anonymous} + }; + %opts = (); + } +} + +print <<EOF; +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> +EOF + +foreach my $object (sort { $a cmp $b } keys %perms) { + my $class = $class{$object}; + my $olink = lc "object_" . $object; + print <<EOF; +<h3><a name="$olink">$class</a></h3> +<table class="acl"> + <thead> + <tr> + <th>Permission</th> + <th>Description</th> + </tr> + </thead> + <tbody> +EOF + + foreach my $perm (sort { $a cmp $b } keys %{$perms{$object}}) { + my $description = $perms{$object}->{$perm}->{desc}; + + die "missing description for $object.$perm" unless + defined $description; + + my $plink = lc "perm_" . $object . "_" . $perm; + $plink =~ s/-/_/g; + + print <<EOF; + <tr> + <td><a name="$plink">$perm</a></td> + <td>$description</td> + </tr> +EOF + + } + + print <<EOF; + </tbody> +</table> +EOF +} + +print <<EOF; + </body> +</html> +EOF diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 58f12eb..606d244 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -71,8 +71,8 @@ <xsl:template match="check" mode="acl"> <tr> - <td><xsl:value-of select="@object"/></td> - <td><xsl:value-of select="@perm"/></td> + <td><a href="../acl.html#object_{@object}"><xsl:value-of select="@object"/></a></td> + <td><a href="../acl.html#perm_{@object}_{@perm}"><xsl:value-of select="@perm"/></a></td> <xsl:choose> <xsl:when test="@flags"> <td><xsl:value-of select="@flags"/></td> diff --git a/docs/page.xsl b/docs/page.xsl index 7da34ff..a2da854 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -26,6 +26,10 @@ <xsl:call-template name="toc"/> </xsl:template> + <xsl:template match="html:div[@id='include']" mode="content"> + <xsl:call-template name="include"/> + </xsl:template> +  <xsl:template match="html:ul" mode="menu"> @@ -174,4 +178,11 @@ </html> </xsl:template> + <xsl:template name="include"> + <xsl:variable name="inchtml"> + <xsl:copy-of select="document(@filename)"/> + </xsl:variable> + + <xsl:apply-templates select="exsl:node-set($inchtml)/html:html/html:body/*" mode="content"/> + </xsl:template> </xsl:stylesheet> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index fd10caf..a8d2177 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -69,6 +69,16 @@ <span>Configure authentication for the libvirt daemon</span> </li> <li> + <a href="acl.html">Access control</a> + <span>Configure access control libvirt APIs</span> + <ul> + <li> + <a href="aclpolkit.html">Polkit access control</a> + <span>Using polkit for API access control</span> + </li> + </ul> + </li> + <li> <a href="migration.html">Migration</a> <span>Migrating guests between machines</span> </li> -- 1.8.1.4

3 5

[libvirt] [PATCH v2 0/9] Support qemu-system-arm vexpress-a9
by Cole Robinson 31 Aug '13

31 Aug '13

This series adds the bits needed to kick of a qemu-system-arm -machine vexpress-a9 guest. vexpress-a15 likely works as well but is untested. Patches 1-3 are related bugfixes/improvements. Patch 7 adds disk bus=sd, which is often the only way to specify storage for ARM boards. Patch 9 adds virtio-mmio address support, which enables virtio for ARM vexpress machine types. The rest are mostly about fixing CLI generations. Unfortunately qemu ARM boards don't quite work like x86 where we can mix and match devices, so -device is out of the picture (for non-virtio), meaning we have to fall back to CLI infrastrucure like -net nic and -serial. v2: Rebased series Drop patches applied with Laine's series Add patch 1 and 3 Clarify caveats in a few patch descriptions Cole Robinson (9): qemu: Set QEMU_AUDIO_DRV=none with -nographic qemu: Only setup vhost if virtType == "kvm" domain_conf: Add default memballon in PostParse callbacks qemu: Don't add default memballoon device on ARM qemu: Fix adding specifying char devs for ARM qemu: Don't try to allocate PCI addresses for ARM domain_conf: Add disk bus=sd, wire it up for qemu qemu: Fix networking for ARM guests qemu: Support virtio-mmio transport for virtio on ARM docs/formatdomain.html.in | 3 +- docs/schemas/domaincommon.rng | 20 ++++ src/conf/domain_conf.c | 30 +++-- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 22 ++++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 131 +++++++++++++++++---- src/qemu/qemu_domain.c | 32 ++++- src/qemu/qemu_process.c | 37 +++--- src/xen/xen_driver.c | 9 ++ .../qemuxml2argv-arm-vexpressa9-basic.args | 8 ++ .../qemuxml2argv-arm-vexpressa9-basic.xml | 34 ++++++ .../qemuxml2argv-arm-vexpressa9-nodevs.args | 5 + .../qemuxml2argv-arm-vexpressa9-nodevs.xml | 26 ++++ .../qemuxml2argv-arm-vexpressa9-virtio.args | 14 +++ .../qemuxml2argv-arm-vexpressa9-virtio.xml | 45 +++++++ .../qemuxml2argv-balloon-device-auto.args | 3 +- .../qemuxml2argv-balloon-device-period.args | 3 +- .../qemuxml2argv-balloon-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-blkdeviotune.args | 3 +- .../qemuxml2argv-blkiotune-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 3 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 3 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 3 +- .../qemuxml2argv-boot-menu-disable-drive.args | 3 +- .../qemuxml2argv-boot-menu-disable.args | 3 +- .../qemuxml2argv-boot-menu-enable.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 3 +- .../qemuxml2argv-boot-network.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-bootloader.args | 3 +- .../qemuxml2argv-channel-guestfwd.args | 3 +- .../qemuxml2argv-channel-virtio-auto.args | 3 +- .../qemuxml2argv-channel-virtio.args | 3 +- .../qemuxml2argv-clock-france.args | 4 +- .../qemuxml2argv-clock-localtime.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 3 +- .../qemuxml2argv-clock-variable.args | 3 +- .../qemuxml2argv-console-compat-auto.args | 3 +- .../qemuxml2argv-console-compat-chardev.args | 3 +- .../qemuxml2argv-console-compat.args | 3 +- .../qemuxml2argv-console-sclp.args | 3 +- .../qemuxml2argv-console-virtio-ccw.args | 3 +- .../qemuxml2argv-console-virtio-many.args | 3 +- .../qemuxml2argv-console-virtio-s390.args | 3 +- .../qemuxml2argv-console-virtio.args | 3 +- .../qemuxml2argv-cpu-eoi-disabled.args | 3 +- .../qemuxml2argv-cpu-eoi-enabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 3 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 3 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-kvmclock.args | 3 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model.args | 2 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 +- .../qemuxml2argv-cpu-kvmclock.args | 3 +- .../qemuxml2argv-cpu-minimum1.args | 3 +- .../qemuxml2argv-cpu-minimum2.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 3 +- .../qemuxml2argv-cpu-topology1.args | 3 +- .../qemuxml2argv-cpu-topology2.args | 3 +- .../qemuxml2argv-cpu-topology3.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 3 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argv-disk-cdrom-empty.args | 3 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 3 +- .../qemuxml2argv-disk-cdrom-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 3 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 3 +- .../qemuxml2argv-disk-drive-boot-disk.args | 3 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 3 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-none.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-wb.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-wt.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 3 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 3 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 3 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 3 +- .../qemuxml2argv-disk-drive-fat.args | 3 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 3 +- .../qemuxml2argv-disk-drive-network-gluster.args | 3 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 3 +- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 3 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 3 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd.args | 3 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 4 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 3 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 3 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 3 +- .../qemuxml2argv-disk-drive-shared.args | 3 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 3 +- .../qemuxml2argv-disk-floppy-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 3 +- .../qemuxml2argv-disk-geometry.args | 3 +- .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-wwn.args | 2 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 3 +- .../qemuxml2argv-disk-sata-device.args | 3 +- .../qemuxml2argv-disk-scsi-device-auto.args | 3 +- .../qemuxml2argv-disk-scsi-device.args | 3 +- .../qemuxml2argv-disk-scsi-disk-split.args | 2 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 3 +- .../qemuxml2argv-disk-scsi-megasas.args | 3 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 3 +- .../qemuxml2argv-disk-scsi-vscsi.args | 3 +- .../qemuxml2argv-disk-snapshot.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 3 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 3 +- .../qemuxml2argv-disk-virtio-ccw.args | 3 +- .../qemuxml2argv-disk-virtio-s390.args | 3 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 3 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 3 +- .../qemuxml2argv-eoi-disabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-floppy-drive-fat.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 3 +- .../qemuxml2argv-graphics-vnc-sasl.args | 3 +- .../qemuxml2argv-graphics-vnc-tls.args | 3 +- .../qemuxml2argv-graphics-vnc-websocket.args | 3 +- .../qemuxml2argv-hostdev-pci-address-device.args | 3 +- .../qemuxml2argv-hostdev-pci-address.args | 3 +- .../qemuxml2argv-hostdev-scsi-boot.args | 3 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 3 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 3 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 3 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 3 +- .../qemuxml2argv-hostdev-usb-address-device.args | 3 +- .../qemuxml2argv-hostdev-usb-address.args | 3 +- .../qemuxml2argv-hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 3 +- .../qemuxml2argv-input-usbmouse-addr.args | 3 +- .../qemuxml2argv-input-usbmouse.args | 3 +- .../qemuxml2argv-input-usbtablet.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-lease.args | 3 +- .../qemuxml2argv-machine-aliases1.args | 2 +- .../qemuxml2argv-machine-aliases2.args | 3 +- .../qemuxml2argv-machine-core-off.args | 3 +- .../qemuxml2argv-machine-core-on.args | 3 +- .../qemuxml2argv-machine-usb-opt.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 3 +- .../qemuxml2argv-minimal-s390.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 3 +- .../qemuxml2argv-misc-disable-s3.args | 3 +- .../qemuxml2argv-misc-disable-suspends.args | 3 +- .../qemuxml2argv-misc-enable-s4.args | 3 +- .../qemuxml2argv-misc-no-reboot.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 +- .../qemuxml2argv-mlock-unsupported.args | 2 +- .../qemuxml2argv-monitor-json.args | 3 +- .../qemuxml2argv-multifunction-pci-device.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 3 +- .../qemuxml2argv-net-eth-ifname.args | 3 +- .../qemuxml2argv-net-eth-names.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 3 +- .../qemuxml2argv-net-hostdev-vfio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 3 +- .../qemuxml2argv-net-virtio-ccw.args | 3 +- .../qemuxml2argv-net-virtio-device.args | 3 +- .../qemuxml2argv-net-virtio-netdev.args | 3 +- .../qemuxml2argv-net-virtio-s390.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 2 +- .../qemuxml2argv-nographics-vga.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 3 +- .../qemuxml2argv-nosharepages.args | 3 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 3 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 3 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 3 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 3 +- .../qemuxml2argv-numatune-memory.args | 3 +- .../qemuxml2argv-parallel-parport-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp.args | 3 +- .../qemuxml2argv-pci-autoadd-addr.args | 2 +- .../qemuxml2argv-pci-autoadd-idx.args | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-nvram.args | 3 +- .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-qemu-ns-no-env.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 4 +- .../qemuxml2argv-reboot-timeout-disabled.args | 3 +- .../qemuxml2argv-reboot-timeout-enabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 3 +- .../qemuxml2argv-restore-v2-fd.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 3 +- .../qemuxml2argv-s390-piix-controllers.args | 2 +- .../qemuxml2argv-s390-usb-none.args | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 3 +- .../qemuxml2argv-seclabel-dynamic-override.args | 3 +- .../qemuxml2argv-seclabel-dynamic.args | 3 +- .../qemuxml2argv-seclabel-none.args | 3 +- .../qemuxml2argv-seclabel-static-relabel.args | 3 +- .../qemuxml2argv-seclabel-static.args | 3 +- .../qemuxml2argv-serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 3 +- .../qemuxml2argv-serial-file-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 3 +- .../qemuxml2argv-serial-many-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 3 +- .../qemuxml2argv-serial-pty-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 3 +- .../qemuxml2argv-serial-tcp-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 3 +- .../qemuxml2argv-serial-udp-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 3 +- .../qemuxml2argv-serial-unix-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 3 +- .../qemuxml2argv-serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 3 +- .../qemuxml2argv-smartcard-controller.args | 3 +- .../qemuxml2argv-smartcard-host-certificates.args | 3 +- .../qemuxml2argv-smartcard-host.args | 3 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 3 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 3 +- .../qemuxml2argv-sound-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 3 +- .../qemuxml2argv-tpm-passthrough.args | 2 +- .../qemuxml2argv-usb-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 3 +- .../qemuxml2argv-usb-ich9-companion.args | 3 +- .../qemuxml2argv-usb-ich9-ehci-addr.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 3 +- .../qemuxml2argv-usb-piix3-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 3 +- .../qemuxml2argv-usb-redir-boot.args | 3 +- .../qemuxml2argv-usb-redir-filter.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 3 +- .../qemuxml2argv-virtio-rng-default.args | 3 +- .../qemuxml2argv-virtio-rng-egd.args | 3 +- .../qemuxml2argv-virtio-rng-random.args | 3 +- .../qemuxml2argv-watchdog-device.args | 3 +- .../qemuxml2argv-watchdog-dump.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 3 +- tests/qemuxml2argvtest.c | 10 ++ .../qemuxmlns-qemu-ns-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 2 +- .../qemuxmlns-qemu-ns-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 2 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 2 +- tests/testutilsqemu.c | 33 ++++++ 300 files changed, 920 insertions(+), 344 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml -- 1.8.3.1

3 19

[libvirt] [PATCH] Let test_virtlockd.aug find the libvird augeas lense
by Guido Günther 30 Aug '13

30 Aug '13

Otherwise we fail "make check" like: GEN check-augeas-virtlockd Syntax error in lens definition test_virtlockd.aug:8.8-.20:Could not load module Libvirtd for Libvirtd.lns test_virtlockd.aug:8.8-.20:Undefined variable Libvirtd.lns This doesn't show up on systems where libvirtd (and it's lenses) are installed but in a clean chroot. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index d8b943d..bf2ec79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1675,7 +1675,8 @@ check-augeas-lockd: test_libvirt_lockd.aug check-augeas-virtlockd: test_virtlockd.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ + '$(AUGPARSE)' -I $(top_srcdir)/daemon/ \ + -I $(srcdir)/locking test_virtlockd.aug; \ fi # -- 1.8.4.rc3

2 5

[libvirt] [PATCH] Change way we fake dbus method calls
by Daniel P. Berrange 30 Aug '13

30 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Ubuntu libdbus.so links with -Bsymbolic-functions, which means that we can only LD_PRELOAD functions that we directly call. Functions which libdbus.so calls internally can not be replaced. Thus we cannot use dbus_message_new_error or dbus_message_new_method_return Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virsystemdmock.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index ded52d2..5dbd33f 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -65,22 +65,32 @@ dbus_bool_t dbus_message_set_reply_serial(DBusMessage *message ATTRIBUTE_UNUSED, } DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connection ATTRIBUTE_UNUSED, - DBusMessage *message, + DBusMessage *message ATTRIBUTE_UNUSED, int timeout_milliseconds ATTRIBUTE_UNUSED, DBusError *error) { DBusMessage *reply = NULL; - if (getenv("FAIL_BAD_SERVICE")) - reply = dbus_message_new_error(message, - "org.freedesktop.systemd.badthing", - "Something went wrong creating the machine"); - else if (getenv("FAIL_NO_SERVICE")) + if (getenv("FAIL_BAD_SERVICE")) { + DBusMessageIter iter; + const char *error_message = "Something went wrong creating the machine"; + if (!(reply = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR))) + return NULL; + dbus_message_set_error_name(reply, "org.freedesktop.systemd.badthing"); + dbus_message_iter_init_append(reply, &iter); + if (!dbus_message_iter_append_basic(&iter, + DBUS_TYPE_STRING, + &error_message)) { + dbus_message_unref(reply); + return NULL; + } + } else if (getenv("FAIL_NO_SERVICE")) { dbus_set_error(error, "org.freedesktop.DBus.Error.ServiceUnknown", "%s", "The name org.freedesktop.machine1 was not provided by any .service files"); - else - reply = dbus_message_new_method_return(message); + } else { + reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + } return reply; } -- 1.7.9.5

3 2

[libvirt] [PATCH 0/3] Fix bitmap parsing code and add tests
by Peter Krempa 30 Aug '13

30 Aug '13

The bitmap parsing code might cause a crash of the application using it. Fix it and add tests so that it doesn't happen again. Peter Krempa (3): virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array virbitmaptest: Fix function header formatting virbitmaptest: Add test for out of bounds condition src/util/virbitmap.c | 38 +++++++++++++------------------- tests/virbitmaptest.c | 60 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 67 insertions(+), 31 deletions(-) -- 1.8.3.2

4 10

[libvirt] [PATCHv3 0/6] virsh: More intelligent auto-completion
by Tomas Meszaros 30 Aug '13

30 Aug '13

Hi, this patch series is a prototype for my GSoC project (Michal Privoznik is my mentor). I'm working on virsh auto-completion, trying to make it more "intelligent". At this stage, prototype is capable of command and option completion. Three completer functions are currently implemented so you can test it. If it turns out that this prototype is good enough, I will implement more completer functions. --- v3: * vshReconnect() is now called only when we reach the point that completion is being attempted on commands that needs connection * moved all .completer intializations into the 4/6, 5/6 and 6/6 v2: https://www.redhat.com/archives/libvir-list/2013-August/msg00992.html v1: https://www.redhat.com/archives/libvir-list/2013-August/msg00371.html Tomas Meszaros (6): virsh: C99 style for info_domfstrim and opts_lxc_enter_namespace virsh: Add vshCmdCompleter and vshOptCompleter virsh: Improve readline generators and readline completion virsh: Add vshDomainCompleter virsh: Add vshSuspendTargetCompleter virsh: Add vshRebootShutdownModeCompleter .gnulib | 2 +- tools/virsh-domain-monitor.c | 32 ++- tools/virsh-domain.c | 248 +++++++++++++++++----- tools/virsh-snapshot.c | 45 +++- tools/virsh.c | 480 +++++++++++++++++++++++++++++++++++++++++-- tools/virsh.h | 11 + 6 files changed, 725 insertions(+), 93 deletions(-) -- 1.8.3.1

2 15

[libvirt] [PATCH V2] Use loop-control to allocate loop device.
by Ian Main 30 Aug '13

30 Aug '13

This patch changes virFileLoopDeviceOpen() to use the new loop-control device to allocate a new loop device. If this behavior is unsupported we fall back to the previous method of searching /dev for a free device. With this patch you can start as many image based LXC domains as you like (well almost). Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=995543 V2: - Modified to use a dedicated error return for loop-control allocation function. - Only do fallback if /dev/loop-control does not exist, otherwise return error. Signed-off-by: Ian Main <imain(a)redhat.com> --- configure.ac | 12 +++++++++ src/util/virfile.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac8cfa1..10cd872 100644 --- a/configure.ac +++ b/configure.ac @@ -913,6 +913,18 @@ if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then AC_MSG_ERROR([Required kernel features for LXC were not found]) fi ]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[ + #include <sched.h> + #include <linux/loop.h> + #include <sys/epoll.h> + ]], [[ + unshare(!(LOOP_CTL_GET_FREE)); + ]])], [ + AC_DEFINE([HAVE_DECL_LOOP_CTL_GET_FREE], [1], + [Define to 1 if you have the declaration of `LOOP_CTL_GET_FREE', + and to 0 if you don't.]) + ]) fi if test "$with_lxc" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) diff --git a/src/util/virfile.c b/src/util/virfile.c index 2b07ac9..22a0db5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -528,7 +528,56 @@ int virFileUpdatePerm(const char *path, #if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR -static int virFileLoopDeviceOpen(char **dev_name) + +#if HAVE_DECL_LOOP_CTL_GET_FREE + +/* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occured + * while in the process of allocating or opening the loop device. On success + * we return 0 and modify the fd to the appropriate file descriptor. + * If /dev/loop-control does not exist, we return 0 and do not set fd. */ + +static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd) +{ + int devnr; + int ctl_fd; + char *looppath = NULL; + + VIR_DEBUG("Opening loop-control device"); + if ((ctl_fd = open("/dev/loop-control", O_RDWR)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to open /dev/loop-control")); + if (errno == ENOENT) { + return 0; + } + return -1; + } + + if ((devnr = ioctl(ctl_fd, LOOP_CTL_GET_FREE)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get free loop device via ioctl")); + close(ctl_fd); + return -1; + } + close(ctl_fd); + + VIR_DEBUG("Found free loop device number %i", devnr); + + if (virAsprintf(&looppath, "/dev/loop%i", devnr) < 0) + return -1; + + if ((*fd = open(looppath, O_RDWR)) < 0) { + virReportSystemError(errno, + _("Unable to open %s"), looppath); + VIR_FREE(looppath); + return -1; + } + + *dev_name = looppath; + return 0; +} +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + +static int virFileLoopDeviceOpenSearch(char **dev_name) { int fd = -1; DIR *dh = NULL; @@ -601,6 +650,28 @@ cleanup: return fd; } +static int virFileLoopDeviceOpen(char **dev_name) +{ + int loop_fd = -1; + +#ifdef HAVE_DECL_LOOP_CTL_GET_FREE + if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) + return -1; + + VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + + if (loop_fd < 0) { + VIR_WARN("loop-control allocation failed, trying search technique."); + } else { + return loop_fd; + } +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + + /* Without the loop control device we just use the old technique. */ + loop_fd = virFileLoopDeviceOpenSearch(dev_name); + + return loop_fd; +} int virFileLoopDeviceAssociate(const char *file, char **dev) -- 1.8.1.4

2 1

[libvirt] [RFC]Libvirt Wireshark Dissector
by Yuto KAWAMURA 30 Aug '13

30 Aug '13

Hi libvirt developers, I would like to ask you to review the dissector of libvirt RPC protocol which I've been developing on project of Google Summer of Code 2013[1][2][3]. It can add support for dissecting libvirt RPC protocol packet which communicate via TCP socket to Wireshark. This feature was presented by Michal Privoznik year before last[4]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. Now it is available to build and install dissector from repository[3]. Only you need to do is: git clone https://github.com/kawamuray/libvirt-wireshark-dissector.git cd libvirt-wireshark-dissector autoreconf --install ./configure && make sudo make install Above commands only install a single shared object: $(dirname `which wireshark`)/../lib/wireshark/plugins/<wireshark version>/libvirt.so . After rebooting wireshark(or tshark), your wireshark have support for dissecting libvirt RPC packet. Please make sure your libvirtd is listening on port 16509(default libvirtd port) and connect to libvirtd using TCP socket(e.g. qemu+tcp:///system). You can also try the feature; generate dissector from your libvirt source tree by adding few options to ./configure. Please see README and ./configure --help output for more detail. Please try and review it. Any comments, reviews and patches for dissector code, generator code and usability are welcome. Regards. kawamuray [1] http://www.google-melange.com/gsoc/project/google/gsoc2013/kawamuray/7001 [2] http://wiki.qemu.org/Features/LibvirtWiresharkDissector [3] https://github.com/kawamuray/libvirt-wireshark-dissector [4] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html

2 2

[libvirt] RFC: btrfs storage pool using subvolumes & snapshots
by Oskari Saarenmaa 30 Aug '13

30 Aug '13

I wrote an experimental btrfs storage pool which uses subvolumes (and optionally snapshots) as storage volumes in LXC domains. The code is available at https://github.com/saaros/libvirt/compare/btrfs-storage but it's still missing some features like quotas for the subvolumes (currently the capacity definition for volumes is ignored) and doesn't have any documentation so far. Sample usage: mkdir /virtual; mkfs.btrfs /dev/vdb; mount -t btrfs /dev/vdb /virtual virsh pool-create-as testpool btrfs --target /virtual virsh vol-create-as testpool vanilla 0 echo vanilla > /virtual/vanilla/test virsh vol-create-as testpool test 0 --backing-vol vanilla cat /virtual/test/test btrfs subvolume list /virtual Does this look like a useful feature and does it make sense to implement it as a new storage pool type, or should it be merged into an existing one? I looked at the existing ones and couldn't really figure out how to make it fit nicely in any of them. As far as I could tell none of the existing storage pools or volumes offered a way to create a new copy-on-write volume for easy use in LXC domains using the libvirt API. With the new btrfs pool I was able to replace KVM domains using qcow2 volumes with LXC + btrfs with very little changes to the application code. Cheers, Oskari

3 2

[libvirt] [PATCH] random: don't mix RAND_MAX with random_r
by Eric Blake 30 Aug '13

30 Aug '13

FreeBSD 10 recently changed their definition of RAND_MAX, to try and cover the fact that their evenly distributed results really are a smaller range than a full power of 2. As a result, I did some investigation, and learned: 1. POSIX requires random() to be evenly distributed across exactly 31 bits. glibc also guarantees this for rand(), but the two are unrelated, and POSIX only associates RAND_MAX with rand(). Avoiding RAND_MAX altogether thus avoids a build failure on FreeBSD 10. 2. Concatenating random bits from a PRNG will NOT provide uniform coverage over the larger value UNLESS the period of the original PRNG is at least as large as the number of bits being concatenated. Simple example: suppose that RAND_MAX were 1 with a period of 2**1 (which means that the PRNG merely alternates between 0 and 1). Concatenating two successive rand() calls would then invariably result in 01 or 10, which is a rather non-uniform distribution (00 and 11 are impossible) and an even worse period (2**0, since our second attempt will get the same number as our first attempt). But a RAND_MAX of 1 with a period of 2**2 (alternating between 0, 1, 1, 0) provides sane coverage of all four values, if properly tempered. (Back-to-back calls would still only see half the values if we don't do some tempering). We therefore want to guarantee a period of at least 2**64, preferably larger (as a tempering factor); POSIX only makes this guarantee for random() with 256 bytes of info. * src/util/virrandom.c (virRandomBits): Use constants that are accurate for the PRNG we are using, not an unrelated PRNG. (randomState): Ensure the period of our PRNG exceeds our usage. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/util/virrandom.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index c233732..0e368b0 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,7 +36,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE -static char randomState[128]; +static char randomState[256]; static struct random_data randomData; static virMutex randomLock; @@ -70,0 +70,0 @@ virRandomOnceInit(void) VIR_ONCE_GLOBAL_INIT(virRandom) -/* The algorithm of virRandomBits requires that RAND_MAX == 2^n-1 for - * some n; gnulib's random_r meets this property. */ -verify(((RAND_MAX + 1U) & RAND_MAX) == 0); +/* The algorithm of virRandomBits relies on gnulib's guarantee that + * random_r() matches the POSIX requirements on random() of being + * evenly distributed among exactly [0, 2**31) (that is, we always get + * exactly 31 bits). While this happens to be the value of RAND_MAX + * on glibc, note that POSIX only requires RAND_MAX to be tied to the + * weaker rand(), so there are platforms where RAND_MAX is smaller + * than the range of random_r(). For the results to be evenly + * distributed among up to 64 bits, we also rely on the period of + * random_r() to be at least 2**64. */ +enum { + RANDOM_BITS_PER_ITER = 31, + RANDOM_BITS_MASK = (1U << RANDOM_BITS_PER_ITER) - 1, +}; /** * virRandomBits: @@ -85,7 +95,6 @@ verify(((RAND_MAX + 1U) & RAND_MAX) == 0); */ uint64_t virRandomBits(int nbits) { - int bits_per_iter = count_one_bits(RAND_MAX); uint64_t ret = 0; int32_t bits; @@ -98,10 +107,10 @@ uint64_t virRandomBits(int nbits) virMutexLock(&randomLock); - while (nbits > bits_per_iter) { + while (nbits > RANDOM_BITS_PER_ITER) { random_r(&randomData, &bits); - ret = (ret << bits_per_iter) | (bits & RAND_MAX); - nbits -= bits_per_iter; + ret = (ret << RANDOM_BITS_PER_ITER) | (bits & RANDOM_BITS_MASK); + nbits -= RANDOM_BITS_PER_ITER; } random_r(&randomData, &bits); -- 1.8.3.1

1 1

[libvirt] FreeBSD, no gcc present libvirt build issue
by Jason Helfman 30 Aug '13

30 Aug '13

Hello, There is an initiative at FreeBSD in removing gcc from base system and using CLANG. That being said, we are trying to resolve issues of ports that can't build without gcc. Libvirt fell into this group, and are curious if anyone has any ideas on why this breakage would occur. Here is a link to the buildlog: http://pb2.nyi.freebsd.org/bulk/nogcc-default/2013-08-26_21h09m25s/logs/err… Thanks very much! -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

3 10

[libvirt] [PATCH 00/12] Ensure array bounds checking is present on all RPC calls
by Daniel P. Berrange 29 Aug '13

29 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Missing bounds checking on array parameters is a security issue for libvirtd, since it allows a client to make libvirtd allocate unbounded memory. Missing bounds checking on array return values is not a security issue, but it is a robustness issue. If the RPC stream somehow got corrupted, the client could end up allocating unbounded memory. The first patch in this series fixes the security flaw introduced in version 1.1.0, and indentified during discussion of this patch: https://www.redhat.com/archives/libvir-list/2013-August/msg00787.html The remaining patches address the robustness issues, and add a test suite to prevent this flaw recurring. Daniel P. Berrange (12): Add bounds checking on virDomainMigrate*Params RPC calls (CVE-2013-4292) Add bounds checking on virDomainGetJobStats RPC call Add bounds checking on virDomain{SnapshotListAllChildren,ListAllSnapshots} RPC calls Add bounds checking on virConnectListAllDomains RPC call Add bounds checking on virConnectListAllStoragePools RPC call Add bounds checking on virStoragePoolListAllVolumes RPC call Add bounds checking on virConnectListAllNetworks RPC call Add bounds checking on virConnectListAllInterfaces RPC call Add bounds checking on virConnectListAllNodeDevices RPC call Add bounds checking on virConnectListAllNWFilters RPC call Add bounds checking on virConnectListAllSecrets RPC call Prohibit unbounded arrays in XDR protocols cfg.mk | 6 ++ daemon/remote.c | 119 +++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 130 +++++++++++++++++++++++++++++++++++++++++-- src/remote/remote_protocol.x | 108 ++++++++++++++++++----------------- 4 files changed, 304 insertions(+), 59 deletions(-) -- 1.8.3.1

3 17

[libvirt] [PATCH] security: provide supplemental groups even when parsing label (CVE-2013-4291)
by Eric Blake 29 Aug '13

29 Aug '13

Commit 29fe5d7 (released in 1.1.1) introduced a latent problem for any caller of virSecurityManagerSetProcessLabel and where the domain already had a uid:gid label to be parsed. Such a setup would collect the list of supplementary groups during virSecurityManagerPreFork, but then ignores that information, and thus fails to call setgroups() to adjust the supplementary groups of the process. Upstream does not use virSecurityManagerSetProcessLabel for qemu (it uses virSecurityManagerSetChildProcessLabel instead), so this problem remained latent until backporting the initial commit into v0.10.2-maint (commit c061ff5, released in 0.10.2.7), where virSecurityManagerSetChildProcessLabel has not been backported. As a result of using a different code path in the backport, attempts to start a qemu domain that runs as qemu:qemu will end up with supplementary groups unchanged from the libvirtd parent process, rather than the desired supplementary groups of the qemu user. This can lead to failure to start a domain (typical Fedora setup assigns user 107 'qemu' to both group 107 'qemu' and group 36 'kvm', so a disk image that is only readable under kvm group rights is locked out). Worse, it is a security hole (the qemu process will inherit supplemental group rights from the parent libvirtd process, which means it has access rights to files owned by group 0 even when such files should not normally be visible to user qemu). https://bugzilla.redhat.com/show_bug.cgi?id=964359 first demonstrated the problem of broken permissions in qemu when using a build based on 0.10.2. LXC does not use the DAC security driver, so it is not vulnerable at this time. Still, it is better to plug the latent hole on the master branch first, before cherry-picking it to the only vulnerable branch v0.10.2-maint. * src/security/security_dac.c (virSecurityDACGetIds): Always populate groups and ngroups, rather than only when no label is parsed. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/security/security_dac.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 8cbb083..6876bd5 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -115,13 +115,13 @@ virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, return -1; } - if ((ret = virSecurityDACParseIds(def, uidPtr, gidPtr)) <= 0) { - if (groups) - *groups = NULL; - if (ngroups) - *ngroups = 0; + if (groups) + *groups = priv ? priv->groups : NULL; + if (ngroups) + *ngroups = priv ? priv->ngroups : 0; + + if ((ret = virSecurityDACParseIds(def, uidPtr, gidPtr)) <= 0) return ret; - } if (!priv) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -134,10 +134,6 @@ virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, *uidPtr = priv->user; if (gidPtr) *gidPtr = priv->group; - if (groups) - *groups = priv->groups; - if (ngroups) - *ngroups = priv->ngroups; return 0; } -- 1.8.3.1

2 2

[libvirt] [PATCH] Fix a PyList usage mistake
by Guan Qiang 29 Aug '13

29 Aug '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> Fix PyList usage mistake in Function libvirt_lxc_virDomainLxcOpenNamespace. https://bugzilla.redhat.com/show_bug.cgi?id=1002383 --- python/libvirt-lxc-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/libvirt-lxc-override.c b/python/libvirt-lxc-override.c index 73685df..fa7e963 100644 --- a/python/libvirt-lxc-override.c +++ b/python/libvirt-lxc-override.c @@ -80,7 +80,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, if (c_retval < 0) return VIR_PY_NONE; - py_retval = PyList_New(c_retval); + py_retval = PyList_New(0); for (i = 0; i < c_retval; i++) { PyObject *item = NULL; -- 1.7.10.4

2 1

[libvirt] [PATCHv2] virNetDevVethCreate: assign container if name based on parent if name
by Oskari Saarenmaa 29 Aug '13

29 Aug '13

Replace the loop trying to find a free veth interface name for the container by assigning the container if name to parent name + 'p' by default. Interface name selection logic is susceptible to race conditions, so try to select just one name by default and use that as a template for the second name. The parent name can also be overriden in domain configuration. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- v2: generate first name as before (if it wasn't given by the caller), and use the parent if name as a template for the container if name so that the caller doesn't have to select two names (which is not possible at the moment.) src/util/virnetdevveth.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 039767f..91e2829 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -114,20 +114,14 @@ int virNetDevVethCreate(char** veth1, char** veth2) } argv[3] = *veth1; - while (*veth2 == NULL) { - if ((vethDev = virNetDevVethGetFreeName(veth2, vethDev)) < 0) { + if (*veth2 == NULL) { + /* Append a 'p' to veth1 if name */ + if (virAsprintf(veth2, "%sp", *veth1) < 0) { if (veth1_alloc) VIR_FREE(*veth1); goto cleanup; } - /* Just make sure they didn't accidentally get same name */ - if (STREQ(*veth1, *veth2)) { - vethDev++; - VIR_FREE(*veth2); - continue; - } - VIR_DEBUG("Assigned guest: %s", *veth2); veth2_alloc = true; } -- 1.8.3.1

2 3

[libvirt] [PATCH] autogen.sh: Correctly detect .git as a file
by Michal Privoznik 29 Aug '13

29 Aug '13

One of my previous patches 5cfe0d37cd0be tried to handle the case when libvirt is a submodule of another project. In that case, the .git is just a link to the parent .git directory (which the autogen.sh script didn't count on). The fix was missing 'test' though. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index f7c2022..5aa1990 100755 --- a/autogen.sh +++ b/autogen.sh @@ -64,7 +64,7 @@ bootstrap_hash() # like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates # the required file po/Makevars. # Only run bootstrap from a git checkout, never from a tarball. -if test -d .git || -f .git; then +if test -d .git || test -f .git; then curr_status=.git-module-status t= if test "$no_git"; then t=no-git -- 1.8.1.5

2 1

[libvirt] Question about how to contribute patches
by hzguanqiang＠corp.netease.com 29 Aug '13

29 Aug '13

Hi exports, I tried to contribute a patch to fix a bug, following the contributor guidelines on http://libvirt.org/hacking.html. After I do the 'git send-email' operation and edit the email content, It returns: Who should the emails appear to be from? [Guan Qiang <hzguanqiang(a)corp.netease.com>] Emails will be sent from: Guan Qiang <hzguanqiang(a)corp.netease.com> Message-ID to be used as In-Reply-To for the first email? (mbox) Adding cc: Guan Qiang <hzguanqiang(a)corp.netease.com> from line 'From: Guan Qiang <hzguanqiang(a)corp.netease.com>' From: Guan Qiang <hzguanqiang(a)corp.netease.com> To: libvir-list(a)redhat.com Cc: Guan Qiang <hzguanqiang(a)corp.netease.com> Subject: [PATCH]Fix a PyList usage mistake Date: Thu, 29 Aug 2013 13:41:38 +0800 Message-Id: <1377754899-29698-1-git-send-email-hzguanqiang(a)corp.netease.com> X-Mailer: git-send-email 1.7.10.4 The Cc list above has been expanded by additional addresses found in the patch commit message. By default send-email prompts before sending whenever this occurs. This behavior is controlled by the sendemail.confirm configuration setting. For additional information, run 'git send-email --help'. To retain the current behavior, but squelch this message, run 'git config --global sendemail.confirm auto'. Send this email? ([y]es|[n]o|[q]uit|[a]ll): y OK. Log says: Sendmail: /usr/sbin/sendmail -i libvir-list(a)redhat.com hzguanqiang(a)corp.netease.com From: Guan Qiang <hzguanqiang(a)corp.netease.com> To: libvir-list(a)redhat.com Cc: Guan Qiang <hzguanqiang(a)corp.netease.com> Subject: [PATCH]Fix a PyList usage mistake Date: Thu, 29 Aug 2013 13:41:38 +0800 Message-Id: <1377754899-29698-1-git-send-email-hzguanqiang(a)corp.netease.com> X-Mailer: git-send-email 1.7.10.4 Result: OK (mbox) Adding cc: Guan Qiang <hzguanqiang(a)corp.netease.com> from line 'From: Guan Qiang <hzguanqiang(a)corp.netease.com>' From: Guan Qiang <hzguanqiang(a)corp.netease.com> To: libvir-list(a)redhat.com Cc: Guan Qiang <hzguanqiang(a)corp.netease.com> Subject: [PATCH] Fix a PyList usage mistake Date: Thu, 29 Aug 2013 13:41:39 +0800 Message-Id: <1377754899-29698-2-git-send-email-hzguanqiang(a)corp.netease.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1377754899-29698-1-git-send-email-hzguanqiang(a)corp.netease.com> References: <1377754899-29698-1-git-send-email-hzguanqiang(a)corp.netease.com> Send this email? ([y]es|[n]o|[q]uit|[a]ll): y OK. Log says: Sendmail: /usr/sbin/sendmail -i libvir-list(a)redhat.com hzguanqiang(a)corp.netease.com From: Guan Qiang <hzguanqiang(a)corp.netease.com> To: libvir-list(a)redhat.com Cc: Guan Qiang <hzguanqiang(a)corp.netease.com> Subject: [PATCH] Fix a PyList usage mistake Date: Thu, 29 Aug 2013 13:41:39 +0800 Message-Id: <1377754899-29698-2-git-send-email-hzguanqiang(a)corp.netease.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1377754899-29698-1-git-send-email-hzguanqiang(a)corp.netease.com> References: <1377754899-29698-1-git-send-email-hzguanqiang(a)corp.netease.com> Result: OK Does this mean everything is done? Or do I still need to do other thing? Since I do this operation, It had passed three hours and I still can't find my patch email on 'libvir-list'. Really appreciate your advice, Thanks. ------------------ Best regards! GuanQiang 2013-08-29

4 4

[libvirt] [PATCH] virNetDevVethCreate: assign names based on mac address by default
by Oskari Saarenmaa 29 Aug '13

29 Aug '13

Interface names do not have to be numerical (or veth + number) and trying to assign them to that format is susceptible to race conditions. Instead, assign the parent interface name according to the mac address (the last three bytes) if no name was given by the caller and use the parent interface name plus 'p' for the container name. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- src/lxc/lxc_process.c | 2 +- src/util/virnetdevveth.c | 81 +++++++++--------------------------------------- src/util/virnetdevveth.h | 6 ++-- 3 files changed, 19 insertions(+), 70 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..956bbdb 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -243,7 +243,7 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn, VIR_DEBUG("calling vethCreate()"); parentVeth = net->ifname; - if (virNetDevVethCreate(&parentVeth, &containerVeth) < 0) + if (virNetDevVethCreate(&parentVeth, &containerVeth, &net->mac) < 0) goto cleanup; VIR_DEBUG("parentVeth: %s, containerVeth: %s", parentVeth, containerVeth); diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 039767f..c0e3e93 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -38,96 +38,46 @@ /* Functions */ /** - * virNetDevVethGetFreeName: - * @veth: pointer to store returned name for veth device - * @startDev: device number to start at (x in vethx) - * - * Looks in /sys/class/net/ to find the first available veth device - * name. - * - * Returns non-negative device number on success or -1 in case of error - */ -static int virNetDevVethGetFreeName(char **veth, int startDev) -{ - int devNum = startDev-1; - char *path = NULL; - - VIR_DEBUG("Find free from veth%d", startDev); - do { - VIR_FREE(path); - ++devNum; - if (virAsprintf(&path, "/sys/class/net/veth%d/", devNum) < 0) - return -1; - VIR_DEBUG("Probe %s", path); - } while (virFileExists(path)); - VIR_FREE(path); - - if (virAsprintf(veth, "veth%d", devNum) < 0) - return -1; - - return devNum; -} - -/** * virNetDevVethCreate: * @veth1: pointer to name for parent end of veth pair * @veth2: pointer to return name for container end of veth pair + * @mac: mac address of the device * * Creates a veth device pair using the ip command: * ip link add veth1 type veth peer name veth2 - * If veth1 points to NULL on entry, it will be a valid interface on - * return. veth2 should point to NULL on entry. * - * NOTE: If veth1 and veth2 names are not specified, ip will auto assign - * names. There seems to be two problems here - - * 1) There doesn't seem to be a way to determine the names of the - * devices that it creates. They show up in ip link show and - * under /sys/class/net/ however there is no guarantee that they - * are the devices that this process just created. - * 2) Once one of the veth devices is moved to another namespace, it - * is no longer visible in the parent namespace. This seems to - * confuse the name assignment causing it to fail with File exists. - * Because of these issues, this function currently allocates names - * prior to using the ip command, and returns any allocated names - * to the caller. + * If veth1 or veth2 points to NULL on entry, they will be a valid interface + * on return. The name is generated based on the mac address given. * * Returns 0 on success or -1 in case of error */ -int virNetDevVethCreate(char** veth1, char** veth2) +int virNetDevVethCreate(char** veth1, char** veth2, const virMacAddrPtr mac) { - int rc = -1; const char *argv[] = { "ip", "link", "add", NULL, "type", "veth", "peer", "name", NULL, NULL }; - int vethDev = 0; bool veth1_alloc = false; bool veth2_alloc = false; VIR_DEBUG("Host: %s guest: %s", NULLSTR(*veth1), NULLSTR(*veth2)); if (*veth1 == NULL) { - if ((vethDev = virNetDevVethGetFreeName(veth1, vethDev)) < 0) - goto cleanup; + /* Use the last three bytes of the mac address as our if name */ + if (virAsprintf(veth1, "veth%02x%02x%02x", + mac->addr[3], mac->addr[4], mac->addr[5]) < 0) + return -1; VIR_DEBUG("Assigned host: %s", *veth1); veth1_alloc = true; - vethDev++; } argv[3] = *veth1; - while (*veth2 == NULL) { - if ((vethDev = virNetDevVethGetFreeName(veth2, vethDev)) < 0) { + if (*veth2 == NULL) { + /* Append a 'p' to veth1 if name */ + if (virAsprintf(veth2, "%sp", *veth1) < 0) { if (veth1_alloc) VIR_FREE(*veth1); - goto cleanup; - } - - /* Just make sure they didn't accidentally get same name */ - if (STREQ(*veth1, *veth2)) { - vethDev++; - VIR_FREE(*veth2); - continue; + return -1; } - VIR_DEBUG("Assigned guest: %s", *veth2); veth2_alloc = true; } @@ -139,13 +89,10 @@ int virNetDevVethCreate(char** veth1, char** veth2) VIR_FREE(*veth1); if (veth2_alloc) VIR_FREE(*veth2); - goto cleanup; + return -1; } - rc = 0; - -cleanup: - return rc; + return 0; } /** diff --git a/src/util/virnetdevveth.h b/src/util/virnetdevveth.h index 4c220c1..175fbfa 100644 --- a/src/util/virnetdevveth.h +++ b/src/util/virnetdevveth.h @@ -25,10 +25,12 @@ # define __VIR_NETDEV_VETH_H__ # include "internal.h" +# include "virmacaddr.h" /* Function declarations */ -int virNetDevVethCreate(char **veth1, char **veth2) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevVethCreate(char **veth1, char **veth2, const virMacAddrPtr mac) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; int virNetDevVethDelete(const char *veth) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -- 1.8.3.1

4 7

[libvirt] [PATCH] bridge_driver: Introduce networkObjFromNetwork
by Michal Privoznik 29 Aug '13

29 Aug '13

Similarly to qemu_driver.c, we can join often repeating code of looking up network into one function: networkObjFromNetwork. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/network/bridge_driver.c | 76 ++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 45 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 62ae0b7..3a8be90 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -112,6 +112,27 @@ static int networkUnplugBandwidth(virNetworkObjPtr net, static virNetworkDriverStatePtr driverState = NULL; +static virNetworkObjPtr +networkObjFromNetwork(virNetworkPtr net) +{ + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; + virNetworkObjPtr network; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + networkDriverLock(driver); + network = virNetworkFindByUUID(&driver->networks, net->uuid); + networkDriverUnlock(driver); + + if (!network) { + virUUIDFormat(net->uuid, uuidstr); + virReportError(VIR_ERR_NO_NETWORK, + _("no network with matching uuid '%s' (%s)"), + uuidstr, net->name); + } + + return network; +} + static char * networkDnsmasqLeaseFileNameDefault(const char *netname) { @@ -2260,20 +2281,14 @@ cleanup: static int networkIsActive(virNetworkPtr net) { - virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr obj; int ret = -1; - networkDriverLock(driver); - obj = virNetworkFindByUUID(&driver->networks, net->uuid); - networkDriverUnlock(driver); - if (!obj) { - virReportError(VIR_ERR_NO_NETWORK, NULL); - goto cleanup; - } + if (!(obj = networkObjFromNetwork(net))) + return ret; if (virNetworkIsActiveEnsureACL(net->conn, obj->def) < 0) goto cleanup; ret = virNetworkObjIsActive(obj); @@ -2285,20 +2300,14 @@ cleanup: static int networkIsPersistent(virNetworkPtr net) { - virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr obj; int ret = -1; - networkDriverLock(driver); - obj = virNetworkFindByUUID(&driver->networks, net->uuid); - networkDriverUnlock(driver); - if (!obj) { - virReportError(VIR_ERR_NO_NETWORK, NULL); - goto cleanup; - } + if (!(obj = networkObjFromNetwork(net))) + return ret; if (virNetworkIsPersistentEnsureACL(net->conn, obj->def) < 0) goto cleanup; ret = obj->persistent; @@ -2832,30 +2841,22 @@ cleanup: static char *networkGetXMLDesc(virNetworkPtr net, unsigned int flags) { - virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; virNetworkDefPtr def; char *ret = NULL; virCheckFlags(VIR_NETWORK_XML_INACTIVE, NULL); - networkDriverLock(driver); - network = virNetworkFindByUUID(&driver->networks, net->uuid); - networkDriverUnlock(driver); - - if (!network) { - virReportError(VIR_ERR_NO_NETWORK, - "%s", _("no network with matching uuid")); - goto cleanup; - } + if (!(network = networkObjFromNetwork(net))) + return ret; if (virNetworkGetXMLDescEnsureACL(net->conn, network->def) < 0) goto cleanup; if ((flags & VIR_NETWORK_XML_INACTIVE) && network->newDef) def = network->newDef; else def = network->def; ret = virNetworkDefFormat(def, flags); @@ -2866,29 +2867,21 @@ cleanup: } static char *networkGetBridgeName(virNetworkPtr net) { - virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *bridge = NULL; - networkDriverLock(driver); - network = virNetworkFindByUUID(&driver->networks, net->uuid); - networkDriverUnlock(driver); - - if (!network) { - virReportError(VIR_ERR_NO_NETWORK, - "%s", _("no network with matching id")); - goto cleanup; - } + if (!(network = networkObjFromNetwork(net))) + return bridge; if (virNetworkGetBridgeNameEnsureACL(net->conn, network->def) < 0) goto cleanup; if (!(network->def->bridge)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("network '%s' does not have a bridge name."), network->def->name); goto cleanup; } ignore_value(VIR_STRDUP(bridge, network->def->bridge)); @@ -2900,22 +2893,15 @@ cleanup: static int networkGetAutostart(virNetworkPtr net, int *autostart) { - virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; - networkDriverLock(driver); - network = virNetworkFindByUUID(&driver->networks, net->uuid); - networkDriverUnlock(driver); - if (!network) { - virReportError(VIR_ERR_NO_NETWORK, - "%s", _("no network with matching uuid")); - goto cleanup; - } + if (!(network = networkObjFromNetwork(net))) + return ret; if (virNetworkGetAutostartEnsureACL(net->conn, network->def) < 0) goto cleanup; *autostart = network->autostart; ret = 0; -- 1.8.1.5

2 1

[libvirt] [PATCHv2 0/2] Fix crash of libvirtd with <interaface type=network and hostdev forwarding
by Peter Krempa 29 Aug '13

29 Aug '13

Version 2 contains a fix of more callers in qemu and a whitespace cleanup. Peter Krempa (2): qemu: Remove hostdev entry when freeing the depending network entry qemu_hotplug: Fix whitespace around addition in argument src/conf/domain_conf.c | 26 ++++++++++++++++++-------- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_hotplug.c | 9 +++++++-- src/qemu/qemu_process.c | 2 ++ 5 files changed, 29 insertions(+), 10 deletions(-) -- 1.8.3.2

2 4

[libvirt] [PATCH 0/2] netcf: use only a single netcf instance for all connections
by Laine Stump 29 Aug '13

29 Aug '13

There is a good description in 2/2. I'll be out of reach for the next several days, so unable to push even if it gets ACKed before the freeze. I have done a rudimentary test and it seems to work, but if someone with a suitable setup wants to do a stress test with [many] connections, that would be very useful. Laine Stump (2): rename "struct interface_driver" to virNetcfDriverState netcf driver: use a single netcf handle for all connections src/interface/interface_backend_netcf.c | 209 ++++++++++++++++++++++---------- 1 file changed, 144 insertions(+), 65 deletions(-) -- 1.7.11.7

2 4

[libvirt] [PATCH] virsh: detect programming errors with option parsing
by Eric Blake 29 Aug '13

29 Aug '13

Noticed while reviewing another patch that had an accidental mismatch due to refactoring. An audit of the code showed that very few callers of vshCommandOpt were expecting a return of -2, indicating programmer error, and of those that DID check, they just propagated that status to yet another caller that did not check. Fix this by making the code blatantly warn the programmer, rather than silently ignoring it and possibly doing the wrong thing downstream. I know that we frown on assert()/abort() inside libvirtd (libraries should NEVER kill the program that linked them), but as virsh is an app rather than the library, and as this is not the first use of assert() in virsh, I think this approach is okay. * tools/virsh.h (vshCommandOpt): Drop declaration. * tools/virsh.c (vshCommandOpt): Make static, and add a parameter. Abort on programmer errors rather than making callers repeat that logic. (vshCommandOptInt, vshCommandOptUInt, vshCommandOptUL) (vshCommandOptString, vshCommandOptStringReq) (vshCommandOptLongLong, vshCommandOptULongLong) (vshCommandOptBool): Adjust callers. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- In response to my observation on Don's email: https://www.redhat.com/archives/libvir-list/2013-August/msg00769.html tools/virsh.c | 97 +++++++++++++++++++++-------------------------------------- tools/virsh.h | 5 +-- 2 files changed, 35 insertions(+), 67 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f65dc79..4c4e92c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -25,6 +25,7 @@ #include <config.h> #include "virsh.h" +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -1340,39 +1341,46 @@ vshCommandFree(vshCmd *cmd) * @cmd: parsed command line to search * @name: option name to search for * @opt: result of the search + * @needData: true if option must be non-boolean * * Look up an option passed to CMD by NAME. Returns 1 with *OPT set * to the option if found, 0 with *OPT set to NULL if the name is * valid and the option is not required, -1 with *OPT set to NULL if - * the option is required but not present, and -2 if NAME is not valid - * (-2 indicates a programming error). No error messages are issued. + * the option is required but not present, and abort if NAME is not valid + * (which indicates a programming error). No error messages are issued + * if a value is returned. */ -int -vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt) +static int +vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, + bool needData) { vshCmdOpt *candidate = cmd->opts; const vshCmdOptDef *valid = cmd->def->opts; + int ret = 0; + + /* See if option is valid and/or required. */ + *opt = NULL; + while (valid) { + assert(valid->name); + if (STREQ(name, valid->name)) + break; + valid++; + } + if (needData && valid->type == VSH_OT_BOOL) + abort(); + if (valid->flags & VSH_OFLAG_REQ) + ret = -1; /* See if option is present on command line. */ while (candidate) { if (STREQ(candidate->def->name, name)) { *opt = candidate; - return 1; + ret = 1; + break; } candidate = candidate->next; } - - /* Option not present, see if command requires it. */ - *opt = NULL; - while (valid) { - if (!valid->name) - break; - if (STREQ(name, valid->name)) - return (valid->flags & VSH_OFLAG_REQ) == 0 ? 0 : -1; - valid++; - } - /* If we got here, the name is unknown. */ - return -2; + return ret; } /** @@ -1393,14 +1401,9 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) vshCmdOpt *arg; int ret; - ret = vshCommandOpt(cmd, name, &arg); + ret = vshCommandOpt(cmd, name, &arg, true); if (ret <= 0) return ret; - if (!arg->data) { - /* only possible on bool, but if name is bool, this is a - * programming bug */ - return -2; - } if (virStrToLong_i(arg->data, NULL, 10, value) < 0) return -1; @@ -1423,14 +1426,9 @@ vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) vshCmdOpt *arg; int ret; - ret = vshCommandOpt(cmd, name, &arg); + ret = vshCommandOpt(cmd, name, &arg, true); if (ret <= 0) return ret; - if (!arg->data) { - /* only possible on bool, but if name is bool, this is a - * programming bug */ - return -2; - } if (virStrToLong_ui(arg->data, NULL, 10, value) < 0) return -1; @@ -1453,14 +1451,9 @@ vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) vshCmdOpt *arg; int ret; - ret = vshCommandOpt(cmd, name, &arg); + ret = vshCommandOpt(cmd, name, &arg, true); if (ret <= 0) return ret; - if (!arg->data) { - /* only possible on bool, but if name is bool, this is a - * programming bug */ - return -2; - } if (virStrToLong_ul(arg->data, NULL, 10, value) < 0) return -1; @@ -1485,14 +1478,9 @@ vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) vshCmdOpt *arg; int ret; - ret = vshCommandOpt(cmd, name, &arg); + ret = vshCommandOpt(cmd, name, &arg, true); if (ret <= 0) return ret; - if (!arg->data) { - /* only possible on bool, but if name is bool, this is a - * programming bug */ - return -2; - } if (!*arg->data && !(arg->def->flags & VSH_OFLAG_EMPTY_OK)) { return -1; @@ -1527,21 +1515,14 @@ vshCommandOptStringReq(vshControl *ctl, /* clear out the value */ *value = NULL; - ret = vshCommandOpt(cmd, name, &arg); + ret = vshCommandOpt(cmd, name, &arg, true); /* option is not required and not present */ if (ret == 0) return 0; /* this should not be propagated here, just to be sure */ if (ret == -1) error = N_("Mandatory option not present"); - - if (ret == -2) - error = N_("Programming error: Invalid option name"); - - if (!arg->data) - error = N_("Programming error: Requested option is a boolean"); - - if (arg->data && !*arg->data && !(arg->def->flags & VSH_OFLAG_EMPTY_OK)) + else if (!*arg->data && !(arg->def->flags & VSH_OFLAG_EMPTY_OK)) error = N_("Option argument is empty"); if (error) { @@ -1569,14 +1550,9 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, vshCmdOpt *arg; int ret; - ret = vshCommandOpt(cmd, name, &arg); + ret = vshCommandOpt(cmd, name, &arg, true); if (ret <= 0) return ret; - if (!arg->data) { - /* only possible on bool, but if name is bool, this is a - * programming bug */ - return -2; - } if (virStrToLong_ll(arg->data, NULL, 10, value) < 0) return -1; @@ -1599,14 +1575,9 @@ vshCommandOptULongLong(const vshCmd *cmd, const char *name, vshCmdOpt *arg; int ret; - ret = vshCommandOpt(cmd, name, &arg); + ret = vshCommandOpt(cmd, name, &arg, true); if (ret <= 0) return ret; - if (!arg->data) { - /* only possible on bool, but if name is bool, this is a - * programming bug */ - return -2; - } if (virStrToLong_ull(arg->data, NULL, 10, value) < 0) return -1; @@ -1659,7 +1630,7 @@ vshCommandOptBool(const vshCmd *cmd, const char *name) { vshCmdOpt *dummy; - return vshCommandOpt(cmd, name, &dummy) == 1; + return vshCommandOpt(cmd, name, &dummy, false) == 1; } /** diff --git a/tools/virsh.h b/tools/virsh.h index a407428..382e00a 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -1,7 +1,7 @@ /* * virsh.h: a shell to exercise the libvirt API * - * Copyright (C) 2005, 2007-2012 Red Hat, Inc. + * Copyright (C) 2005, 2007-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -261,9 +261,6 @@ bool vshCmddefHelp(vshControl *ctl, const char *name); const vshCmdGrp *vshCmdGrpSearch(const char *grpname); bool vshCmdGrpHelp(vshControl *ctl, const char *name); -int vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; int vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int vshCommandOptUInt(const vshCmd *cmd, const char *name, -- 1.8.3.1

2 2

Re: [libvirt] Information needed regarding libvirt error
by Martin Kletzander 28 Aug '13

28 Aug '13

[cc'ing libvir-list] On 08/26/2013 05:59 PM, arun abhinay wrote: > Hi, > > Can you please consider this is an gentle reminder for my below request. > > Thanks > Abhinay > > On Fri, Aug 23, 2013 at 1:01 PM, arun abhinay <arun.abhinay(a)gmail.com>wrote: > >> Hi Martin/Peter, >> Hi, firstly, feel free to write to the list, not just particular people. There are many more people on the list that may help you. Not mentioning that those people you write might not be available, don't have time etc. There was a similar question to the one you've asked, you could have checked that out before as well and reply on it. There's also a patch fixing cpu-stats command, check it that helps. >> In reference to >> http://comments.gmane.org/gmane.comp.emulators.libvirt/62451 >> >> We have created a VM on a qemu-kvm emulator using the domain.xml as >> mentioned in attachment. The starting of the VM is sucessful but we are >> facing issue while executing the command "cpu-stats <domain>". While >> analysis we found below below log in libvirtd.log >> >> 2013-08-22 12:45:44.326+0000: 17554: warning : qemuSetupCgroupForVcpu:953 >> : Unable to get vcpus' pids >> This basically means that you have old qemu that doesn't support (I'm guesing the command now) "query-vcpus" QMP command. The problem probably lies somewhere else, even though my change might have caused the other part to behave differently. >> The complete logs while starting VM and while executing the "cpu-stats" >> command are attached with this mail for reference. Can you please check and >> provide us some inputs or pointers to get "cpu-stats" command working. >> >> I am new to using libvirt. Your inputs would be of great help to us. >> >> Libvrit and qemu-kvm verisons used are mentioned below >> libvirt-1.0.6-1 >> qemu-kvm-0.14.1-1 >> >> <<CLA_new-0.xml >> --> Domain.xml used to define VM >> << libvirt_testing_starting_VG.log >> --> Log while staring VM >> <<libvirt_testing_cpu_stats.log >> ---> Log while executing command >> cpu_stats. >> According to the logs, it looks like it's completely the same like a question already asked... Wanting to post the link here, I've found that even the machine name is the same, so it shouldn't be a problem for you to find it. I'm looking at the issue now, so I'll see what I can do, but maybe in the meantime sombody else will reply. Martin

2 5

[libvirt] [libvirt-glib] Add missing symbols to .sym files
by Christophe Fergeau 28 Aug '13

28 Aug '13

These symbols are in public headers, but were not listed in the corresponding .sym file, causing them to be unavailable from the resulting shared library. I would have preferred not to export gvir_config_object_new_from_xml() at all, but since the similar gvir_config_object_new() is already exported, I've chosen to export it as well. --- libvirt-gconfig/libvirt-gconfig.sym | 11 +++++++++++ libvirt-gobject/libvirt-gobject.sym | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index be05ce4..72eafc1 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -599,4 +599,15 @@ LIBVIRT_GCONFIG_0.1.7 { gvir_config_domain_device_get_alias; } LIBVIRT_GCONFIG_0.1.6; +LIBVIRT_GCONFIG_0.1.8 { +global: + gvir_config_domain_get_uuid; + gvir_config_domain_set_uuid; + + gvir_config_domain_graphics_rdp_set_multi_user; + gvir_config_domain_graphics_rdp_set_replace_user; + + gvir_config_object_new_from_xml; +} LIBVIRT_GCONFIG_0.1.7; + # .... define new API here using predicted next version number .... diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 9522167..edc876d 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -232,4 +232,8 @@ LIBVIRT_GOBJECT_0.1.5 { gvir_connection_open_read_only_finish; } LIBVIRT_GOBJECT_0.1.4; +LIBVIRT_GOBJECT_0.1.8 { + gvir_connection_restore_domain_from_file_finish; +} LIBVIRT_GOBJECT_0.1.5; + # .... define new API here using predicted next version number .... -- 1.8.3.1

3 2

[libvirt] [PATCH] virt-sanlock-cleanup; Fix augtool usage
by Jiri Denemark 28 Aug '13

28 Aug '13

Surprisingly, augtool get (or print) returns "path = value" while we are only interested in the value. We need to remove the "path = " part from the augtool's output. The following is an example of the augtool command as used in virt-sanlock-cleanup script: $ augtool get /files/etc/libvirt/qemu-sanlock.conf/disk_lease_dir /files/etc/libvirt/qemu-sanlock.conf/disk_lease_dir = /var/lib/libvirt/sanlock --- tools/virt-sanlock-cleanup.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virt-sanlock-cleanup.in b/tools/virt-sanlock-cleanup.in index e0e8083..9855f42 100644 --- a/tools/virt-sanlock-cleanup.in +++ b/tools/virt-sanlock-cleanup.in @@ -26,7 +26,8 @@ fi LOCKSPACE="__LIBVIRT__DISKS__" -LOCKDIR=`augtool print '/files@sysconfdir@/libvirt/qemu-sanlock.conf/disk_lease_dir'` +LOCKDIR=`augtool get '/files@sysconfdir@/libvirt/qemu-sanlock.conf/disk_lease_dir'` +LOCKDIR=${LOCKDIR#* = } if test $? != 0 || test "x$LOCKDIR" = "x" ; then LOCKDIR="@localstatedir@/lib/libvirt/sanlock" fi -- 1.8.3.2

2 3

[libvirt] [PATCH] virsh: Fix debugging
by Martin Kletzander 28 Aug '13

28 Aug '13

Commit a0b6a36f "fixed" what abfff210 broke (URI precedence), but there was still one more thing missing to fix. When using virsh parameters to setup debugging, those weren't honored, because at the time debugging was initializing, arguments weren't parsed yet. To make ewerything work as expected, we need to initialize the debugging twice, once before debugging (so we can debug option parsing properly) and then again after these options are parsed. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 2ea44a6..ac77156 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2333,6 +2333,10 @@ vshInitDebug(vshControl *ctl) static bool vshInit(vshControl *ctl) { + /* Since we have the commandline arguments parsed, we need to + * re-initialize all the debugging to make it work properly */ + vshInitDebug(ctl); + if (ctl->conn) return false; -- 1.8.3.2

4 6

[libvirt] [PATCH] qemu: Remove hostdev entry when freeing the depending network entry
by Peter Krempa 28 Aug '13

28 Aug '13

When using a <interface type="network"> that points to a network with hostdev forwarding mode a hostdev alias is created for the network. This allias is inserted into the hostdev list, but is backed with a part of the network object that it is connected to. When a VM is being stopped qemuProcessStop() calls networkReleaseActualDevice() which eventually frees the memory for the hostdev object. Afterwards when the domain definition is being freed by virDomainDefFree() an invalid pointer is accessed by virDomainHostdevDefFree() and may cause a crash of the daemon. This patch removes the entry in the hostdev list before freeing the depending memory to avoid this issue. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1000973 --- src/qemu/qemu_process.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 128618b..2a69c8d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4241,6 +4241,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, def = vm->def; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; + virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net); + int hostdev_index; + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevMacVLanDeleteWithVPortProfile( net->ifname, &net->mac, @@ -4259,6 +4262,11 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainNetGetActualBridgeName(net), net->ifname)); + if (hostdev) { + if ((hostdev_index = virDomainHostdevFind(def, hostdev, NULL)) > 0) + virDomainHostdevRemove(def, hostdev_index); + } + networkReleaseActualDevice(net); } -- 1.8.3.2

2 3

[libvirt] [PATCH] virsh-pool.c: Don't jump over variable declaration
by Michal Privoznik 28 Aug '13

28 Aug '13

Since 785ff34bf8 we are using the outputStr variable in cleanup label. However, there is a possibility to jump to the label before the variable has been declared: virsh-pool.c: In function 'cmdPoolList': virsh-pool.c:1121:25: error: jump skips variable initialization [-Werror=jump-misses-init] goto asprintf_failure; ^ virsh-pool.c:1308:1: note: label 'asprintf_failure' defined here asprintf_failure: ^ virsh-pool.c:1267:11: note: 'outputStr' declared here char *outputStr = NULL; Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under buil-breaker rule. tools/virsh-pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 3d3c61e..c771226 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -964,6 +964,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *type = NULL; bool details = vshCommandOptBool(cmd, "details"); bool inactive, all; + char *outputStr = NULL; inactive = vshCommandOptBool(cmd, "inactive"); all = vshCommandOptBool(cmd, "all"); @@ -1264,7 +1265,6 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Create the output template. Each column is sized according to * the longest string. */ - char *outputStr = NULL; ret = virAsprintf(&outputStr, "%%-%lus %%-%lus %%-%lus %%-%lus %%%lus %%%lus %%%lus\n", (unsigned long) nameStrLength, -- 1.8.1.5

1 0

[libvirt] [PATCH v3 0/2] Add tests for network update XML parsing
by Ján Tomko 28 Aug '13

28 Aug '13

v1: https://www.redhat.com/archives/libvir-list/2013-July/msg01971.html v2: https://www.redhat.com/archives/libvir-list/2013-August/msg00035.html remove the spaces from other elements instead of adding one v3: rebase because of 4f595ba adding forwardPlainNames Ján Tomko (2): Remove the space before the slash in network XML Test network update XML parsing src/conf/network_conf.c | 26 +- src/conf/network_conf.h | 9 + src/libvirt_private.syms | 1 + src/network/default.xml | 4 +- src/test/test_driver.c | 4 +- tests/Makefile.am | 9 +- tests/networkxml2confdata/dhcp6-nat-network.xml | 20 +- tests/networkxml2confdata/dhcp6-network.xml | 14 +- .../dhcp6host-routed-network.xml | 16 +- tests/networkxml2confdata/isolated-network.xml | 4 +- .../networkxml2confdata/nat-network-dns-hosts.xml | 2 +- .../nat-network-dns-srv-record-minimal.xml | 10 +- .../nat-network-dns-srv-record.xml | 10 +- .../nat-network-dns-txt-record.xml | 10 +- tests/networkxml2confdata/nat-network.xml | 8 +- tests/networkxml2confdata/netboot-network.xml | 8 +- .../networkxml2confdata/netboot-proxy-network.xml | 6 +- tests/networkxml2confdata/routed-network.xml | 2 +- tests/networkxml2xmlin/bandwidth-network.xml | 4 +- .../networkxml2xmlin/dhcp6host-routed-network.xml | 16 +- tests/networkxml2xmlin/empty-allow-ipv6.xml | 2 +- tests/networkxml2xmlin/isolated-network.xml | 4 +- tests/networkxml2xmlin/nat-network-dns-hosts.xml | 2 +- .../nat-network-dns-srv-record-minimal.xml | 10 +- .../nat-network-dns-srv-record.xml | 10 +- .../nat-network-dns-srv-records.xml | 27 ++ .../nat-network-dns-txt-record.xml | 10 +- tests/networkxml2xmlin/nat-network.xml | 8 +- tests/networkxml2xmlin/netboot-network.xml | 6 +- tests/networkxml2xmlin/netboot-proxy-network.xml | 4 +- tests/networkxml2xmlin/routed-network.xml | 2 +- tests/networkxml2xmlout/bandwidth-network.xml | 4 +- .../networkxml2xmlout/dhcp6host-routed-network.xml | 16 +- tests/networkxml2xmlout/empty-allow-ipv6.xml | 2 +- tests/networkxml2xmlout/host-bridge-net.xml | 2 +- tests/networkxml2xmlout/isolated-network.xml | 4 +- .../nat-network-dns-forward-plain.xml | 2 +- tests/networkxml2xmlout/nat-network-dns-hosts.xml | 2 +- .../nat-network-dns-srv-record-minimal.xml | 10 +- .../nat-network-dns-srv-record.xml | 10 +- .../nat-network-dns-srv-records.xml | 27 ++ .../nat-network-dns-txt-record.xml | 10 +- tests/networkxml2xmlout/nat-network.xml | 8 +- tests/networkxml2xmlout/netboot-network.xml | 8 +- tests/networkxml2xmlout/netboot-proxy-network.xml | 6 +- tests/networkxml2xmlout/routed-network.xml | 2 +- tests/networkxml2xmltest.c | 3 + .../networkxml2xmlupdatein/dhcp-range-existing.xml | 1 + tests/networkxml2xmlupdatein/dhcp-range.xml | 1 + .../dns-host-gateway-incomplete.xml | 3 + tests/networkxml2xmlupdatein/dns-host-pudding.xml | 3 + .../dns-txt-record-example.xml | 1 + .../dns-txt-record-snowman.xml | 1 + tests/networkxml2xmlupdatein/host-existing.xml | 1 + tests/networkxml2xmlupdatein/host-incomplete.xml | 1 + .../networkxml2xmlupdatein/host-new-incomplete.xml | 1 + tests/networkxml2xmlupdatein/host-new.xml | 1 + tests/networkxml2xmlupdatein/host-updated.xml | 1 + tests/networkxml2xmlupdatein/interface-eth1.xml | 1 + tests/networkxml2xmlupdatein/interface-eth47.xml | 1 + .../networkxml2xmlupdatein/portgroup-alice-new.xml | 10 + tests/networkxml2xmlupdatein/portgroup-alison.xml | 11 + tests/networkxml2xmlupdatein/srv-record-donkey.xml | 1 + .../networkxml2xmlupdatein/srv-record-invalid.xml | 1 + .../networkxml2xmlupdatein/srv-record-protocol.xml | 1 + .../networkxml2xmlupdatein/srv-record-service.xml | 1 + tests/networkxml2xmlupdatein/srv-record.xml | 1 + .../networkxml2xmlupdatein/unparsable-dns-host.xml | 1 + .../dhcp6host-routed-network-another-range.xml | 27 ++ .../dhcp6host-routed-network-range.xml | 27 ++ .../nat-network-dns-more-hosts.xml | 19 ++ .../nat-network-dns-srv-record.xml | 26 ++ .../nat-network-dns-srv-records.xml | 27 ++ .../nat-network-dns-txt-none.xml | 23 ++ .../nat-network-dns-txt-records.xml | 27 ++ .../nat-network-forward-ifaces.xml | 27 ++ .../nat-network-host-updated.xml | 23 ++ .../networkxml2xmlupdateout/nat-network-hosts.xml | 24 ++ .../nat-network-no-forward-ifaces.xml | 24 ++ .../nat-network-no-hosts.xml | 10 + .../nat-network-no-range.xml | 22 ++ .../nat-network-one-host.xml | 22 ++ tests/networkxml2xmlupdateout/nat-network.xml | 23 ++ .../openvswitch-net-modified.xml | 33 ++ .../openvswitch-net-more-portgroups.xml | 44 +++ .../openvswitch-net-without-alice.xml | 23 ++ tests/networkxml2xmlupdatetest.c | 372 +++++++++++++++++++++ 87 files changed, 1096 insertions(+), 155 deletions(-) create mode 100644 tests/networkxml2xmlin/nat-network-dns-srv-records.xml create mode 100644 tests/networkxml2xmlout/nat-network-dns-srv-records.xml create mode 100644 tests/networkxml2xmlupdatein/dhcp-range-existing.xml create mode 100644 tests/networkxml2xmlupdatein/dhcp-range.xml create mode 100644 tests/networkxml2xmlupdatein/dns-host-gateway-incomplete.xml create mode 100644 tests/networkxml2xmlupdatein/dns-host-pudding.xml create mode 100644 tests/networkxml2xmlupdatein/dns-txt-record-example.xml create mode 100644 tests/networkxml2xmlupdatein/dns-txt-record-snowman.xml create mode 100644 tests/networkxml2xmlupdatein/host-existing.xml create mode 100644 tests/networkxml2xmlupdatein/host-incomplete.xml create mode 100644 tests/networkxml2xmlupdatein/host-new-incomplete.xml create mode 100644 tests/networkxml2xmlupdatein/host-new.xml create mode 100644 tests/networkxml2xmlupdatein/host-updated.xml create mode 100644 tests/networkxml2xmlupdatein/interface-eth1.xml create mode 100644 tests/networkxml2xmlupdatein/interface-eth47.xml create mode 100644 tests/networkxml2xmlupdatein/portgroup-alice-new.xml create mode 100644 tests/networkxml2xmlupdatein/portgroup-alison.xml create mode 100644 tests/networkxml2xmlupdatein/srv-record-donkey.xml create mode 100644 tests/networkxml2xmlupdatein/srv-record-invalid.xml create mode 100644 tests/networkxml2xmlupdatein/srv-record-protocol.xml create mode 100644 tests/networkxml2xmlupdatein/srv-record-service.xml create mode 100644 tests/networkxml2xmlupdatein/srv-record.xml create mode 100644 tests/networkxml2xmlupdatein/unparsable-dns-host.xml create mode 100644 tests/networkxml2xmlupdateout/dhcp6host-routed-network-another-range.xml create mode 100644 tests/networkxml2xmlupdateout/dhcp6host-routed-network-range.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-host-updated.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-hosts.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-no-hosts.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-no-range.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network-one-host.xml create mode 100644 tests/networkxml2xmlupdateout/nat-network.xml create mode 100644 tests/networkxml2xmlupdateout/openvswitch-net-modified.xml create mode 100644 tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml create mode 100644 tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml create mode 100644 tests/networkxml2xmlupdatetest.c -- 1.8.1.5

2 5

[libvirt] [PATCH 0/4] Plug some virsh leaks
by Ján Tomko 28 Aug '13

28 Aug '13

https://bugzilla.redhat.com/show_bug.cgi?id=1001536 Ján Tomko (4): virsh: free messages after logging them to a file virsh: free the list from ListAll APIs even for 0 items virsh: free the formatting string when listing pool details virsh: free the caps list properly if one of them is invalid tools/virsh-interface.c | 2 +- tools/virsh-network.c | 2 +- tools/virsh-nodedev.c | 6 +++--- tools/virsh-nwfilter.c | 2 +- tools/virsh-pool.c | 3 ++- tools/virsh-secret.c | 2 +- tools/virsh.c | 1 + 7 files changed, 10 insertions(+), 8 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH] qemu: Add missing VIR_DOMAIN_BLOCK_COMMIT_DELETE flags
by Alex Jia 28 Aug '13

28 Aug '13

The flag "VIR_DOMAIN_BLOCK_COMMIT_DELETE" is missed by qemuDomainBlockCommit(), and then will hit error "unsupported flags (0x2) in function qemuDomainBlockCommit" if users run 'virsh blockcommit' with '--delete' option. RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1001475 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ed29373..8863124 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14444,7 +14444,8 @@ qemuDomainBlockCommit(virDomainPtr dom, const char *path, const char *base, const char *base_canon = NULL; bool clean_access = false; - virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW, -1); + virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW | + VIR_DOMAIN_BLOCK_COMMIT_DELETE, -1); if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; -- 1.7.1

4 8

[libvirt] How about realize domainSetBlockIoTune by cgroup?
by hzguanqiang＠corp.netease.com 28 Aug '13

28 Aug '13

Hello experts, It seems that blkiotune of kvm domain is set through qemu now, and We found there are some throttle shaking problem when using this interface. As you can do the same thing through blkio cgroup, and this sounds to show better performance, Can we realize domainSetBlockIoTune by cgroup just like interface domainSetBlkioParameters ? Or Add a new interface to support setting disk IOtune by blkio cgroup? Thanks ------------------ Best regards! GuanQiang 2013-08-27

3 6

[libvirt] [PATCH] Use loop-control to allocate loopback device.
by Ian Main 28 Aug '13

28 Aug '13

This patch changes virFileLoopDeviceOpen() to use the new loop-control device to allocate a new loop device. If this behavior is unsupported or an error occurs while trying to do this it falls back to the previous method of searching /dev for a free device. With this patch you can start as many image based LXC domains as you like (well almost). Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=995543 Signed-off-by: Ian Main <imain(a)redhat.com> --- configure.ac | 12 +++++++++++ src/util/virfile.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac8cfa1..10cd872 100644 --- a/configure.ac +++ b/configure.ac @@ -913,6 +913,18 @@ if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then AC_MSG_ERROR([Required kernel features for LXC were not found]) fi ]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[ + #include <sched.h> + #include <linux/loop.h> + #include <sys/epoll.h> + ]], [[ + unshare(!(LOOP_CTL_GET_FREE)); + ]])], [ + AC_DEFINE([HAVE_DECL_LOOP_CTL_GET_FREE], [1], + [Define to 1 if you have the declaration of `LOOP_CTL_GET_FREE', + and to 0 if you don't.]) + ]) fi if test "$with_lxc" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) diff --git a/src/util/virfile.c b/src/util/virfile.c index 2b07ac9..f70f9fe 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -528,7 +528,47 @@ int virFileUpdatePerm(const char *path, #if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR -static int virFileLoopDeviceOpen(char **dev_name) + +#if HAVE_DECL_LOOP_CTL_GET_FREE +static int virFileLoopDeviceOpenLoopCtl(char **dev_name) +{ + int fd = -1; + int devnr; + char *looppath = NULL; + + VIR_DEBUG("Opening loop-control device"); + if ((fd = open("/dev/loop-control", O_RDWR)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to open /dev/loop-control")); + return -1; + } + + if ((devnr = ioctl(fd, LOOP_CTL_GET_FREE)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get free loop device via ioctl")); + close(fd); + return -1; + } + close(fd); + + VIR_DEBUG("Found free loop device number %i", devnr); + + if (virAsprintf(&looppath, "/dev/loop%i", devnr) < 0) + return -1; + + if ((fd = open(looppath, O_RDWR)) < 0) { + virReportSystemError(errno, + _("Unable to open %s"), looppath); + VIR_FREE(looppath); + return -1; + } + + *dev_name = looppath; + return fd; +} +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + +static int virFileLoopDeviceOpenSearch(char **dev_name) { int fd = -1; DIR *dh = NULL; @@ -601,6 +641,25 @@ cleanup: return fd; } +static int virFileLoopDeviceOpen(char **dev_name) +{ + int loop_fd; + +#ifdef HAVE_DECL_LOOP_CTL_GET_FREE + loop_fd = virFileLoopDeviceOpenLoopCtl(dev_name); + VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + if (loop_fd < 0) { + VIR_WARN("loop-control allocation failed, trying search technique."); + } else { + return loop_fd; + } +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + + /* Without the loop control device we just use the old technique. */ + loop_fd = virFileLoopDeviceOpenSearch(dev_name); + + return loop_fd; +} int virFileLoopDeviceAssociate(const char *file, char **dev) -- 1.8.1.4

2 3

[libvirt] [PATCH v3 0/4] Add support for adjusting the 64-bit PCI hole size
by Ján Tomko 27 Aug '13

27 Aug '13

v3: use <pcihole64> sub-element of the root PCI controller with 'unit' attribute, defaulting to KiB v2: https://www.redhat.com/archives/libvir-list/2013-August/msg00565.html Use 'pcihole64' attribute of the root PCI controller instead of <pcihole64> element in domain features. v1: https://www.redhat.com/archives/libvir-list/2013-August/msg00510.html https://bugzilla.redhat.com/show_bug.cgi?id=990418 Ján Tomko (4): Move virDomainParseScaledValue earlier Allow controller XML parsing to use XPath context Add pcihole64 element to root PCI controllers Build QEMU command line for pcihole64 docs/formatdomain.html.in | 9 ++ docs/schemas/domaincommon.rng | 32 +++-- src/conf/domain_conf.c | 140 +++++++++++++-------- src/conf/domain_conf.h | 8 ++ src/qemu/qemu_capabilities.c | 14 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 58 +++++++++ .../qemuxml2argv-pcihole64-gib.xml | 23 ++++ .../qemuxml2argv-pcihole64-none.args | 4 + .../qemuxml2argv-pcihole64-none.xml | 23 ++++ .../qemuxml2argv-pcihole64-q35.args | 9 ++ .../qemuxml2argv-pcihole64-q35.xml | 33 +++++ tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 5 + tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 23 ++++ tests/qemuxml2argvtest.c | 10 ++ .../qemuxml2xmlout-pcihole64-gib.xml | 23 ++++ tests/qemuxml2xmltest.c | 5 + 17 files changed, 358 insertions(+), 63 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-gib.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-gib.xml -- 1.8.1.5

3 13

[libvirt] [PATCHv4 0/5] Introduce API to query IP addresses for given domain
by Nehal J Wani 27 Aug '13

27 Aug '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.mail-archive.com/libvir-list@redhat.com/msg51857.html A patch was submitted, using structs: http://www.mail-archive.com/libvir-list@redhat.com/msg57141.html Another patch was submitted, using XML: http://www.mail-archive.com/libvir-list@redhat.com/msg57829.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: http://www.mail-archive.com/libvir-list@redhat.com/msg79793.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfacesAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) Nehal J Wani (5): domifaddr: Implement the public API domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 127 +++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 +++++++++++++ include/libvirt/libvirt.h.in | 33 +++++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 8 ++- python/libvirt-override.c | 113 +++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 109 ++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 153 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 55 +++++++++++++++ src/remote/remote_driver.c | 85 ++++++++++++++++++++++ src/remote/remote_protocol.x | 41 ++++++++++- src/remote_protocol-structs | 24 +++++++ tests/qemuagenttest.c | 113 +++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 101 ++++++++++++++++++++++++++ tools/virsh.pod | 10 +++ 20 files changed, 1040 insertions(+), 3 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

4 22

[libvirt] [PATCHv2 0/4] VMX: CD-ROM handling improvements
by Doug Goldstein 27 Aug '13

27 Aug '13

A user came into #virt the other day and was trying to get libvirtd to work with VMWare Fusion 5, which is basically the Mac OS X version of VMWare Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. However I came across the fact that we only support 2 types of CD-ROMs instead of the 3 types that VMWare has lead to adding support for a <driver> element to CD-ROM drives. Additionally VMWare Fusion has a concept of auto detecting your host CD-ROM drive at boot and we don't have a XML field for this so I omitted a <source> element and added the tray to be opened. Doug Goldstein (4): VMX: Add cdrom-raw dev type from VMWare Fusion VMX: Add support for 'auto detect' fileNames VMX: Some serial ports are not actually connected VMX: Add a VMWare Fusion 5 configuration for tests docs/formatdomain.html.in | 3 +- src/vmx/vmx.c | 61 ++++++++++++--- tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 1 + .../vmx2xml-cdrom-ide-raw-auto-detect.vmx | 5 ++ .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 24 ++++++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 5 ++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 25 ++++++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 1 + .../vmx2xml-cdrom-scsi-raw-auto-detect.vmx | 6 ++ .../vmx2xml-cdrom-scsi-raw-auto-detect.xml | 24 ++++++ .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx | 6 ++ .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 25 ++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 1 + tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 ++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 39 ++++++++++ tests/vmx2xmltest.c | 6 ++ .../xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.vmx | 13 ++++ .../xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.xml | 15 ++++ .../xml2vmx-cdrom-ide-raw-auto-detect.vmx | 14 ++++ .../xml2vmx-cdrom-ide-raw-auto-detect.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx | 13 ++++ tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml | 15 ++++ .../xml2vmx-cdrom-scsi-atapi-device.vmx | 14 ++++ .../xml2vmx-cdrom-scsi-atapi-device.xml | 15 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.vmx | 15 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.xml | 14 ++++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx | 14 ++++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml | 15 ++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 30 ++++++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 40 ++++++++++ tests/xml2vmxtest.c | 8 ++ 31 files changed, 558 insertions(+), 11 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-atapi-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-atapi-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-atapi-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml -- 1.8.1.5

3 7

[libvirt] [RFC] Expose cpu_map.xml via API
by Giuseppe Scrivano 27 Aug '13

27 Aug '13

--- I have started working on: https://bugzilla.redhat.com/show_bug.cgi?id=916786 Before I split it in a series of commits, test it better and then proceed to virt-manager, are you ok with this idea? include/libvirt/libvirt.h.in | 11 +++++++++++ src/driver.h | 4 ++++ src/libvirt.c | 38 ++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/lxc/lxc_driver.c | 11 +++++++++++ src/qemu/qemu_driver.c | 10 ++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +++++++++++- src/remote_protocol-structs | 4 ++++ src/test/test_driver.c | 6 ++++++ src/uml/uml_driver.c | 11 +++++++++++ src/util/virutil.c | 23 +++++++++++++++++++++++ src/util/virutil.h | 3 +++ tools/virsh-host.c | 21 +++++++++++++++++++++ tools/virsh.pod | 5 +++++ 16 files changed, 161 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a47e33c..d6e0d9a 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4006,6 +4006,17 @@ int virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags); +/** + * virConnectGetCPUMapDesc: + * + * @conn: virConnect connection + * + * Get the content of the cpu_map.xml file used by the connection. + * + * Returns XML description of the cpu_map.xml file. + */ +char *virConnectGetCPUMapDesc(virConnectPtr conn); + /** * virConnectBaselineCPUFlags diff --git a/src/driver.h b/src/driver.h index be64333..ab31262 100644 --- a/src/driver.h +++ b/src/driver.h @@ -681,6 +681,9 @@ typedef char * unsigned int ncpus, unsigned int flags); +typedef char * +(*virDrvConnectGetCPUMapDesc)(virConnectPtr conn); + typedef int (*virDrvDomainGetJobInfo)(virDomainPtr domain, virDomainJobInfoPtr info); @@ -1332,6 +1335,7 @@ struct _virDriver { virDrvDomainMigratePerform3Params domainMigratePerform3Params; virDrvDomainMigrateFinish3Params domainMigrateFinish3Params; virDrvDomainMigrateConfirm3Params domainMigrateConfirm3Params; + virDrvConnectGetCPUMapDesc connectGetCPUMapDesc; }; diff --git a/src/libvirt.c b/src/libvirt.c index 07a3fd5..5e5e594 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18519,6 +18519,44 @@ error: /** + * virConnectGetCPUMapDesc: + * + * @conn: virConnect connection + * + * Get the content of the cpu_map.xml file used by the connection. + * + * Returns the content of the cpu_map.xml file. The result must be freed + * by the caller of this function. + */ +char * +virConnectGetCPUMapDesc(virConnectPtr conn) +{ + VIR_DEBUG("conn=%p", conn); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return NULL; + } + + if (conn->driver->connectGetCPUMapDesc) { + char *ret = conn->driver->connectGetCPUMapDesc(conn); + if (ret == NULL) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(conn); + return NULL; +} + + +/** * virConnectBaselineCPU: * * @conn: virConnect connection diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c25a61f..ed6d2a0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2074,6 +2074,7 @@ virSetUIDGID; virSetUIDGIDWithCaps; virStrIsPrint; virValidateWWN; +virGetCPUMapDesc; # util/viruuid.h diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index bbdf78a..8023c7e 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -629,6 +629,7 @@ LIBVIRT_1.1.0 { LIBVIRT_1.1.1 { global: + virConnectGetCPUMapDesc; virDomainCreateWithFiles; virDomainCreateXMLWithFiles; virDomainSetMemoryStatsPeriod; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9cb95ff..633248b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4590,6 +4590,16 @@ lxcNodeSuspendForDuration(virConnectPtr conn, } +static char * +lxcConnectGetCPUMapDesc(virConnectPtr conn) +{ + if (virConnectGetCPUMapDescEnsureACL(conn) < 0) + return NULL; + + return virGetCPUMapDesc(); +} + + /* Function Tables */ static virDriver lxcDriver = { .no = VIR_DRV_LXC, @@ -4671,6 +4681,7 @@ static virDriver lxcDriver = { .domainShutdownFlags = lxcDomainShutdownFlags, /* 1.0.1 */ .domainReboot = lxcDomainReboot, /* 1.0.1 */ .domainLxcOpenNamespace = lxcDomainLxcOpenNamespace, /* 1.0.2 */ + .connectGetCPUMapDesc = lxcConnectGetCPUMapDesc, /* 1.1.0 */ }; static virStateDriver lxcStateDriver = { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2ad236e..4a1d6fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16033,6 +16033,15 @@ qemuNodeSuspendForDuration(virConnectPtr conn, return nodeSuspendForDuration(target, duration, flags); } +static char * +qemuConnectGetCPUMapDesc(virConnectPtr conn) +{ + if (virConnectGetCPUMapDescEnsureACL(conn) < 0) + return NULL; + + return virGetCPUMapDesc(); +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, @@ -16220,6 +16229,7 @@ static virDriver qemuDriver = { .domainMigratePerform3Params = qemuDomainMigratePerform3Params, /* 1.1.0 */ .domainMigrateFinish3Params = qemuDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = qemuDomainMigrateConfirm3Params, /* 1.1.0 */ + .connectGetCPUMapDesc = qemuConnectGetCPUMapDesc, /* 1.1.0 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 71d0034..017c7af 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6811,6 +6811,7 @@ static virDriver remote_driver = { .domainMigratePerform3Params = remoteDomainMigratePerform3Params, /* 1.1.0 */ .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */ + .connectGetCPUMapDesc = remoteConnectGetCPUMapDesc, /* 1.1.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 7cfebdf..6e17b41 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2837,6 +2837,10 @@ struct remote_domain_event_device_removed_msg { remote_nonnull_string devAlias; }; +struct remote_connect_get_cpu_map_desc_ret { + remote_nonnull_string xml; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -5000,5 +5004,11 @@ enum remote_procedure { * @generate: both * @acl: none */ - REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311 + REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311, + + /** + * @generate: both + * @acl: connect:read + */ + REMOTE_PROC_CONNECT_GET_CPU_MAP_DESC = 312 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 4e27aae..ce1e9f5 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2316,6 +2316,9 @@ struct remote_domain_event_device_removed_msg { remote_nonnull_domain dom; remote_nonnull_string devAlias; }; +struct remote_connect_get_cpu_map_desc_ret { + remote_nonnull_string xml; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -2628,4 +2631,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_CREATE_XML_WITH_FILES = 309, REMOTE_PROC_DOMAIN_CREATE_WITH_FILES = 310, REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311, + REMOTE_PROC_CONNECT_GET_CPU_MAP_DESC = 312, }; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d7b2e40..82610b3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5801,6 +5801,11 @@ testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, return ret; } +static char * +testConnectGetCPUMapDesc(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return virGetCPUMapDesc(); +} static virDriver testDriver = { .no = VIR_DRV_TEST, @@ -5872,6 +5877,7 @@ static virDriver testDriver = { .connectIsAlive = testConnectIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ + .connectGetCPUMapDesc = testConnectGetCPUMapDesc, /* 1.1.0 */ }; static virNetworkDriver testNetworkDriver = { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 9ca352f..2aa2c08 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2831,6 +2831,16 @@ umlNodeSuspendForDuration(virConnectPtr conn, } +static char * +umlConnectGetCPUMapDesc(virConnectPtr conn) +{ + if (virConnectGetCPUMapDescEnsureACL(conn) < 0) + return NULL; + + return virGetCPUMapDesc(); +} + + static virDriver umlDriver = { .no = VIR_DRV_UML, .name = "UML", @@ -2892,6 +2902,7 @@ static virDriver umlDriver = { .nodeSuspendForDuration = umlNodeSuspendForDuration, /* 0.9.8 */ .nodeGetMemoryParameters = umlNodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = umlNodeSetMemoryParameters, /* 0.10.2 */ + .connectGetCPUMapDesc = umlConnectGetCPUMapDesc, /* 1.1.0 */ }; static virStateDriver umlStateDriver = { diff --git a/src/util/virutil.c b/src/util/virutil.c index 34f5998..9d71a53 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -80,6 +80,7 @@ #include "virprocess.h" #include "virstring.h" #include "virutil.h" +#include "configmake.h" #ifndef NSIG # define NSIG 32 @@ -2116,3 +2117,25 @@ cleanup: return rc; } + +char * +virGetCPUMapDesc(void) +{ + char *data, *ret = NULL; + int len; + const char *cpumapfile = PKGDATADIR "/cpu_map.xml"; + if ((len = virFileReadAll(cpumapfile, 1024 * 1024, &data)) < 0) { + goto cleanup; + } + + if (VIR_ALLOC_N(ret, len + 1) < 0) { + goto cleanup; + } + + memcpy(ret, data, len); + ret[len] = '\0'; + +cleanup: + VIR_FREE(data); + return ret; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 4b06992..11030c5 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -172,4 +172,7 @@ int virCompareLimitUlong(unsigned long long a, unsigned long b); int virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr); + +char *virGetCPUMapDesc(void); + #endif /* __VIR_UTIL_H__ */ diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 880ae4b..3bc4f73 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -626,6 +626,21 @@ cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) return true; } +static bool +cmdCPUMapDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + char *xml = virConnectGetCPUMapDesc(ctl->conn); + if (xml == NULL) { + vshError(ctl, "%s", _("failed to get CPU Map XML file")); + return false; + } + + vshPrint(ctl, "%s\n", xml); + VIR_FREE(xml); + + return true; +} + /* * "version" command */ @@ -851,6 +866,12 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_capabilities, .flags = 0 }, + {.name = "cpu-map-desc", + .handler = cmdCPUMapDesc, + .opts = NULL, + .info = info_uri, + .flags = 0 + }, {.name = "freecell", .handler = cmdFreecell, .opts = opts_freecell, diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..d705a54 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -163,6 +163,7 @@ group as an option. For example: Host and Hypervisor (help keyword 'host'): capabilities capabilities + cpu-map-desc print the content of the cpu_map.xml file connect (re)connect to hypervisor freecell NUMA free memory hostname print the hypervisor hostname @@ -358,6 +359,10 @@ current domain is in. =over 4 +=item B<cpu-map-desc> + +Print the content of the cpu_map.xml file used by the hypervisor. + =item B<running> The domain is currently running on a CPU -- 1.8.3.1

5 21

[libvirt] [PATCH 0/2] Add http and ftp support for cdrom disk
by Aline Manera 27 Aug '13

27 Aug '13

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): Add http protocol support for cdrom disk Add ftp protocol support for cdrom disk docs/formatdomain.html.in | 16 +++++++++ docs/schemas/domaincommon.rng | 2 ++ src/conf/domain_conf.c | 4 ++- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 13 +++++++ .../qemuxml2argv-disk-cdrom-network-ftp.args | 6 ++++ .../qemuxml2argv-disk-cdrom-network-ftp.xml | 37 ++++++++++++++++++++ .../qemuxml2argv-disk-cdrom-network-http.args | 6 ++++ .../qemuxml2argv-disk-cdrom-network-http.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 +++ 10 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml -- 1.7.10.4

3 5

[libvirt] [PATCH] Don't free NULL network in cmdNetworkUpdate
by Ján Tomko 27 Aug '13

27 Aug '13

If the network has not been found, virNetworkFree(NULL) was called, resulting in an extra error: error: invalid network pointer in virNetworkFree https://bugzilla.redhat.com/show_bug.cgi?id=1001094 --- tools/virsh-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index e1baf0b..06bf483 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -918,7 +918,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) const char *affected; if (!(network = vshCommandOptNetwork(ctl, cmd, NULL))) - goto cleanup; + return false; if (vshCommandOptStringReq(ctl, cmd, "command", &commandStr) < 0) goto cleanup; -- 1.8.1.5

5 8

[libvirt] [PATCH] Always specify qcow2 compat level on qemu-img command line
by Ján Tomko 27 Aug '13

27 Aug '13

qemu-img is going to switch the default for QCOW2 to QCOW2v3 (compat=1.1) [0] Extend the probing for qemu-img command line options to check if -o compat is supported. If the volume definition specifies the qcow2 format but no compat level and -o compat is supported, specify -o compat=0.10 to create a QCOW2v2 image. https://bugzilla.redhat.com/show_bug.cgi?id=997977 --- [0] the switch is not yet upstream. The proposed (incomplete) QEMU patch: http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg02549.html src/storage/storage_backend.c | 47 +++++++++++++++++++--- tests/storagevolxml2argvdata/qcow2-compat.argv | 3 ++ .../qcow2-from-logical-compat.argv | 3 ++ .../qcow2-nobacking-convert-prealloc-compat.argv | 3 ++ .../qcow2-nobacking-prealloc-compat.argv | 3 ++ tests/storagevolxml2argvtest.c | 26 ++++++++++++ 6 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 tests/storagevolxml2argvdata/qcow2-compat.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 8d5880e..4ebe11b 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -581,8 +581,34 @@ enum { QEMU_IMG_BACKING_FORMAT_NONE = 0, QEMU_IMG_BACKING_FORMAT_FLAG, QEMU_IMG_BACKING_FORMAT_OPTIONS, + QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT, }; +static bool +virStorageBackendQemuImgSupportsCompat(const char *qemuimg) +{ + bool ret = false; + char *output; + virCommandPtr cmd = NULL; + + cmd = virCommandNewArgList(qemuimg, "create", "-o", "?", "-f", "qcow2", + "/dev/null", NULL); + + virCommandAddEnvString(cmd, "LC_ALL=C"); + virCommandSetOutputBuffer(cmd, &output); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (strstr(output, "\ncompat ")) + ret = true; + +cleanup: + virCommandFree(cmd); + VIR_FREE(output); + return ret; +} + static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) { @@ -612,12 +638,16 @@ virStorageBackendQEMUImgBackingFormat(const char *qemuimg) goto cleanup; } if (((tmp = strstr(start, "-F fmt")) && tmp < end) || - ((tmp = strstr(start, "-F backing_fmt")) && tmp < end)) + ((tmp = strstr(start, "-F backing_fmt")) && tmp < end)) { ret = QEMU_IMG_BACKING_FORMAT_FLAG; - else if ((tmp = strstr(start, "[-o options]")) && tmp < end) - ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; - else + } else if ((tmp = strstr(start, "[-o options]")) && tmp < end) { + if (virStorageBackendQemuImgSupportsCompat(qemuimg)) + ret = QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT; + else + ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; + } else { ret = QEMU_IMG_BACKING_FORMAT_NONE; + } cleanup: virCommandFree(cmd); @@ -705,6 +735,7 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, const char *backingType = NULL; const char *inputPath = NULL; const char *inputType = NULL; + const char *compat = vol->target.compat; char *opts = NULL; bool convert = false; bool backing = false; @@ -854,12 +885,16 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, if (backing) virCommandAddArgList(cmd, "-b", vol->backingStore.path, NULL); - if (imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS) { + if (imgformat >= QEMU_IMG_BACKING_FORMAT_OPTIONS) { + if (vol->target.format == VIR_STORAGE_FILE_QCOW2 && !compat && + imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT) + compat = "0.10"; + if (virStorageBackendCreateQemuImgOpts(&opts, backing ? backingType : NULL, do_encryption, preallocate, vol->target.format, - vol->target.compat, + compat, vol->target.features) < 0) { virCommandFree(cmd); return NULL; diff --git a/tests/storagevolxml2argvdata/qcow2-compat.argv b/tests/storagevolxml2argvdata/qcow2-compat.argv new file mode 100644 index 0000000..37ad2c0 --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-compat.argv @@ -0,0 +1,3 @@ +qemu-img create -f qcow2 -b /dev/null \ +-o backing_fmt=raw,encryption=on,compat=0.10 \ +/var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv new file mode 100644 index 0000000..5f365b1 --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-from-logical-compat.argv @@ -0,0 +1,3 @@ +qemu-img convert -f raw -O qcow2 \ +-o encryption=on,compat=0.10 \ +/dev/HostVG/Swap /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv new file mode 100644 index 0000000..3d93ec8 --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc-compat.argv @@ -0,0 +1,3 @@ +qemu-img convert -f raw -O qcow2 \ +-o encryption=on,preallocation=metadata,compat=0.10 \ +/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv new file mode 100644 index 0000000..903c94e --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-nobacking-prealloc-compat.argv @@ -0,0 +1,3 @@ +qemu-img create -f qcow2 \ +-o encryption=on,preallocation=metadata,compat=0.10 \ +/var/lib/libvirt/images/OtherDemo.img 5242880K diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index b1cf09f..cafcaad 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -195,6 +195,7 @@ enum { FMT_NONE = 0, FMT_FLAG, FMT_OPTIONS, + FMT_COMPAT, }; @@ -271,6 +272,31 @@ mymain(void) "pool-dir", "vol-qcow2-nobacking", "logical-from-qcow2", 0, FMT_OPTIONS); + DO_TEST("pool-dir", "vol-qcow2", + NULL, NULL, + "qcow2-compat", 0, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-nobacking", + NULL, NULL, + "qcow2-nobacking-prealloc-compat", flags, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-nobacking", + "pool-dir", "vol-file", + "qcow2-nobacking-convert-prealloc-compat", flags, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-lazy", + NULL, NULL, + "qcow2-lazy", 0, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-1.1", + NULL, NULL, + "qcow2-1.1", 0, FMT_COMPAT); + DO_TEST_FAIL("pool-dir", "vol-qcow2-0.10-lazy", + NULL, NULL, + "qcow2-0.10-lazy", 0, FMT_COMPAT); + DO_TEST("pool-dir", "vol-qcow2-nobacking", + "pool-logical", "vol-logical", + "qcow2-from-logical-compat", 0, FMT_COMPAT); + DO_TEST("pool-logical", "vol-logical", + "pool-dir", "vol-qcow2-nobacking", + "logical-from-qcow2", 0, FMT_COMPAT); + return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.1.5

2 2

[libvirt] [PATCH 00/17] Add tests for disk hotplug
by Jiri Denemark 27 Aug '13

27 Aug '13

This series adds tests for hotplugging all supported disk types. Jiri Denemark (17): qemu: Typedef monitor callbacks qemu: Avoid using global qemu_driver in event handlers qemu: Move qemuDomainAttachDeviceDiskLive to qemu_hotplug.c qemu: Move qemuDomainDetachDeviceDiskLive to qemu_hotplug.c qemuhotplugtest: Generate better output qemuhotplugtest: Compare domain XML after device hotplug qemuhotplugtest: Define QMP_OK for the most common reply qemuxml2argvtest: Add XML for testing device hotplug qemuhotplugtest: Add tests for virtio disk hotplug tests: Add support for passing vm to qemu monitor tests: Add support for passing driver to qemu monitor qemu: Export qemuProcessHandleDeviceDeleted for tests qemu: Let tests override waiting time for device unplug qemuhotplugtest: Add support for DEVICE_DELETED event qemuhotplugtest: Add tests for async virtio disk detach qemuhotplugtest: Add tests for USB disk hotplug qemuhotplugtest: Add tests for virtio SCSI disk hotplug src/Makefile.am | 2 + src/qemu/qemu_capabilities.c | 5 +- src/qemu/qemu_driver.c | 166 --------------- src/qemu/qemu_hotplug.c | 219 +++++++++++++++++-- src/qemu/qemu_hotplug.h | 25 +-- src/qemu/qemu_hotplugpriv.h | 31 +++ src/qemu/qemu_monitor.c | 30 +-- src/qemu/qemu_monitor.h | 198 +++++++++++------- src/qemu/qemu_process.c | 104 +++++---- src/qemu/qemu_process.h | 2 +- src/qemu/qemu_processpriv.h | 37 ++++ tests/qemuhotplugtest.c | 232 +++++++++++++++++---- ...qemuhotplug-console-compat-2+console-virtio.xml | 127 +++++++++++ .../qemuhotplugtestdata/qemuhotplug-disk-scsi.xml | 7 + tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml | 7 + .../qemuhotplug-disk-virtio.xml | 7 + .../qemuhotplug-hotplug-base+disk-scsi.xml | 46 ++++ .../qemuhotplug-hotplug-base+disk-usb.xml | 45 ++++ .../qemuhotplug-hotplug-base+disk-virtio.xml | 46 ++++ tests/qemumonitorjsontest.c | 26 +-- tests/qemumonitortestutils.c | 31 ++- tests/qemumonitortestutils.h | 8 +- .../qemuxml2argv-hotplug-base.args | 7 + .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 38 ++++ tests/qemuxml2argvtest.c | 4 + 25 files changed, 1047 insertions(+), 403 deletions(-) create mode 100644 src/qemu/qemu_hotplugpriv.h create mode 100644 src/qemu/qemu_processpriv.h create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-virtio.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-scsi.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-usb.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-virtio.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.xml -- 1.8.3.2

4 39

[libvirt] [PATCH] virsh: fix return value error of cpu-stats
by Guannan Ren 27 Aug '13

27 Aug '13

virsh cpu-stats guest --start 0 --count 3 It outputs right but the return value is 1 rather than 0 echo $? 1 Found by running libvirt-autotest ./run -t libvirt --tests virsh_cpu_stats --- tools/virsh-domain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b29f934..bcf495c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6350,7 +6350,9 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) if (!nparams) { vshPrint(ctl, "%s", _("No per-CPU stats available")); - goto do_show_total; + if (show_total) + goto do_show_total; + goto cleanup; } if (VIR_ALLOC_N(params, nparams * MIN(show_count, 128)) < 0) @@ -6389,10 +6391,12 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(params); -do_show_total: - if (!show_total) + if (!show_total) { + ret = true; goto cleanup; + } +do_show_total: /* get supported num of parameter for total statistics */ if ((nparams = virDomainGetCPUStats(dom, NULL, 0, -1, 1, flags)) < 0) goto failed_stats; -- 1.8.3.1

4 5

[libvirt] [RFC PATCH] qemu: Don't set migration bandwidth if user not specify it.
by Li Wei 27 Aug '13

27 Aug '13

Since commit 6cfdeaac("qemu: Migrate at unlimited speed by default"), we set an unlimited migration bandwidth unconditionally, this change will cause problem when doing "--copy-storage-all" migration, qemu will submit as much block aio request as bandwidth allowed and use too much memory and finally killed by the oom-killer. Actually, we should only set migration speed when user specified it, otherwise, we let qemu use its default settings. Signed-off-by: Li Wei <lw(a)cn.fujitsu.com> --- src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_migration.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7f4d17d..b56e6c0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -226,8 +226,6 @@ qemuDomainObjPrivateAlloc(void) if (!(priv->devs = virChrdevAlloc())) goto error; - priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; - return priv; error: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b905459..8d60e3d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3139,7 +3139,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, goto cleanup; } - if (qemuMonitorSetMigrationSpeed(priv->mon, migrate_speed) < 0) { + if (migrate_speed && qemuMonitorSetMigrationSpeed(priv->mon, migrate_speed) < 0) { qemuDomainObjExitMonitor(driver, vm); goto cleanup; } -- 1.8.3.1

2 2

[libvirt] [PATCH] Fix a memory leak in cmdSchedInfoUpdateOne
by hwbi2008＠gmail.com 27 Aug '13

27 Aug '13

From: hwbi <hwbi2008(a)gmail.com> The param needs to be virTypedParamsFree()'d in cmdSchedInfoUpdateOne(). --- tools/virsh-domain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b29f934..d704053 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4085,7 +4085,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, int *nparams, int *maxparams, const char *field, const char *value) { - virTypedParameterPtr param; + virTypedParameterPtr param = NULL; int ret = -1; size_t i; @@ -4109,6 +4109,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, vshError(ctl, _("invalid scheduler option: %s"), field); cleanup: + virTypedParamsFree(param, *nparams); return ret; } -- 1.7.1

2 2

[libvirt] [PATCH] qemuDomainAttachHostPciDevice: Fall back to mem balloon if there's no hard_limit
by Michal Privoznik 26 Aug '13

26 Aug '13

If there's no hard_limit set and domain uses VFIO we still must lock the guest memory (prerequisite from qemu). Hence, we should compute the amount to be locked from max_balloon. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9727410..f028df6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1020,6 +1020,8 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, if (hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { + unsigned long long memKB; + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("VFIO PCI device assignment is not " @@ -1032,8 +1034,9 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, * doesn't hurt to "change" the limit to the same value. */ vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; - virProcessSetMaxMemLock(vm->pid, - vm->def->mem.hard_limit * 1024); + memKB = def->mem.hard_limit ? + def->mem.hard_limit : def->mem.max_balloon + 1024 * 1024; + virProcessSetMaxMemLock(vm->pid, memKB); vm->def->hostdevs[vm->def->nhostdevs--] = NULL; } -- 1.8.1.5

2 2