- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/4] Fix deadlock in nwfilter code
by Daniel P. Berrange 30 Jan '14

30 Jan '14

Since we introduced fine grained locking into the QEMU driver so that VM start can run in parallel, we appear to have caused a race with the nwfilter code. In particular since we no longer hold the global QEMU driver lock for the duration of VM startup we have a lock ordering flaw. This results in deadlock when nwfilter operations happen in parallel with VM startup. This also affects the LXC driver. This patch series attempts to address the problem https://bugzilla.redhat.com/show_bug.cgi?id=929412 the removal of the windows thread impl isn't strictly required, I just didn't want to waste time creating a read/write lock impl for Windows threads. See also this callgraph http://berrange.fedorapeople.org/nwfilter.ps In v3: - Removed addition of extra lock for serializing iptables since it was overkill - Added patch to make libvirt compile with mingw32-pthreads from Fedora 19 and earlier - Fix errno handling with rwlock creation In v2: - Re-ordered patches and squashed two together - Add missing locking in state reload function - Don't remove locking from virNWFilterInstantiateFilterLate *** BLURB HERE *** Daniel P. Berrange (4): Add a read/write lock implementation Fix pthread_sigmask check for mingw32 without winpthreads Remove windows thread implementation in favour of pthreads Push nwfilter update locking up to top level configure.ac | 21 +- src/Makefile.am | 4 - src/conf/nwfilter_conf.c | 23 +- src/conf/nwfilter_conf.h | 3 +- src/libvirt_private.syms | 8 +- src/lxc/lxc_driver.c | 6 + src/nwfilter/nwfilter_driver.c | 10 +- src/nwfilter/nwfilter_gentech_driver.c | 6 +- src/qemu/qemu_driver.c | 6 + src/uml/uml_driver.c | 4 + src/util/virthread.c | 293 +++++++++++++++++++++++- src/util/virthread.h | 51 ++++- src/util/virthreadpthread.c | 278 ----------------------- src/util/virthreadpthread.h | 49 ---- src/util/virthreadwin32.c | 396 --------------------------------- src/util/virthreadwin32.h | 53 ----- 16 files changed, 388 insertions(+), 823 deletions(-) delete mode 100644 src/util/virthreadpthread.c delete mode 100644 src/util/virthreadpthread.h delete mode 100644 src/util/virthreadwin32.c delete mode 100644 src/util/virthreadwin32.h -- 1.8.4.2

3 7

Re: [libvirt] [Xen-devel] [PATCH 00/12] libxl: fork: SIGCHLD flexibility
by Jim Fehlig 30 Jan '14

30 Jan '14

[Adding libvirt list...] Ian Jackson wrote: > Jim Fehlig writes ("Re: [Xen-devel] [PATCH 00/12] libxl: fork: SIGCHLD flexibility"): > >> BTW, I only see the crash when the save/restore script is running. I >> stopped the other scripts and domains, running only save/restore on a >> single domain, and see the crash rather quickly (within 10 iterations). >> > > I'll look at the libvirt code, but: > > With a recurring timeout, how can you ever know it's cancelled ? > There might be threads out there, which don't hold any locks, which > are in the process of executing a callback for a timeout. That might > be arbitrarily delayed from the pov of the rest of the program. > > E.g.: > > Thread A Thread B > > invoke some libxl operation > X do some libxl stuff > X register timeout (libxl) > XV record timeout info > X do some more libxl stuff > ... > X do some more libxl stuff > X deregister timeout (libxl internal) > X converted to request immediate timeout > XV record new timeout info > X release libvirt event loop lock > entering libvirt event loop > V observe timeout is immediate > V need to do callback > call libxl driver > > entering libvirt event loop > V observe timeout is immediate > V need to do callback > call libxl driver > call libxl > X libxl sees timeout is live > X libxl does libxl stuff > libxl driver deregisters > V record lack of timeout > free driver's timeout struct > call libxl > X libxl sees timeout is dead > X libxl does nothing > libxl driver deregisters > V CRASH due to deregistering > V already-deregistered timeout > > If this is how things are, then I think there is no sane way to use > libvirt's timeouts (!) > Looking at the libvirt code again, it seems a single thread services the event loop. See virNetServerRun() in src/util/virnetserver.c. Indeed, I see the same thread ID in all the timer and fd callbacks. One of the libvirt core devs can correct me if I'm wrong. Regards, Jim > In principle I guess the driver could keep its per-timeout structs > around forever and remember whether they've been deregistered or not. > Each one would have to have a lock in it. > > But if you think about it, if you have 10 threads all running the > event loop and you set a timeout to zero, doesn't that mean that every > thread's event loop should do the timeout callback as fast as it can ? > That could be a lot of wasted effort. > > The best solution would appear to be to provide a non-recurring > callback. > > >> I'm not so thrilled with the timeout handling code in the libvirt libxl >> driver. The driver maintains a list of active timeouts because IIRC, >> there were cases when the driver received timeout deregistrations when >> calling libxl_ctx_free, at which point some of the associated structures >> were freed. The idea was to call libxl_osevent_occurred_timeout on any >> active timeouts before freeing libxlDomainObjPrivate and its contents. >> > > libxl does deregister fd callbacks in libxl_ctx_free. > > But libxl doesn't currently "deregister" any timeouts in > libxl_ctx_free; indeed it would be a bit daft for it to do so as at > libxl_ctx_free there are no aos running so there would be nothing to > time out. > > But there is a difficulty with timeouts which libxl has set to occur > immediately but which have not yet actually had the callback. The the > application cannot call libxl_ctx_free with such timeouts outstanding, > because that would imply later calling back into libxl with a stale > ctx. > > (Looking at the code I see that the "nexi" are never actually freed. > Bah.) > > Thanks, > Ian. > >

3 8

[libvirt] [PATCH] docs/page.xls: remove unnecessary namespace attribute
by Pavel Hrdina 30 Jan '14

30 Jan '14

It breaks the build on RHEL-5.10 and because it's only optional we could remove it from the code. The default namespace will be used. This hunk was introduced by commit 237a088ba44633b08e0528fe5103d99b1e213b71. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/page.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/page.xsl b/docs/page.xsl index d560c09..7de238e 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -187,7 +187,7 @@ </xsl:template> <xsl:template match="html:h2 | html:h3 | html:h4 | html:h5 | html:h6" mode="content"> - <xsl:element name="{name()}" namespace="{namespace-uri()}"> + <xsl:element name="{name()}"> <xsl:apply-templates mode="copy" /> <xsl:if test="./html:a/@name"> <a class="headerlink" href="#{html:a/@name}" title="Permalink to this headline">¶</a> @@ -200,7 +200,7 @@ </xsl:template> <xsl:template match="node()" mode="copy"> - <xsl:element name="{name()}" namespace="{namespace-uri()}"> + <xsl:element name="{name()}"> <xsl:copy-of select="./@*"/> <xsl:apply-templates mode="copy" /> </xsl:element> -- 1.8.3.1

2 2

[libvirt] [PATCH] network: only prevent forwarding of DNS requests for unqualified names
by Laine Stump 30 Jan '14

30 Jan '14

In commit f386825 we began adding the option "--local=/$mydomain/" to all dnsmasq commandlines (later changed to "local=/$mydomain/" when we moved the options from the commandline to a conf file) with the stated reason of preventing forwarding of DNS queries for names that weren't fully qualified domain names ("FQDN", i.e. a name that included some "."s and a domain name). The original patch on the list, and discussion about it, is here: https://www.redhat.com/archives/libvir-list/2012-August/msg01594.html When a domain name isn't specified (no <domain> element in the network definition), the corresponding addition of "local=//" will prevent forwarding of domain-less requests to the virtualization host's DNS resolver, but if a domain *is* specified, the addition of "local=/domain/" will prevent forwarding of any requests for names within that domain that aren't resolvable by libvirt's dnsmasq itself. An example of the problems this causes: let's say a network is defined with: <domain name='example.com'/> <dhcp> .. <host mac='52:54:00:11:22:33' ip='1.2.3.4' name='myguest'/> </dhcp> This results in "local=/example.com/" being added to the dnsmasq options. If a guest requests "myguest" or "myguest.example.com", that will be resolved by dnsmasq. If the guest asks for "www.example.com", dnsmasq will not know the answer, but instead of forwarding it to the host, it will return NOT FOUND to the guest. In most cases that isn't the behavior an admin is looking for. Really we should have been just including the option "--local=//" in all cases, so that (unresolvable by dnsmasq) requests for names without a domain would be treated as "local to dnsmasq" and not forwarded, but all other requests would be forwarded. That's what this patch does. --- I'm debating whether there is any value at all to maintaining the previous behavior of "don't forward unresolved requests for hosts in the network's defined domain", or if it should just be considered purely a bug. If so, I think it shouldn't be the default behavior, and should be controlled by a new attribute to the <domain> element, something like this: <domain name='example.com' forwardUnresolved='no'/> (this would default to yes). Any opinions on 1) whether or not this is needed, and 2) if so, any better name for the option? (it would be nice if it could default to 'no' or 'local-only' (which was == 0) or something else that didn't require a non-0 default or a strange double-negative name). src/network/bridge_driver.c | 12 +++++------- tests/networkxml2confdata/dhcp6-network.conf | 2 +- tests/networkxml2confdata/nat-network-dns-hosts.conf | 2 +- tests/networkxml2confdata/netboot-network.conf | 2 +- tests/networkxml2confdata/netboot-proxy-network.conf | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 80c5acb..b1382e4 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -723,14 +723,12 @@ networkDnsmasqConfContents(virNetworkObjPtr network, network->def->domain); } - if (network->def->domain || !network->def->dns.forwardPlainNames) { - /* need to specify local even if no domain specified, unless - * the config says we should forward "plain" names (i.e. not - * fully qualified, no '.' characters) + if (!network->def->dns.forwardPlainNames) { + /* need to specify local=// whether or not a domain is + * specified, unless the config says we should forward "plain" + * names (i.e. not fully qualified, no '.' characters) */ - virBufferAsprintf(&configbuf, - "local=/%s/\n", - network->def->domain ? network->def->domain : ""); + virBufferAsprintf(&configbuf, "local=//\n"); } if (pidfile) diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network.conf index 5fde07f..24ac7fa 100644 --- a/tests/networkxml2confdata/dhcp6-network.conf +++ b/tests/networkxml2confdata/dhcp6-network.conf @@ -8,7 +8,7 @@ strict-order domain-needed domain=mynet expand-hosts -local=/mynet/ +local=// except-interface=lo bind-dynamic interface=virbr0 diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts.conf index 2577882..bb1d5f4 100644 --- a/tests/networkxml2confdata/nat-network-dns-hosts.conf +++ b/tests/networkxml2confdata/nat-network-dns-hosts.conf @@ -8,7 +8,7 @@ strict-order domain-needed domain=example.com expand-hosts -local=/example.com/ +local=// except-interface=lo bind-dynamic interface=virbr0 diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network.conf index b6f3c23..37fef40 100644 --- a/tests/networkxml2confdata/netboot-network.conf +++ b/tests/networkxml2confdata/netboot-network.conf @@ -8,7 +8,7 @@ strict-order domain-needed domain=example.com expand-hosts -local=/example.com/ +local=// except-interface=lo bind-interfaces listen-address=192.168.122.1 diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network.conf index 1e969fa..ae34aa0 100644 --- a/tests/networkxml2confdata/netboot-proxy-network.conf +++ b/tests/networkxml2confdata/netboot-proxy-network.conf @@ -8,7 +8,7 @@ strict-order domain-needed domain=example.com expand-hosts -local=/example.com/ +local=// except-interface=lo bind-interfaces listen-address=192.168.122.1 -- 1.8.3.1

2 4

[libvirt] [libvirt-designer][PATCH] gvir_designer_domain_add_disk_full: Adapt to latest libvirt-glib
by Michal Privoznik 30 Jan '14

30 Jan '14

With libvirt-glib update, I've noticed a deprecation warning: libvirt-designer-domain.c: In function 'gvir_designer_domain_add_disk_full': libvirt-designer-domain.c:1610:9: error: 'gvir_config_domain_disk_set_driver_type' is deprecated (declared at /usr/include/libvirt-gconfig-1.0/libvirt-gconfig/libvirt-gconfig-domain-disk.h:145): Use 'gvir_config_domain_disk_set_driver_format' instead [-Werror=deprecated-declarations] gvir_config_domain_disk_set_driver_type(disk, format); ^ cc1: all warnings being treated as errors Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt-designer/Makefile.am | 1 + libvirt-designer/libvirt-designer-domain.c | 22 +++++++++++-- libvirt-designer/libvirt-designer-internal.c | 46 ++++++++++++++++++++++++++++ libvirt-designer/libvirt-designer-internal.h | 2 ++ 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 libvirt-designer/libvirt-designer-internal.c diff --git a/libvirt-designer/Makefile.am b/libvirt-designer/Makefile.am index 7becfd2..bda4240 100644 --- a/libvirt-designer/Makefile.am +++ b/libvirt-designer/Makefile.am @@ -25,6 +25,7 @@ DESIGNER_HEADER_FILES = \ libvirt-designer-domain.h \ $(NULL) DESIGNER_SOURCE_FILES = \ + libvirt-designer-internal.c \ libvirt-designer-main.c \ libvirt-designer-domain.c \ $(NULL) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 848dfea..5475c79 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -1580,6 +1580,7 @@ gvir_designer_domain_add_disk_full(GVirDesignerDomain *design, { GVirDesignerDomainPrivate *priv = design->priv; GVirConfigDomainDisk *disk = NULL; + GVirConfigDomainDiskDriver *driver = NULL; GVirConfigDomainDiskBus bus; gchar *target_gen = NULL; const char *driver_name; @@ -1602,12 +1603,27 @@ gvir_designer_domain_add_disk_full(GVirDesignerDomain *design, break; } + driver = gvir_config_domain_disk_driver_new(); + gvir_config_domain_disk_driver_set_name(driver, driver_name); + if (format) { + int fmt; + + fmt = gvir_designer_genum_get_value(GVIR_CONFIG_TYPE_DOMAIN_DISK_FORMAT, + format, -1); + + if (fmt == -1) { + g_set_error(error, GVIR_DESIGNER_DOMAIN_ERROR, 0, + "Unknown disk format: %s", format); + goto error; + } + + gvir_config_domain_disk_driver_set_format(driver, fmt); + } + disk = gvir_config_domain_disk_new(); gvir_config_domain_disk_set_type(disk, type); gvir_config_domain_disk_set_source(disk, path); - gvir_config_domain_disk_set_driver_name(disk, driver_name); - if (format) - gvir_config_domain_disk_set_driver_type(disk, format); + gvir_config_domain_disk_set_driver(disk, driver); controller = gvir_designer_domain_get_preferred_disk_controller(design, NULL); if (controller == NULL) diff --git a/libvirt-designer/libvirt-designer-internal.c b/libvirt-designer/libvirt-designer-internal.c new file mode 100644 index 0000000..bdfa5d1 --- /dev/null +++ b/libvirt-designer/libvirt-designer-internal.c @@ -0,0 +1,46 @@ +/* + * libvirt-designer-internal.c: libvirt-designer helpers + * + * Copyright (C) 2014 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/>. + * + * Authors: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-designer/libvirt-designer.h" +#include "libvirt-designer/libvirt-designer-internal.h" + +G_GNUC_INTERNAL int +gvir_designer_genum_get_value(GType enum_type, const char *nick, + gint default_value) +{ + GEnumClass *enum_class; + GEnumValue *enum_value; + + g_return_val_if_fail(G_TYPE_IS_ENUM(enum_type), default_value); + g_return_val_if_fail(nick != NULL, default_value); + + enum_class = g_type_class_ref(enum_type); + enum_value = g_enum_get_value_by_nick(enum_class, nick); + g_type_class_unref(enum_class); + + if (enum_value != NULL) + return enum_value->value; + + g_return_val_if_reached(default_value); +} diff --git a/libvirt-designer/libvirt-designer-internal.h b/libvirt-designer/libvirt-designer-internal.h index e95edfc..fd3db2c 100644 --- a/libvirt-designer/libvirt-designer-internal.h +++ b/libvirt-designer/libvirt-designer-internal.h @@ -24,4 +24,6 @@ #ifndef __LIBVIRT_DESIGNER_INTERNAL_H__ #define __LIBVIRT_DESIGNER_INTERNAL_H__ +int gvir_designer_genum_get_value(GType enum_type, const char *nick, gint default_value); + #endif /* __LIBVIRT_DESIGNER_INTERNAL_H__ */ -- 1.8.5.2

2 1

[libvirt] [PATCH v2 0/3] Honor blacklist for modprobe command
by John Ferlan 30 Jan '14

30 Jan '14

Original patch here: http://www.redhat.com/archives/libvir-list/2014-January/msg01408.html Changes since v1: * Add virkmod.{c,h} to perform the various modprobe commands virModprobeConfig() -> modprobe -c virModprobeLoad() -> modprobe driver virModprobeUnload() -> modprobe -r driver virModprobeUseBlacklist() -> modprobe -b driver * virkmodtest.c to test the functions Caveat emptor... The config is the only test run by default. Loading and Unloading modules is something to be done carefully. * virpci.c Use the virModprobe*() API's instead of a direct MODPROBE * .gitignore Added the /tests/virkmodtest and /examples/domain-events/ which seems to have appeared recently. I can separate them out if desired. NOTE: Since I have no messages in virkmod.c, modifying po/POTFILES.in was deemed unnecessary by a 'make check-syntax' John Ferlan (3): utils: Introduce functions for modprobe tests: Add test for new virkmod functions Honor blacklist for modprobe command .gitignore | 2 + src/Makefile.am | 1 + src/libvirt_private.syms | 7 ++ src/util/virkmod.c | 138 ++++++++++++++++++++++++++++++++ src/util/virkmod.h | 35 +++++++++ src/util/virpci.c | 49 +++++++++--- tests/Makefile.am | 5 ++ tests/virkmodtest.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 429 insertions(+), 9 deletions(-) create mode 100644 src/util/virkmod.c create mode 100644 src/util/virkmod.h create mode 100644 tests/virkmodtest.c -- 1.8.4.2

3 9

[libvirt] [libvirt-designer][PATCH] virtxml: Rename to virt-designer
by Michal Privoznik 30 Jan '14

30 Jan '14

Our example utility is called virtxml. However with Cole's latest work, where he introduced virt-xml binary for editing libvirt XML on CLI [1]. It would be better if our example is called virt-designer so we don't confuse users. 1: https://www.redhat.com/archives/libvir-list/2014-January/msg01226.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .gitignore | 2 +- cfg.mk | 2 +- configure.ac | 2 +- examples/Makefile.am | 10 +++++----- examples/{virtxml.c => virt-designer.c} | 32 ++++++++++++++++---------------- libvirt-designer.spec.in | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) rename examples/{virtxml.c => virt-designer.c} (96%) diff --git a/.gitignore b/.gitignore index 6b05db9..09e15a5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ Makefile.in /config.log /config.status /configure -/examples/virtxml +/examples/virt-designer /libtool /libvirt-designer-1.0.pc /libvirt-designer.spec diff --git a/cfg.mk b/cfg.mk index 1e4b31d..f9ab008 100644 --- a/cfg.mk +++ b/cfg.mk @@ -104,7 +104,7 @@ sc_copyright_format: prev_version_file = /dev/null -exclude_file_name_regexp--sc_bindtextdomain = ^libvirt-designer/(test|libvirt-designer-main\.c)|^examples/virtxml\.c$$ +exclude_file_name_regexp--sc_bindtextdomain = ^libvirt-designer/(test|libvirt-designer-main\.c)|^examples/virt-designer\.c$$ exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch]$$ diff --git a/configure.ac b/configure.ac index bad199b..595fea4 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ LIBVIRT_DESIGNER_COVERAGE LIBVIRT_DESIGNER_INTROSPECTION AC_ARG_ENABLE([examples], - AS_HELP_STRING([--enable-examples], [enable virtxml example. Default is check, meaning it is enabled as long as libvirt-gobject is installed]), + AS_HELP_STRING([--enable-examples], [enable virt-designer example. Default is check, meaning it is enabled as long as libvirt-gobject is installed]), [],[enable_examples=check]) if test "x$enable_examples" != "xno" ; then diff --git a/examples/Makefile.am b/examples/Makefile.am index ae2667e..1d8947f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,10 +2,10 @@ INCLUDES = \ -I$(top_builddir)/libvirt-designer \ -I$(top_srcdir) -virtxml_LDADD = \ +virt_designer_LDADD = \ $(top_builddir)/libvirt-designer/libvirt-designer-1.0.la -virtxml_CFLAGS = \ +virt_designer_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(LIBOSINFO_CFLAGS) \ $(LIBVIRT_GCONFIG_CFLAGS) \ @@ -13,7 +13,7 @@ virtxml_CFLAGS = \ $(LIBVIRT_GOBJECT_CFLAGS) \ $(NULL) -virtxml_LDFLAGS = \ +virt_designer_LDFLAGS = \ $(LIBOSINFO_LIBS) \ $(LIBVIRT_GCONFIG_LIBS) \ $(LIBVIRT_GOBJECT_LIBS) @@ -24,9 +24,9 @@ POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" $(AM_V_GEN)$(POD2MAN) $< $@ if WITH_EXAMPLES -bin_PROGRAMS = virtxml +bin_PROGRAMS = virt-designer -man1_MANS = virtxml.1 +man1_MANS = virt-designer.1 CLEANFILES = $(man1_MANS) endif diff --git a/examples/virtxml.c b/examples/virt-designer.c similarity index 96% rename from examples/virtxml.c rename to examples/virt-designer.c index 6fb51d5..7628449 100644 --- a/examples/virtxml.c +++ b/examples/virt-designer.c @@ -1,7 +1,7 @@ /* - * virtxml.c: produce an domain XML + * virt-designer.c: produce an domain XML * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012, 2014 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 @@ -750,26 +750,26 @@ cleanup: =head1 NAME -virtxml - Generate domain XML +virt-designer - Generate domain XML =head1 SYNOPSIS -B<virtxml> [I<OPTION>]... +B<virt-designer> [I<OPTION>]... =head1 DESCRIPTION -B<virtxml> is a command line tool for generating XML documents for +B<virt-designer> is a command line tool for generating XML documents for libvirt domains. However, it cooperates with libosinfo database to guess the correct combination of attributes (e.g. disk driver, NIC model). -B<virtxml> does not feed libvirt with generated XML though. For now, +B<virt-designer> does not feed libvirt with generated XML though. For now, it's a proof of concept. =head1 OPTIONS -The basic structure of arguments passed to B<virtxml> is: +The basic structure of arguments passed to B<virt-designer> is: - virtxml [-c URI] [OPTION] [OPTION] ... + virt-designer [-c URI] [OPTION] [OPTION] ... However, arguments have no pre-defined order so users can type them in any order they like. @@ -844,7 +844,7 @@ the I<recommended> is used. Usually, both B<--os> and B<--platform> are required as they are needed to make the right decision on driver, model, ... when adding a new device. However, when adding a disk which is an installation medium (e.g. a CD-ROM or -DVD), B<virtxml> tries to guess the OS. Something similar is done with +DVD), B<virt-designer> tries to guess the OS. Something similar is done with platform. Usually, the platform is guessed from the connection URI. =head1 EXAMPLES @@ -852,16 +852,16 @@ platform. Usually, the platform is guessed from the connection URI. Domain with Fedora 17 from locally stored ISO and one NIC with mac 00:11:22:33:44:55 and link set down: - # virtxml -C Fedora-17-x86_64-Live-KDE.iso \ - -i default,mac=00:11:22:33:44:55,link=down + # virt-designer -C Fedora-17-x86_64-Live-KDE.iso \ + -i default,mac=00:11:22:33:44:55,link=down To add multiple devices just use appropriate argument multiple times: - # virtxml -d /tmp/home.img,qcow2 \ - -d /var/lib/libvirt/images/f17.img,qcow2 \ - -i default,mac=00:11:22:33:44:55,link=down \ - -i blue_network \ - -r minimal + # virt-designer -d /tmp/home.img,qcow2 \ + -d /var/lib/libvirt/images/f17.img,qcow2 \ + -i default,mac=00:11:22:33:44:55,link=down \ + -i blue_network \ + -r minimal =head1 AUTHORS diff --git a/libvirt-designer.spec.in b/libvirt-designer.spec.in index 894bcb8..fb5c70a 100644 --- a/libvirt-designer.spec.in +++ b/libvirt-designer.spec.in @@ -78,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_bindir}/virtxml -%{_mandir}/man1/virtxml.1* +%{_bindir}/virt-designer +%{_mandir}/man1/virt-designer.1* %files libs %defattr(-,root,root,-) -- 1.8.5.2

2 1

[libvirt] [PATCH] qemu: Fix the error message for scsi host device's shareable checking
by Osier Yang 30 Jan '14

30 Jan '14

This fixes the wrong argument order. --- Pushed under trivial rule. --- src/qemu/qemu_hostdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 2b11d6c..1b16386 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -1135,8 +1135,8 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_INVALID, _("SCSI device %s is already in use by " "other domain(s) as '%s'"), - tmp_shareable ? "shareable" : "non-shareable", - virSCSIDeviceGetName(tmp)); + virSCSIDeviceGetName(tmp), + tmp_shareable ? "shareable" : "non-shareable"); goto error; } -- 1.8.1.4

2 2

[libvirt] [PATCH v2]Sheepdog: Auto Adding volume and correct refresh volume problem.
by joel SIMOES 30 Jan '14

30 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> Correct ret return 0 on success --- src/storage/storage_backend_sheepdog.c | 92 ++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index a6981ce..75304b1 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -86,7 +86,8 @@ virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, pool->available = pool->capacity - pool->allocation; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -109,6 +110,70 @@ virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, virCommandAddArgFormat(cmd, "%d", port); } +static int +virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) +{ + int ret; + char *output = NULL; + + virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", "-r", NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + virCommandSetOutputBuffer(cmd, &output); + ret = virCommandRun(cmd, NULL); + char** lines; + char** cells; + + if (ret < 0) + goto cleanup; + + ret = -1; + lines = virStringSplit(output, "\n", 0); + size_t i; + for (i = 0; *(lines + i); i++) { + char *line = *(lines + i); + cells = virStringSplit(line, " ", 0); + size_t j; + for (j = 0; *(cells + j); j++) { + + char *cell = *(cells + j); + if (j == 1) { + virStorageVolDefPtr vol = NULL; + if (VIR_ALLOC(vol) < 0) + goto cleanup; + + if (VIR_STRDUP(vol->name, cell) < 0) + goto cleanup; + + vol->type = VIR_STORAGE_VOL_BLOCK; + + if (VIR_EXPAND_N(pool->volumes.objs, pool->volumes.count, 1) < 0) + goto cleanup; + pool->volumes.objs[pool->volumes.count - 1] = vol; + + if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0) + goto cleanup; + + vol = NULL; + } + + VIR_FREE(*(cells + j)); + } + + VIR_FREE(cells); + VIR_FREE(*(lines + i)); + } + + + VIR_FREE(lines); + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(lines); + VIR_FREE(cells); + return ret; +} static int virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -122,15 +187,18 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); - if (ret == 0) - ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + if (ret < 0) + goto cleanup; + ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + if (ret < 0) + goto cleanup; + ret = virStorageBackendSheepdogRefreshAllVol(conn, pool); +cleanup: virCommandFree(cmd); - VIR_FREE(output); return ret; } - static int virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -143,12 +211,14 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; +cleanup: virCommandFree(cmd); return ret; } - static int virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -174,7 +244,6 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } - static int virStorageBackendSheepdogBuildVol(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -195,12 +264,12 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, goto cleanup; ret = 0; + cleanup: virCommandFree(cmd); return ret; } - int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output) @@ -257,7 +326,8 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, return -1; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -295,7 +365,6 @@ cleanup: return ret; } - static int virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -310,7 +379,10 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; +cleanup: virCommandFree(cmd); return ret; -- 1.8.3.2

2 1

[libvirt] [PATCH 0/2 v4] qemu: Don't fail if the SCSI host device is shareable between domains
by Osier Yang 30 Jan '14

30 Jan '14

*** BLURB HERE *** Osier Yang (2): qemu: Don't fail if the SCSI host device is shareable between domains tests: Add tests for scsi utils docs/formatdomain.html.in | 5 ++ src/libvirt_private.syms | 2 +- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_conf.c | 12 ++- src/qemu/qemu_hostdev.c | 86 ++++++++++-------- src/security/security_apparmor.c | 3 +- src/security/security_dac.c | 6 +- src/security/security_selinux.c | 6 +- src/util/virscsi.c | 70 +++++++++++---- src/util/virscsi.h | 16 ++-- tests/Makefile.am | 14 +++ tests/testutilsqemu.c | 3 +- tests/virscsitest.c | 188 +++++++++++++++++++++++++++++++++++++++ 15 files changed, 344 insertions(+), 76 deletions(-) create mode 100644 tests/virscsitest.c -- 1.8.1.4

2 6