- Devel - libvirt List Archives

[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

[libvirt] [PATCH] maint: add configure checks for BSD CPU affinity
by Roman Bogorodskiy 29 Jan '14

29 Jan '14

Check for presence of sys/cpuset.h header and cpuset_getaffinity() in configure instead of just using #ifdef __FreeBSD__ for that code. --- configure.ac | 10 ++++++++++ src/util/virprocess.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3a70375..1670a41 100644 --- a/configure.ac +++ b/configure.ac @@ -2604,6 +2604,16 @@ AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], #include <net/if_bridgevar.h> ]) +# Check for BSD CPU affinity availability +AC_CHECK_DECLS([cpuset_getaffinity], + [AC_DEFINE([HAVE_BSD_CPU_AFFINITY], + [1], + [whether BSD CPU affinity management is available])], + [], + [#include <sys/param.h> + #include <sys/cpuset.h> + ]) + # Check if we need to look for ifconfig if test "$want_ifconfig" = "yes"; then AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 827143c..83d0679 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -34,11 +34,14 @@ #ifdef __FreeBSD__ # include <sys/param.h> -# include <sys/cpuset.h> # include <sys/sysctl.h> # include <sys/user.h> #endif +#ifdef HAVE_BSD_CPU_AFFINITY +# include <sys/cpuset.h> +#endif + #include "viratomic.h" #include "virprocess.h" #include "virerror.h" @@ -457,7 +460,7 @@ realloc: return 0; } -#elif defined(__FreeBSD__) +#elif defined(HAVE_BSD_CPU_AFFINITY) int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, virBitmapPtr map) -- 1.8.4.3

2 1

[libvirt] [PATCH] Revert "networkAllocateActualDevice: Set QoS for bridgeless networks too"
by Michal Privoznik 29 Jan '14

29 Jan '14

This reverts commit 2996e6be19a13199ded7c2aa21039cca97318e01 and some parts of 2636dc8c4de83cd37bc0680a6fbc3f6d25023bd7. Conflicts: tests/virnetdevbandwidthtest.c: New test has been introduced since then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 - src/network/bridge_driver.c | 25 +----------- src/util/virnetdevbandwidth.c | 84 -------------------------------------- src/util/virnetdevbandwidth.h | 6 --- tests/virnetdevbandwidthtest.c | 91 ------------------------------------------ 5 files changed, 2 insertions(+), 205 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7655247..45f3117 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1470,7 +1470,6 @@ virNetDevBandwidthClear; virNetDevBandwidthCopy; virNetDevBandwidthEqual; virNetDevBandwidthFree; -virNetDevBandwidthMinimal; virNetDevBandwidthPlug; virNetDevBandwidthSet; virNetDevBandwidthUnplug; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6bdd1d6..0b43a67 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3284,30 +3284,9 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) else if (portgroup && portgroup->bandwidth) bandwidth = portgroup->bandwidth; - /* For bridgeless networks we must take into account any QoS set to them. - * This is, however, a bit tricky. With bridged network there are two - * points where QoS can be set: domain's interface and the bridge. The - * limits on those differ (in general) in which case the lower limit gets - * into effect. For example, if domain's interface average is 10Mbps but - * the network's is just 1Mbps, the domain will not be able to send data - * any faster than 1Mbps. However, on bridgeless networks we can't just set - * those two points and let kernel do its job since we have only single - * point. Therefore, we must combine the QoS settings from both domain's - * interface and network and choose the minimal value from pairs. - */ - if (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE || - netdef->forward.type == VIR_NETWORK_FORWARD_VEPA || - netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH || - netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - if (virNetDevBandwidthMinimal(&iface->data.network.actual->bandwidth, - bandwidth, - netdef->bandwidth) < 0) - goto error; - } else if (bandwidth && - virNetDevBandwidthCopy(&iface->data.network.actual->bandwidth, - bandwidth) < 0) { + if (bandwidth && virNetDevBandwidthCopy(&iface->data.network.actual->bandwidth, + bandwidth) < 0) goto error; - } /* copy appropriate vlan info to actualNet */ if (iface->vlan.nTags > 0) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 273c2db..ed6a19d 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -27,7 +27,6 @@ #include "viralloc.h" #include "virerror.h" #include "virstring.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -589,86 +588,3 @@ cleanup: VIR_FREE(ceil); return ret; } - -static void -virNetDevBandwidthRateMinimal(virNetDevBandwidthRatePtr result, - virNetDevBandwidthRatePtr band1, - virNetDevBandwidthRatePtr band2) -{ - if (!band1 || !band2) { - memcpy(result, band1 ? band1 : band2, sizeof(*result)); - return; - } - - /* We can't do a simple MIN() here, because zero value doesn't mean the - * narrowest limit, but an unset value. Hence we need symmetric F(a, b) - * so that: - * F(a, 0) = F(0, a) = a; special corner case: F(0, 0) = 0 - * F(a, b) = MIN(a, b) for a != 0 and b != 0 - */ -#define NON_ZERO_MIN(a, b) \ - ((a) && (b) ? MIN(a, b) : (a) ? (a) : (b)) - - result->average = NON_ZERO_MIN(band1->average, band2->average); - result->peak = NON_ZERO_MIN(band1->peak, band2->peak); - result->floor = NON_ZERO_MIN(band1->floor, band2->floor); - result->burst = NON_ZERO_MIN(band1->burst, band2->burst); -} - -/** - * virNetDevBandwidthMinimal: - * @result: the minimal intersect of @band1 and @band2 - * @band1: the first bandwidth - * @band2: the second bandwidth - * - * Combine the two bandwidths into one with choosing the minimal value for each - * pair of items within bandwidth structure. The resulting bandwidth is stored - * into @result. In case of both @band1 and @band2 being NULL pointers, the - * @ret is set to NULL as well as there's no bandwidth to calculate (this is - * not considered an error). The caller is responsible for freeing @result when - * no longer needed. - * - * Returns 0 on success, -1 otherwise. - */ -int -virNetDevBandwidthMinimal(virNetDevBandwidthPtr *result, - virNetDevBandwidthPtr band1, - virNetDevBandwidthPtr band2) -{ - int ret = -1; - - if (!band1 && !band2) { - /* Nothing to compute */ - *result = NULL; - return 0; - } - - if (!band1 || !band2) { - /* Sweet, one of the args is NULL. The non-NULL one - * is our minimum then. */ - return virNetDevBandwidthCopy(result, band1 ? band1 : band2); - } - - if (VIR_ALLOC(*result) < 0) - goto cleanup; - - if (band1->in || band2->in) { - if (VIR_ALLOC((*result)->in) < 0) - goto cleanup; - - virNetDevBandwidthRateMinimal((*result)->in, band1->in, band2->in); - } - - if (band1->out || band2->out) { - if (VIR_ALLOC((*result)->out) < 0) - goto cleanup; - - virNetDevBandwidthRateMinimal((*result)->out, band1->out, band2->out); - } - - ret = 0; -cleanup: - if (ret < 0) - VIR_FREE(*result); - return ret; -} diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h index ea40df4..4606a07 100644 --- a/src/util/virnetdevbandwidth.h +++ b/src/util/virnetdevbandwidth.h @@ -74,10 +74,4 @@ int virNetDevBandwidthUpdateRate(const char *ifname, unsigned long long new_rate) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; - -int -virNetDevBandwidthMinimal(virNetDevBandwidthPtr *result, - virNetDevBandwidthPtr band1, - virNetDevBandwidthPtr band2) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_BANDWIDTH_H__ */ diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 345a0dd..609deb8 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -62,56 +62,6 @@ struct testSetStruct { } while (0) static int -testVirNetDevBandwidthMinimal(const void *data) -{ - int ret = -1; - const struct testMinimalStruct *info = data; - virNetDevBandwidthPtr expected_result = NULL, result = NULL, - band1 = NULL, band2 = NULL; - - - /* Parse given XMLs */ - PARSE(info->expected_result, expected_result); - PARSE(info->band1, band1); - PARSE(info->band2, band2); - - if (virNetDevBandwidthMinimal(&result, band1, band2) < 0) - goto cleanup; - - if (!virNetDevBandwidthEqual(expected_result, result)) { - virBuffer exp_buf = VIR_BUFFER_INITIALIZER, - res_buf = VIR_BUFFER_INITIALIZER; - char *exp = NULL, *res = NULL; - - fprintf(stderr, "expected_result != result"); - - if (virNetDevBandwidthFormat(expected_result, &exp_buf) < 0 || - virNetDevBandwidthFormat(result, &res_buf) < 0 || - !(exp = virBufferContentAndReset(&exp_buf)) || - !(res = virBufferContentAndReset(&res_buf))) { - fprintf(stderr, "Failed to fail"); - virBufferFreeAndReset(&exp_buf); - virBufferFreeAndReset(&res_buf); - VIR_FREE(exp); - VIR_FREE(res); - goto cleanup; - } - - virtTestDifference(stderr, exp, res); - VIR_FREE(exp); - VIR_FREE(res); - } - - ret = 0; -cleanup: - virNetDevBandwidthFree(expected_result); - virNetDevBandwidthFree(result); - virNetDevBandwidthFree(band1); - virNetDevBandwidthFree(band2); - return ret; -} - -static int testVirNetDevBandwidthSet(const void *data) { int ret = -1; @@ -159,15 +109,6 @@ mymain(void) { int ret = 0; -#define DO_TEST_MINIMAL(r, ...) \ - do { \ - struct testMinimalStruct data = {r, __VA_ARGS__}; \ - if (virtTestRun("virNetDevBandwidthMinimal", \ - testVirNetDevBandwidthMinimal, \ - &data) < 0) \ - ret = -1; \ - } while (0) - #define DO_TEST_SET(Band, Exp_cmd, ...) \ do { \ struct testSetStruct data = {.band = Band, \ @@ -180,38 +121,6 @@ mymain(void) } while (0) - DO_TEST_MINIMAL(NULL, NULL, NULL); - - DO_TEST_MINIMAL("<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>", - .band1 = "<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>"); - - DO_TEST_MINIMAL("<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>", - .band2 = "<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>"); - DO_TEST_MINIMAL("<bandwidth>" - " <inbound average='1' peak='2' floor='3' burst='4'/>" - " <outbound average='5' peak='6' burst='7'/>" - "</bandwidth>", - "<bandwidth>" - " <inbound average='1' peak='2' burst='4'/>" - " <outbound average='0' burst='7'/>" - "</bandwidth>", - "<bandwidth>" - " <inbound average='1' peak='2' floor='3'/>" - " <outbound average='5' peak='6'/>" - "</bandwidth>"); - DO_TEST_SET(("<bandwidth>" " <inbound average='1' peak='2' floor='3' burst='4'/>" " <outbound average='5' peak='6' burst='7'/>" -- 1.8.5.2

2 3

[libvirt] [PATCH 0/4] Improve QoS and unit-test it
by Michal Privoznik 29 Jan '14

29 Jan '14

*** BLURB HERE *** Michal Privoznik (4): networkAllocateActualDevice: Set QoS for bridgeless networks too tests: Introduce virnetdevbandwidthtest virnetdevbandwidthtest: Introduce mocking virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 25 ++++- src/util/virnetdevbandwidth.c | 88 +++++++++++++++ src/util/virnetdevbandwidth.h | 6 + tests/Makefile.am | 14 +++ tests/virnetdevbandwidthmock.c | 106 ++++++++++++++++++ tests/virnetdevbandwidthtest.c | 244 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 482 insertions(+), 2 deletions(-) create mode 100644 tests/virnetdevbandwidthmock.c create mode 100644 tests/virnetdevbandwidthtest.c -- 1.8.5.2

3 13

[libvirt] [libvirt-glib 0/3] Add unit tests
by Christophe Fergeau 29 Jan '14

29 Jan '14

This patch series adds support for GTester tests to libvirt-glib, and starts implementing some unit tests for libvirt-gconfig, and for a very specific part of the event handling code. This series https://www.redhat.com/archives/libvir-list/2014-January/msg00939.html is needed for the gconfig test to build and successfully pass. This series https://www.redhat.com/archives/libvir-list/2014-January/msg01359.html is needed too if you don't want the event test to fail. Christophe

2 10

[libvirt] ANNOUNCE: virt-xml: Edit libvirt XML with command line options
by Cole Robinson 29 Jan '14

29 Jan '14

I've just pushed a new tool to virt-manager.git called virt-xml. virt-xml uses virt-install's command line options to allow building and editing domain XML. Best way to describe what it can do is with a bunch of examples: See a list of all suboptions that --disk and --network take # virt-xml --disk=? --network=? Change the <description> of domain 'example': # virt-xml example --edit --metadata description="my new description" # Enable the boot device menu for domain 'example': # virt-xml example --edit --boot bootmenu=on Clear the previous <cpu> definition of domain 'winxp', change it to 'host-model', but interactively confirm the diff before saving: # virt-xml winxp --edit --cpu host-model,clearxml=yes --confirm Change the sound cards with model=ac97 to model=ich6 on 'fedora19', but only output the diff: # virt-xml fedora19 --edit model=ac97 --soundhw model=ich6 --print-diff Update the first graphics password to 'foo' of the running VM 'rhel6': # virt-xml rhel6 --edit --graphics password=foo --update Remove the disk path from disk device hdc: # virt-xml rhel6 --edit target=hdc --disk path= Change all disk devices of type 'disk' to use cache=none, using XML from stdin, printing the new XML to stdout. # cat <xmlfile> | virt-xml --edit device=disk --disk cache=none Change all host devices to use driver_name=vfio for VM 'fedora20' on the remote connection # virt-xml --connect qemu+ssh://remotehost/system \ fedora20 --edit all --host-device driver_name=vfio Hotplug host USB device 001.003 to running domain 'fedora19': # virt-xml f19 --add-device --host-device 001.003 --update Add a spicevmc channel to the domain 'winxp', that will be available after the next VM shutdown. # virt-xml winxp --add-device --channel spicevmc Create a 10G qcow2 disk image and attach it to 'fedora18' for the next VM startup: # virt-xml fedora18 --add-device \ --disk /var/lib/libvirt/images/newimage.qcow2,format=qcow2,size=10 Remove the disk vdb from the running domain 'rhel7': # virt-xml rhel7 --remove-device --disk target=vdb Remove all graphics devices from the VM 'rhel7' after the next shutdown: # virt-xml rhel7 --remove-device --graphics all Generate XML for a virtio console device and print it to stdout: # virt-xml --build-xml --console pty,target_type=virtio The man page and --help output have more info, man page at: https://git.fedorahosted.org/cgit/virt-manager.git/tree/man/virt-xml.pod If you are interested in trying it out before it hits any distro, it's really simple: git clone git://git.fedorahosted.org/virt-manager.git cd virt-manager ./virt-xml --help Nothing is set in stone yet, so if anyone has suggestions about the command line syntax or any of the above, please speak up: I plan on cutting a new virt-manager release with virt-xml within the next few weeks. Thanks, Cole

4 6

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

29 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 v2: - Re-ordered patches and squashed two together - Add missing locking in state reload function - Don't remove locking from virNWFilterInstantiateFilterLate Daniel P. Berrange (4): Add a read/write lock implementation Remove windows thread implementation in favour of pthreads Add a mutex to serialize updates to firewall Push nwfilter update locking up to top level configure.ac | 15 +- 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 | 15 +- src/nwfilter/nwfilter_gentech_driver.c | 23 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/qemu/qemu_driver.c | 6 + src/uml/uml_driver.c | 4 + src/util/virthread.c | 291 +++++++++++++++++++++++- 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 ----- 17 files changed, 404 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 21

[libvirt] [RFC PATCHv2 0/4] Adding 'config' driver
by Adam Walters 29 Jan '14

29 Jan '14

This patchset adds a driver named 'config' which provides access to configuration data, such as secret and storage definitions, without requiring a connection to a hypervisor. This complements my previous patchset, which resolves the race condition on libvirtd startup. The rationale behind this idea is that there exist circumstances under which a driver may require access to things such as secrets during a time at which there is no active connection to a hypervisor. Currently, that data can not be accessed. An example of this in libvirt today is that the storage driver requires a connection in order to access secret data to auto-start an RBD storage pool that uses CephX authentication. My previous patchset breaks the ability to auto-start that type of storage pool, and this patchset fixes it again. This driver is technically what one may call a hypervisor driver, but it does not implement any domain operations. It simply exists to handle requests by drivers for access to information that would otherwise by unattainable. The URI provided by this driver is 'config:///' and has been tested working on four different machines of mine, running three different Linux distributions (Archlinux, Gentoo, and CentOS). Being a very simple driver, I would expect it to work pretty much anywhere. I welcome comments and suggestions related to this driver. At the very least, this patchset combined with my previous patchset resolves the current race condition present on startup of libvirtd without any loss of functionality. Adam Walters (4): config: Adding config driver configure: Implement config driver libvirtd: Reorder load of secrets driver storage: Change hardcoded QEMU connection to use config driver configure.ac | 11 ++ daemon/libvirtd.c | 21 ++-- include/libvirt/virterror.h | 2 + po/POTFILES.in | 1 + src/Makefile.am | 25 +++++ src/config/config_driver.c | 238 +++++++++++++++++++++++++++++++++++++++++++ src/config/config_driver.h | 44 ++++++++ src/storage/storage_driver.c | 13 +-- src/util/virerror.c | 2 + 9 files changed, 345 insertions(+), 12 deletions(-) create mode 100644 src/config/config_driver.c create mode 100644 src/config/config_driver.h -- 1.8.5.2

2 7

[libvirt] [PATCHv2 0/9] Snapshots on gluster
by Peter Krempa 29 Jan '14

29 Jan '14

Peter Krempa (9): storage: Add new argument for createVol backend API storage: gluster: Introduce dummy functions for creating a volume storage: Add internal API to create temporary storage pools and vols snapshot: Add support for specifying snapshot disk backing type snapshot: Test snapshot disk type specification storage: Implement ephemeral storage APIs in the generic storage driver storage: gluster: Support conversion of gluster volumes to temp volumes qemu: snapshot: Switch snapshot file deletion to the new storage API qemu: snapshot: Add support for external active snapshots on gluster docs/formatsnapshot.html.in | 15 + docs/hvsupport.pl | 3 + docs/schemas/domainsnapshot.rng | 76 +++- src/Makefile.am | 3 +- src/check-aclrules.pl | 3 + src/check-drivername.pl | 1 + src/conf/snapshot_conf.c | 42 ++- src/conf/snapshot_conf.h | 15 +- src/driver.h | 13 + src/libvirt_internal.c | 70 ++++ src/libvirt_internal.h | 22 ++ src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 9 + src/qemu/qemu_conf.c | 3 - src/qemu/qemu_driver.c | 227 ++++++++++-- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 30 +- src/storage/storage_backend_gluster.c | 119 +++++- src/storage/storage_backend_logical.c | 6 +- src/storage/storage_backend_rbd.c | 3 +- src/storage/storage_backend_sheepdog.c | 3 +- src/storage/storage_driver.c | 405 ++++++++++++++++++++- tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 18 + .../disk_driver_name_null.xml | 2 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 22 +- .../disk_snapshot_redefine.xml | 6 +- 28 files changed, 1007 insertions(+), 120 deletions(-) create mode 100644 src/libvirt_internal.c -- 1.8.5.2

2 22

[libvirt] [libvirt-glib 0/3] Fixes to glib/libvirt mainloop integration
by Christophe Fergeau 29 Jan '14

29 Jan '14

While reviewing danpb's win32 patch for the mainloop integration code, I found 2 more issues in the existing code (one leak, one bug). These patches fix this (first patch is just some cleanup). Christophe

2 6

[libvirt] [PATCH] Honor blacklist for modprobe command
by John Ferlan 29 Jan '14

29 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1045124 When loading modules, libvirt does not honor the modprobe blacklist. By adding a "-b" to the modprobe command libvirt will fail to load a module if it's on the blacklist Check if the failure to load a driver was due to it being on the blacklist using the output of a "modprobe -c" searching for "blacklist <driver_Name>" where driver_Name is possibly a modified string of the input driver changing all '-' into '_' since that's what modprobe does. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virpci.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index e2d222e..18b85f2 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -979,6 +979,10 @@ virPCIProbeStubDriver(const char *driver) { char *drvpath = NULL; bool probed = false; + size_t i; + char *drvblklst = NULL; + char *outbuf = NULL; + virCommandPtr cmd = NULL; recheck: if (virPCIDriverDir(&drvpath, driver) == 0 && virFileExists(drvpath)) { @@ -990,18 +994,49 @@ recheck: VIR_FREE(drvpath); if (!probed) { - const char *const probecmd[] = { MODPROBE, driver, NULL }; + cmd = virCommandNewArgList(MODPROBE, "-b", driver, NULL); probed = true; - if (virRun(probecmd, NULL) < 0) { + if (virCommandRun(cmd, NULL) < 0) { char ebuf[1024]; VIR_WARN("failed to load driver %s: %s", driver, virStrerror(errno, ebuf, sizeof(ebuf))); - return -1; + goto cleanup; } + virCommandFree(cmd); + cmd = NULL; goto recheck; } + /* All error path code - purpose is to determine whether the failure + * occurs because device is on blacklist in order to add an error + * message to help detect why load failed + */ + if (virAsprintfQuiet(&drvblklst, "blacklist %s", driver) < 0) + goto cleanup; + + /* Although driver may have dash, 'modprobe -c' adjusts to use underscore */ + for (i = 0; i < drvblklst[i]; i++) + if (drvblklst[i] == '-') + drvblklst[i] = '_'; + + cmd = virCommandNewArgList(MODPROBE, "-c", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + /* Find driver on blacklist? */ + if (strstr(outbuf, drvblklst)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to load PCI stub module %s: " + "administratively prohibited"), + driver); + } + +cleanup: + virCommandFree(cmd); + VIR_FREE(drvblklst); + VIR_FREE(outbuf); return -1; } @@ -1313,9 +1348,10 @@ virPCIDeviceDetach(virPCIDevicePtr dev, virPCIDeviceList *inactiveDevs) { if (virPCIProbeStubDriver(dev->stubDriver) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to load PCI stub module %s"), - dev->stubDriver); + if (virGetLastError() == NULL) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to load PCI stub module %s"), + dev->stubDriver); return -1; } -- 1.8.4.2

2 3

[libvirt] [PATCHv2 0/6] Add BlkIO and CPU/mem stat API implementations for lxc
by Thorsten Behrens 29 Jan '14

29 Jan '14

This patch set adds block io, memory and domain cpu statistics API slot implementations to the LXC driver, in order to get linux container monitoring and accounting a bit closer to qemu standards. The last patch is a tad quirky (happy to hear suggestions on alternative ways), in that it widens the permissible value set at the .domainBlockStats slot: for lxc guests, it is relatively likely to have zero disk devices, since host filesystems can be used via passthrough bind mounts. Therefore, passing the zero-length string as device path, is interpreted as 'return summary stats for the entire domains's block io'. Thorsten Behrens (6): Add util virCgroupGetBlkioIo*Serviced methods. Implement domainMemoryStats API slot for LXC driver. Make qemuGetDomainTotalCPUStats a virCgroup function. Implement domainGetCPUStats for lxc driver. Implemet lxcDomainBlockStats for lxc driver Widening API change - accept empty path for virDomainBlockStats src/libvirt.c | 8 +- src/libvirt_private.syms | 3 + src/lxc/lxc_driver.c | 239 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_driver.c | 54 +------- src/util/vircgroup.c | 291 +++++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 17 +++ tools/virsh-domain-monitor.c | 11 +- tools/virsh.pod | 5 +- 8 files changed, 569 insertions(+), 59 deletions(-) -- 1.8.4

2 16

[libvirt] [PATCH v3 0/2] Enhance virnetdevbandwidthtest
by Michal Privoznik 29 Jan '14

29 Jan '14

yet another version - this time with virBuffer approach. Michal Privoznik (2): virCommand: Introduce virCommandSetDryRun virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet src/libvirt_private.syms | 1 + src/util/vircommand.c | 57 +++++++++++++++++++++++++++++-- src/util/vircommand.h | 2 ++ tests/virnetdevbandwidthtest.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+), 2 deletions(-) -- 1.8.5.2

2 4

Re: [libvirt] [Qemu-devel] [PATCH v4 4/5] qmp: full introspection support for QMP
by Amos Kong 29 Jan '14

29 Jan '14

CC Libvirt-list Original discussion: http://marc.info/?l=qemu-devel&m=139048842504757&w=2 [Qemu-devel] [PATCH v4 0/5] QMP full introspection On Fri, Jan 24, 2014 at 06:48:31PM +0800, Fam Zheng wrote: > On Thu, 01/23 22:46, Amos Kong wrote: > > This patch introduces a new monitor command to query QMP schema > > information, the return data is a range of schema structs, which > > contains the useful metadata to help management to check supported > > features, QMP commands detail, etc. > > > > We use qapi-introspect.py to parse all json definition in > > qapi-schema.json, and generate a range of dictionaries with metadata. > > The query command will visit the dictionaries and fill the data > > to allocated struct tree. Then QMP infrastructure will convert > > the tree to json string and return to QMP client. > > > > TODO: > > Wenchao Xia is working to convert QMP events to qapi-schema.json, > > then event can also be queried by this interface. > > > > I will introduce another command 'query-qga-schema' to query QGA > > schema information, it's easy to add this support based on this > > patch. > > > > Signed-off-by: Amos Kong <akong(a)redhat.com> > > --- > > qapi-schema.json | 11 +++ > > qmp-commands.hx | 42 +++++++++++ > > qmp.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 268 insertions(+) > > > > diff --git a/qapi-schema.json b/qapi-schema.json > > index c63f0ca..6033383 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -4411,3 +4411,14 @@ > > 'reference-type': 'String', > > 'type': 'DataObjectType', > > 'unionobj': 'DataObjectUnion' } } > > + > > +## > > +# @query-qmp-schema > > +# > > +# Query QMP schema information > > +# > > +# @returns: list of @DataObject > > +# > > +# Since: 1.8 > > +## > > +{ 'command': 'query-qmp-schema', 'returns': ['DataObject'] } > > diff --git a/qmp-commands.hx b/qmp-commands.hx > > index 02cc815..b83762d 100644 > > --- a/qmp-commands.hx > > +++ b/qmp-commands.hx > > @@ -3291,6 +3291,48 @@ Example: > > } > > > > EQMP > > + { > > + .name = "query-qmp-schema", > > + .args_type = "", > > + .mhandler.cmd_new = qmp_marshal_input_query_qmp_schema, > > + }, > > + > > + > > +SQMP > > +query-qmp-schema > > +---------------- > > + > > +query qmp schema information > > + > > +Return a json-object with the following information: > > + > > +- "name": qmp schema name (json-string) > > +- "type": qmp schema type, it can be 'comand', 'type', 'enum', 'union' > > +- "returns": return data of qmp command (json-object, optional) > > + > > +Example: > > + > > +-> { "execute": "query-qmp-schema" } > > +-> { "return": [ > > + { > > + "name": "query-name", > > + "type": "command", > > + "returns": { > > + "name": "NameInfo", > > + "type": "type", > > + "data": [ > > + { > > + "name": "name", > > + "optional": true, > > + "recursive": false, > > + "type": "str" > > + } > > + ] > > + } > > + } > > + } > > + > > +EQMP > > > > { > > .name = "blockdev-add", > > diff --git a/qmp.c b/qmp.c > > index 0f46171..a64ae6d 100644 > > --- a/qmp.c > > +++ b/qmp.c > > @@ -27,6 +27,8 @@ > > #include "qapi/qmp/qobject.h" > > #include "qapi/qmp-input-visitor.h" > > #include "hw/boards.h" > > +#include "qapi/qmp/qjson.h" > > +#include "qapi-introspect.h" > > > > NameInfo *qmp_query_name(Error **errp) > > { > > @@ -488,6 +490,219 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) > > return arch_query_cpu_definitions(errp); > > } > > > > +static strList *qobject_to_strlist(QObject *data) > > +{ > > + strList *list = NULL; > > + strList **plist = &list; > > + QList *qlist; > > + const QListEntry *lent; > > + > > + qlist = qobject_to_qlist(data); > > + for (lent = qlist_first(qlist); lent; lent = qlist_next(lent)) { > > + strList *entry = g_malloc0(sizeof(strList)); > > + entry->value = g_strdup(qobject_get_str(lent->value)); > > + *plist = entry; > > + plist = &entry->next; > > + } > > + > > + return list; > > +} > > + > > +static DataObject *qobject_to_dataobj(QObject *data); > > + > > +static DataObjectMember *qobject_to_dataobjmem(QObject *data) > > +{ > > + > > + DataObjectMember *member = g_malloc0(sizeof(DataObjectMember)); > > + > > + member->type = g_malloc0(sizeof(DataObjectMemberType)); > > + if (data->type->code == QTYPE_QDICT) { > > + member->type->kind = DATA_OBJECT_MEMBER_TYPE_KIND_EXTEND; > > + member->type->extend = qobject_to_dataobj(data); > > + } else { > > + member->type->kind = DATA_OBJECT_MEMBER_TYPE_KIND_REFERENCE; > > + member->type->reference = g_strdup(qobject_get_str(data)); > > + } > > + > > + return member; > > +} > > + > > +static DataObjectMemberList *qobject_to_dict_memlist(QObject *data) > > +{ > > + DataObjectMemberList *list = NULL; > > + DataObjectMemberList **plist = &list; > > + QDict *qdict = qobject_to_qdict(data); > > + const QDictEntry *dent; > > + > > + for (dent = qdict_first(qdict); dent; dent = qdict_next(qdict, dent)) { > > + DataObjectMemberList *entry = g_malloc0(sizeof(DataObjectMemberList)); > > + entry->value = qobject_to_dataobjmem(dent->value); > > + > > + entry->value->has_optional = true; > > + entry->value->has_name = true; > > + if (dent->key[0] == '*') { > > + entry->value->optional = true; > > + entry->value->name = g_strdup(dent->key + 1); > > + } else { > > + entry->value->name = g_strdup(dent->key); > > + } > > + *plist = entry; > > + plist = &entry->next; > > + } > > + > > + return list; > > +} > > + > > +static DataObjectMemberList *qobject_to_list_memlist(QObject *data) > > +{ > > + const QListEntry *lent; > > + DataObjectMemberList *list = NULL; > > + DataObjectMemberList **plist = &list; > > + QList *qlist = qobject_to_qlist(data); > > + > > + for (lent = qlist_first(qlist); lent; lent = qlist_next(lent)) { > > + DataObjectMemberList *entry = g_malloc0(sizeof(DataObjectMemberList)); > > + entry->value = qobject_to_dataobjmem(lent->value); > > + entry->value->has_optional = true; > > + entry->value->has_name = true; > > + *plist = entry; > > + plist = &entry->next; > > + } > > + > > + return list; > > +} > > + > > +static DataObjectMemberList *qobject_to_memlist(QObject *data) > > This whole converting is cumbersome. You already did all the traversing through > the type jungle in python when generating this, it's not necessary to do the > similar thing again here. We can parse raw schemas and generate json string table, we can't directly return the string / qobject to monitor, C code has to convert the json to qobject, we have to revisit the qobject and convert them to DataObject/DataObjectMember/DataObject... structs. > Alternatively, I think we have a good reason to extend QMP framework as > necessary here, as we are doing "QMP introspection", which is a part of the > framework: > > * Define final output into qmp_schema_table[], no need to box it like: > > "{'_obj_member': 'False', '_obj_type': 'enum', '_obj_name': > 'ErrorClass', '_obj_data': {'data': ... > > just put it content of "qmp-introspection.output.txt" as a long string in > the header, > like you would generate in qobject_to_memlist: > > const char *qmp_schema_table = > "{ 'name': 'ErrorClass', 'type': 'enumeration', 'data': [...]}," > "{ 'name': '...', ...}," The keys are used for metadata might be 'recursive', 'optional', etc. It might exists problem in namespace, let's use '_obj_' or '_' prefix for the metadata keys. I used a nested dictionary to describe a DataObject, because we can store the metadata and definition to different level, it's helpful in parse the output by Libvirt. example: "{ 'type': 'NameInfo', 'data': {'*name': 'str', '*job': 'str'} }" It's good to store _type, _name, data to same level, but the metadata of items of data's value dictionary can't be appended to same level. "{ '_name': 'NameInfo', '_type': 'type', 'data': { 'name': 'str', '_name_optional': 'True', 'job': 'str', '_job_optional': 'True' } }" A better solution, but I don't know if it will cause trouble for Libvirt to parse the output. "{'_type': 'type', '_name': 'NameInfo', 'data': { 'job': {'_value': 'str', '_recursive': 'True'}, 'name': {'_value': 'str', '_recursive': 'True'} }, '_recursive': 'False' }" When we describe a DataObject (dict/list/str, one schema, extened schema, schema member, etc), so I we generally use a nested dictionary to describe a DataObject, it will split the metadata with original data two different dictionary level, it's convenient for parse of Libvirt. Here I just use a dict member as an example, actually it's more complex to parse all kinds of data objects. > ... > ; > > * Add a new type of qmp command, that returns a QString as a json literal. > query-qmp-schema is defined as this type. (This wouldn't be much code, but > may be abused in the future, I'm afraid. However we can review, limit its > use to introspection only) > > * And return qmp_schema_table from query-qmp-shema, which will be copied to > the wire. > > Feel free to disagree, it's not a perfect solution. But I really think we need > to avoid duplicating "enum", "base", "type", "union", "discriminator", ... In the past, we didn't consider to extend and add metadata by Python, so Libvirt wasn't happy to just get a raw schema(not extended, no metadata). But now, we already successfully to transfer this work to Python, and we can adjust to make management to be happy for the metadata and format. The problem is that Libvirt should parse the output twice, the json items are also json object string. Eric, Is it acceptabled? Example: * as suggested by Fam to put the metadta with schema data in same dict level * process some special cases by nested dictionary (eg: '*tls': 'bool' ==> 'tls': {'_value': 'bool', '_optional': 'True'} ) * return a strList to Libvirt, the content of string is json object, that contains the metadata. { "return": [ "{'_type': 'enum', '_name': 'ErrorClass', 'data': ['GenericError', 'CommandNotFound', 'DeviceEncrypted', 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap'], '_recursive': 'False'}", "{'_type': 'command', '_name': 'add_client', 'data': {'tls': {'_value': 'bool', '_optional': 'True'}, 'skipauth': {'_value': 'bool', '_optional': 'True'}, 'protocol': 'str', 'fdname': 'str'}, '_recursive': 'False'}", "{'_type': 'type', '_name': 'NameInfo', 'data': {'job': {'_value': 'str', '_optional': 'True'}, 'name': {'_value': 'str', '_optional': 'True'}}, '_recursive': 'False'}", "{'returns': {'_type': 'type', '_recursive': 'False', 'data': {'job': {'_value': 'str', '_optional': 'True'}, 'name': {'_value': 'str', '_optional': 'True'}}, '_name': 'NameInfo'}, '_name': 'query-name', '_type': 'command', '_recursive': 'False'}", "......", "......", "......" ] } > Fam -- Amos.

4 9

[libvirt] libvirt 1.2.1 vs. Xen 4.1.4
by Guido Günther 29 Jan '14

29 Jan '14

Hi, a user of Debian's libvirt backport to wheezy using Xen reported libvirt 1.2.1 failing for him like: info : libvirt version: 1.2.1 error : virIdentityGetSystem:173 : Unable to lookup SELinux process context: Invalid argument error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xend_req:302 : internal error: failed to parse Xend response return code error : xend_req:302 : internal error: failed to parse Xend response return code error : virNetSocketReadWire:1454 : End of file while reading data: Input/output error It seems there weren't any significant changes in this code area recently so I wonder what might be triggering this? Since I currently don't have a xen test setup it'd be happy about any pointer. We don't have libxl enabled. https://bugzilla.redhat.com/show_bug.cgi?id=1055165 has a similar error message. Cheers, -- Guido

3 3

[libvirt] [PATCH RFC 1/2] support compression when --memory-only option is specified
by Qiao Nuohan 29 Jan '14

29 Jan '14

--memory-only option is introduced without compression supported. Therefore, this is a freature regression of virsh dump. This patch is used to add "--compress" and "[--compression-format] <string>" to the command "virsh dump --memory-only" and send dump-guest-memory command to qemu with dump format specified to one of elf, kdump-zlib, kdump-lzo and kdump-snappy. Signed-off-by: Qiao Nuohan <qiaonuohan(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 18 +++++++++++++----- src/libvirt.c | 15 +++++++++++++++ src/qemu/qemu_driver.c | 21 +++++++++++++++++---- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 4 +++- src/qemu/qemu_monitor_json.h | 3 ++- tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 29 +++++++++++++++++++++++++++++ 9 files changed, 85 insertions(+), 16 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a448411..cb8989e 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1165,11 +1165,19 @@ typedef virDomainMemoryStatStruct *virDomainMemoryStatPtr; /* Domain core dump flags. */ typedef enum { - VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ - VIR_DUMP_LIVE = (1 << 1), /* live dump */ - VIR_DUMP_BYPASS_CACHE = (1 << 2), /* avoid file system cache pollution */ - VIR_DUMP_RESET = (1 << 3), /* reset domain after dump finishes */ - VIR_DUMP_MEMORY_ONLY = (1 << 4), /* use dump-guest-memory */ + VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ + VIR_DUMP_LIVE = (1 << 1), /* live dump */ + VIR_DUMP_BYPASS_CACHE = (1 << 2), /* avoid file system cache pollution */ + VIR_DUMP_RESET = (1 << 3), /* reset domain after dump finishes */ + VIR_DUMP_MEMORY_ONLY = (1 << 4), /* use dump-guest-memory */ + VIR_DUMP_COMPRESS = (1 << 5), /* dump guest memory in + kdump-compressed format */ + VIR_DUMP_COMPRESS_ZLIB = (1 << 6), /* kdump-compressed format, with + zlib-compressed */ + VIR_DUMP_COMPRESS_LZO = (1 << 7), /* kdump-compressed format, with + lzo-compressed */ + VIR_DUMP_COMPRESS_SNAPPY = (1 << 8), /* kdump-compressed format, with + snappy-compressed */ } virDomainCoreDumpFlags; /* Domain migration flags. */ diff --git a/src/libvirt.c b/src/libvirt.c index 666526e..318296e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2969,6 +2969,21 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) goto error; } + if ((flags & VIR_DUMP_COMPRESS) && !(flags & VIR_DUMP_MEMORY_ONLY)) { + virReportInvalidArg(flags, "%s", + _("compress flag cannot be set without memory-only " + "flag")); + goto error; + } + + if ((flags & (VIR_DUMP_COMPRESS_ZLIB | VIR_DUMP_COMPRESS_LZO | + VIR_DUMP_COMPRESS_SNAPPY)) && !(flags & VIR_DUMP_COMPRESS)) { + virReportInvalidArg(flags, "%s", + _("compression-format cannot be set without " + "compress flag")); + goto error; + } + if (conn->driver->domainCoreDump) { int ret; char *absolute_to; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index df4f5b5..c4e1aef 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3380,7 +3380,8 @@ cleanup: } static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, - int fd, enum qemuDomainAsyncJob asyncJob) + int fd, enum qemuDomainAsyncJob asyncJob, + const char* dump_format) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; @@ -3400,7 +3401,7 @@ static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; - ret = qemuMonitorDumpToFd(priv->mon, fd); + ret = qemuMonitorDumpToFd(priv->mon, fd, dump_format); qemuDomainObjExitMonitor(driver, vm); return ret; @@ -3418,6 +3419,7 @@ doCoreDump(virQEMUDriverPtr driver, virFileWrapperFdPtr wrapperFd = NULL; int directFlag = 0; unsigned int flags = VIR_FILE_WRAPPER_NON_BLOCKING; + const char *dump_format; /* Create an empty file with appropriate ownership. */ if (dump_flags & VIR_DUMP_BYPASS_CACHE) { @@ -3441,7 +3443,16 @@ doCoreDump(virQEMUDriverPtr driver, goto cleanup; if (dump_flags & VIR_DUMP_MEMORY_ONLY) { - ret = qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP); + if (dump_flags & VIR_DUMP_COMPRESS_ZLIB) + dump_format = "kdump-zlib"; + else if (dump_flags & VIR_DUMP_COMPRESS_LZO) + dump_format = "kdump-lzo"; + else if (dump_flags & VIR_DUMP_COMPRESS_SNAPPY) + dump_format = "kdump-snappy"; + else + dump_format = "elf"; + ret = qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, + dump_format); } else { ret = qemuMigrationToFile(driver, vm, fd, 0, path, qemuCompressProgramName(compress), false, @@ -3517,7 +3528,9 @@ static int qemuDomainCoreDump(virDomainPtr dom, virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE | VIR_DUMP_RESET | - VIR_DUMP_MEMORY_ONLY, -1); + VIR_DUMP_MEMORY_ONLY | VIR_DUMP_COMPRESS | + VIR_DUMP_COMPRESS_ZLIB | VIR_DUMP_COMPRESS_LZO | + VIR_DUMP_COMPRESS_SNAPPY, -1); if (!(vm = qemuDomObjFromDomain(dom))) return -1; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a968901..c2c4a1e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2338,10 +2338,10 @@ int qemuMonitorMigrateCancel(qemuMonitorPtr mon) } int -qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd) +qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd, const char *dump_format) { int ret; - VIR_DEBUG("mon=%p fd=%d", mon, fd); + VIR_DEBUG("mon=%p fd=%d dump_format=%s", mon, fd, dump_format); if (!mon) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2361,7 +2361,7 @@ qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd) if (qemuMonitorSendFileHandle(mon, "dump", fd) < 0) return -1; - ret = qemuMonitorJSONDump(mon, "fd:dump"); + ret = qemuMonitorJSONDump(mon, "fd:dump", dump_format); if (ret < 0) { if (qemuMonitorCloseFileHandle(mon, "dump") < 0) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index eabf000..f2e5763 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -495,7 +495,8 @@ int qemuMonitorMigrateToUnix(qemuMonitorPtr mon, int qemuMonitorMigrateCancel(qemuMonitorPtr mon); int qemuMonitorDumpToFd(qemuMonitorPtr mon, - int fd); + int fd, + const char *dump_format); int qemuMonitorGraphicsRelocate(qemuMonitorPtr mon, int type, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index ec3b958..a16ef44 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2636,7 +2636,8 @@ int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon) int qemuMonitorJSONDump(qemuMonitorPtr mon, - const char *protocol) + const char *protocol, + const char *dump_format) { int ret; virJSONValuePtr cmd = NULL; @@ -2645,6 +2646,7 @@ qemuMonitorJSONDump(qemuMonitorPtr mon, cmd = qemuMonitorJSONMakeCommand("dump-guest-memory", "b:paging", false, "s:protocol", protocol, + "s:format", dump_format, NULL); if (!cmd) return -1; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index a93c51e..7691356 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -148,7 +148,8 @@ int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon); int qemuMonitorJSONDump(qemuMonitorPtr mon, - const char *protocol); + const char *protocol, + const char *dump_format); int qemuMonitorJSONGraphicsRelocate(qemuMonitorPtr mon, int type, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 2152e4a..256655a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1154,7 +1154,7 @@ GEN_TEST_FUNC(qemuMonitorJSONSetMigrationDowntime, 1) GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND | QEMU_MONITOR_MIGRATE_NON_SHARED_DISK | QEMU_MONITOR_MIGRATE_NON_SHARED_INC, "tcp:localhost:12345") -GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol") +GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol", "dummy_dump_format") GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, "localhost", 12345, 12346, NULL) GEN_TEST_FUNC(qemuMonitorJSONAddNetdev, "some_dummy_netdevstr") diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b4ca4c3..652c7ec 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4519,6 +4519,14 @@ static const vshCmdOptDef opts_dump[] = { .type = VSH_OT_BOOL, .help = N_("dump domain's memory only") }, + {.name = "compress", + .type = VSH_OT_BOOL, + .help = N_("dump domain's memory in kdump-compressed format") + }, + {.name = "compression-format", + .type = VSH_OT_DATA, + .help = N_("specify the compression format of kdump-compressed format") + }, {.name = NULL} }; @@ -4533,6 +4541,7 @@ doDump(void *opaque) sigset_t sigmask, oldsigmask; const char *name = NULL; const char *to = NULL; + const char *compression_format = NULL; unsigned int flags = 0; sigemptyset(&sigmask); @@ -4556,6 +4565,26 @@ doDump(void *opaque) flags |= VIR_DUMP_RESET; if (vshCommandOptBool(cmd, "memory-only")) flags |= VIR_DUMP_MEMORY_ONLY; + if (vshCommandOptBool(cmd, "compress")) + flags |= VIR_DUMP_COMPRESS; + + if (vshCommandOptString(cmd, "compression-format", &compression_format)) { + if (STREQ(compression_format, "zlib")) + flags |= VIR_DUMP_COMPRESS_ZLIB; + else if (STREQ(compression_format, "lzo")) + flags |= VIR_DUMP_COMPRESS_LZO; + else if (STREQ(compression_format, "snappy")) + flags |= VIR_DUMP_COMPRESS_SNAPPY; + else { + vshError(ctl, _("compression format %s is not supported, " + "expecting 'zlib', 'lzo' or 'snappy'."), + compression_format); + goto out; + } + } else { + if (flags & VIR_DUMP_COMPRESS) + flags |= VIR_DUMP_COMPRESS_ZLIB; + } if (virDomainCoreDump(dom, to, flags) < 0) { vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); -- 1.8.3.1

1 0

[libvirt] [PATCH RFC 0/2] support compression with dumping guest memory
by Qiao Nuohan 29 Jan '14

29 Jan '14

--memory-only option is introduced without compression supported. Therefore, this is a freature regression of virsh dump. This patchset is used to add compression support in libvirt side and please refer the following address to see the qemu side, the lastest version of qemu side v7(ready for comment now). http://lists.gnu.org/archive/html/qemu-devel/2014-01/msg03669.html qiaonuohan (2): support compression when --memory-only option is specified support configuring the format of dumping memory in qemu.conf include/libvirt/libvirt.h.in | 18 +++++++++---- src/libvirt.c | 15 +++++++++++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 +++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 52 +++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 6 ++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 4 ++- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 29 +++++++++++++++++++++ 14 files changed, 127 insertions(+), 16 deletions(-) -- 1.8.3.1

1 0

Re: [libvirt] [PATCH 1/2] apparmor: Allow access to filesystem mounts
by Felix Geyer 28 Jan '14

28 Jan '14

On 28.01.2014 15:04, Jamie Strandboge wrote: > On 01/26/2014 03:47 PM, Felix Geyer wrote: >> Make virt-aa-helper create rules to allow VMs access to filesystem >> mounts from the host. > > Note that virt-aa-helper access to various parts of the filesystem is generally > ok. However, can you be more specific about the problem you're trying to solve? > Eg, is there a bug number? virt-aa-helper doesn't create the appropriate rules to allow qemu access to shared filesystem mounts: http://libvirt.org/formatdomain.html#elementsFilesystems This made it necessary to manually modify the libivrt-<UUID> profile. There is a report about this on the Ubuntu bugtracker: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/943680 Regards, Felix > >> --- >> src/security/virt-aa-helper.c | 26 ++++++++++++++++++++------ >> 1 file changed, 20 insertions(+), 6 deletions(-) >> >> diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c >> index b9282b4..e1f7848 100644 >> --- a/src/security/virt-aa-helper.c >> +++ b/src/security/virt-aa-helper.c >> @@ -578,9 +578,6 @@ valid_path(const char *path, const bool readonly) >> return -1; >> >> switch (sb.st_mode & S_IFMT) { >> - case S_IFDIR: >> - return 1; >> - break; >> case S_IFSOCK: >> return 1; >> break; >> @@ -747,7 +744,7 @@ get_definition(vahControl * ctl, const char *xmlStr) >> } >> >> static int >> -vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> +vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursive) >> { >> char *tmp = NULL; >> int rc = -1; >> @@ -788,10 +785,14 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> goto cleanup; >> } >> >> - virBufferAsprintf(buf, " \"%s\" %s,\n", tmp, perms); >> + virBufferAsprintf(buf, " \"%s%s\" %s,\n", tmp, recursive ? "/**" : "", perms); >> if (readonly) { >> virBufferAddLit(buf, " # don't audit writes to readonly files\n"); >> - virBufferAsprintf(buf, " deny \"%s\" w,\n", tmp); >> + virBufferAsprintf(buf, " deny \"%s%s\" w,\n", tmp, recursive ? "/**" : ""); >> + } >> + if (recursive) { >> + // allow reading (but not creating) the dir >> + virBufferAsprintf(buf, " \"%s/\" r,\n", tmp); >> } >> >> cleanup: >> @@ -801,6 +802,12 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> } >> >> static int >> +vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> +{ >> + return vah_add_path(buf, path, perms, false); >> +} >> + >> +static int >> vah_add_file_chardev(virBufferPtr buf, >> const char *path, >> const char *perms, >> @@ -1049,6 +1056,13 @@ get_files(vahControl * ctl) >> } /* switch */ >> } >> >> + for (i = 0; i < ctl->def->nfss; i++) { >> + virDomainFSDefPtr fs = ctl->def->fss[i]; >> + >> + if (vah_add_path(&buf, fs->src, fs->readonly ? "r" : "rw", true) != 0) >> + goto cleanup; >> + } >> + >> if (ctl->newfile) >> if (vah_add_file(&buf, ctl->newfile, "rw") != 0) >> goto cleanup; >>

2 1

[libvirt] [PATCH 0/4] Fix virConnectBaselineCPU with expand-features flag
by Jiri Denemark 28 Jan '14

28 Jan '14

Jiri Denemark (4): tests: Better support for VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES cpu: Fix VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES cpu: Try to use source CPU model in virConnectBaselineCPU tests: Add more tests for virConnectBaselineCPU src/cpu/cpu_x86.c | 101 +++++++++++++++++--------- tests/cputest.c | 27 ++++++- tests/cputestdata/x86-baseline-3-expanded.xml | 35 +++++++++ tests/cputestdata/x86-baseline-3-result.xml | 34 +-------- tests/cputestdata/x86-baseline-4-expanded.xml | 46 ++++++++++++ tests/cputestdata/x86-baseline-4-result.xml | 14 ++++ tests/cputestdata/x86-baseline-4.xml | 18 +++++ tests/cputestdata/x86-baseline-5-expanded.xml | 47 ++++++++++++ tests/cputestdata/x86-baseline-5-result.xml | 10 +++ tests/cputestdata/x86-baseline-5.xml | 35 +++++++++ 10 files changed, 296 insertions(+), 71 deletions(-) create mode 100644 tests/cputestdata/x86-baseline-3-expanded.xml create mode 100644 tests/cputestdata/x86-baseline-4-expanded.xml create mode 100644 tests/cputestdata/x86-baseline-4-result.xml create mode 100644 tests/cputestdata/x86-baseline-4.xml create mode 100644 tests/cputestdata/x86-baseline-5-expanded.xml create mode 100644 tests/cputestdata/x86-baseline-5-result.xml create mode 100644 tests/cputestdata/x86-baseline-5.xml -- 1.8.5.3

3 11

[libvirt] [PATCH v2 0/3] Enhance virnetdevbandwidthtest
by Michal Privoznik 28 Jan '14

28 Jan '14

Round two. Michal Privoznik (3): virfile: Introduce virFileAppendStr virCommand: Introduce virCommandSetDryRun virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet src/libvirt_private.syms | 2 + src/util/vircommand.c | 58 ++++++++++++++++++++++++- src/util/vircommand.h | 2 + src/util/virfile.c | 57 ++++++++++++++++++++---- src/util/virfile.h | 3 ++ tests/virnetdevbandwidthtest.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 210 insertions(+), 10 deletions(-) -- 1.8.5.2

3 5

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

28 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> --- configure.ac | 4 +++ libvirt-designer/libvirt-designer-domain.c | 41 ++++++++++++++++++++++++++-- libvirt-designer/libvirt-designer-internal.h | 18 ++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index bad199b..f74e3f1 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,10 @@ AC_PROG_CC AM_PROG_CC_C_O AC_CHECK_FUNCS([strchr]) AC_CHECK_FUNCS([strrchr]) +AC_CHECK_FUNCS([strcmp]) +AC_CHECK_FUNCS([strcasecmp]) +AC_CHECK_FUNCS([strncmp]) +AC_CHECK_FUNCS([strncasecmp]) AC_CHECK_FUNCS([uname]) AC_PROG_CXX AC_TYPE_SIZE_T diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 848dfea..8a11894 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -1606,8 +1606,45 @@ gvir_designer_domain_add_disk_full(GVirDesignerDomain *design, 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); + if (format) { + GVirConfigDomainDiskFormat fmt; + + if (STRCASEEQ(format, "raw")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_RAW; + else if (STRCASEEQ(format, "dir")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_DIR; + else if (STRCASEEQ(format, "bochs")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_BOCHS; + else if (STRCASEEQ(format, "cloop")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_CLOOP; + else if (STRCASEEQ(format, "cow")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_COW; + else if (STRCASEEQ(format, "dmg")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_DMG; + else if (STRCASEEQ(format, "iso")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_ISO; + else if (STRCASEEQ(format, "qcow")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_QCOW; + else if (STRCASEEQ(format, "qcow2")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_QCOW2; + else if (STRCASEEQ(format, "qed")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_QED; + else if (STRCASEEQ(format, "vmdk")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_VMDK; + else if (STRCASEEQ(format, "vpc")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_VPC; + else if (STRCASEEQ(format, "fat")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_FAT; + else if (STRCASEEQ(format, "vhd")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_VHD; + else { + g_set_error(error, GVIR_DESIGNER_DOMAIN_ERROR, 0, + "unknown disk format %s", format); + goto error; + } + + gvir_config_domain_disk_set_driver_format(disk, fmt); + } controller = gvir_designer_domain_get_preferred_disk_controller(design, NULL); if (controller == NULL) diff --git a/libvirt-designer/libvirt-designer-internal.h b/libvirt-designer/libvirt-designer-internal.h index e95edfc..05dcf1d 100644 --- a/libvirt-designer/libvirt-designer-internal.h +++ b/libvirt-designer/libvirt-designer-internal.h @@ -24,4 +24,22 @@ #ifndef __LIBVIRT_DESIGNER_INTERNAL_H__ #define __LIBVIRT_DESIGNER_INTERNAL_H__ +# include <strings.h> + +# define STREQ(a,b) (strcmp(a,b) == 0) +# define STRCASEEQ(a,b) (strcasecmp(a,b) == 0) +# define STRNEQ(a,b) (strcmp(a,b) != 0) +# define STRCASENEQ(a,b) (strcasecmp(a,b) != 0) +# define STREQLEN(a,b,n) (strncmp(a,b,n) == 0) +# define STRCASEEQLEN(a,b,n) (strncasecmp(a,b,n) == 0) +# define STRNEQLEN(a,b,n) (strncmp(a,b,n) != 0) +# define STRCASENEQLEN(a,b,n) (strncasecmp(a,b,n) != 0) +# define STRPREFIX(a,b) (strncmp(a,b,strlen(b)) == 0) +# define STRSKIP(a,b) (STRPREFIX(a,b) ? (a) + strlen(b) : NULL) + +# define STREQ_NULLABLE(a, b) \ + ((a) ? (b) && STREQ((a) ? (a) : "", (b) ? (b) : "") : !(b)) +# define STRNEQ_NULLABLE(a, b) \ + ((a) ? !(b) || STRNEQ((a) ? (a) : "", (b) ? (b) : "") : !!(b)) + #endif /* __LIBVIRT_DESIGNER_INTERNAL_H__ */ -- 1.8.5.2

2 1

[libvirt] [PATCH v2 0/2] BSD: implement nodeGetCPUStats
by Roman Bogorodskiy 28 Jan '14

28 Jan '14

Updated patch which includes virsh update to not output unsupported CPU stat fields. For example, Linux output: user: 1.0% system: 1.0% idle: 98.0% iowait: 0.0% usage: 2.0% Includes iowait, doesn't have intr. FreeBSD output: user: 0,8% system: 0,9% idle: 97,5% intr: 0,8% usage: 2,5% Includes intr, doesn't have iowait. Roman Bogorodskiy (2): BSD: implement nodeGetCPUStats virsh: report only filled values in 'nodecpustats' include/libvirt/libvirt.h.in | 8 +++ src/nodeinfo.c | 104 +++++++++++++++++++++++++++++++++++++++ tools/virsh-host.c | 113 +++++++++++++++++++++++++++---------------- 3 files changed, 184 insertions(+), 41 deletions(-) -- 1.8.4.3

2 5

[libvirt] [PATCH 0/2] Try to get rid of most monitor timeout errors
by Martin Kletzander 28 Jan '14

28 Jan '14

This is basically v3 of the patch Pavel Fux sent [1] with the addition of changing the default as discussed in the same thread [2]. Martin [1] https://www.redhat.com/archives/libvir-list/2014-January/msg00060.html [2] https://www.redhat.com/archives/libvir-list/2014-January/msg00367.html Martin Kletzander (1): qemu: Change the default unix monitor timeout Pavel Fux (1): qemu: Add support for changing timeout value to open unix monitor socket src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf | 12 ++++++++++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_monitor.c | 20 +++++++++++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 37 insertions(+), 3 deletions(-) -- 1.8.5.2

4 17

[libvirt] [RFC PATCHv2 0/2] Implement tiered driver loading
by Adam Walters 28 Jan '14

28 Jan '14

This patchset implements a tiered driver loading system. I split the hypervisor drivers out into their own tier, which is loaded after the other drivers. This has the net effect of ensuring that things like secrets, networks, etc., are initialized and auto-started before any hypervisors, such as QEMU, LXC, etc. This resolves the race condition currently present when starting libvirtd while domains are running, which happens when restarting libvirtd after having started at least one domain. This patch will work without my config driver patchset, which is about to be submitted, as well. Without the config driver patchset, however, RBD storage pools using CephX authentication can not be auto-started due to a circular dependency between the QEMU and storage drivers. This may also affect other storage backends, but I currently only have the capacity to test with RBD and file backed storage pools. The reason this interferes with RBD storage pools is that currently, the storage driver has a hard-coded connection to QEMU in order to look up secrets. After this patchset, the QEMU driver will not be loaded until after the storage driver has completed its initialization and auto-start routines, which causes issues looking up secrets. Any pool type that does not use or need data from outside of the base storage pool definition should continue to auto-start along with no longer being affected by the current race condition. I have verified that file-based storage pools definitely auto-start fine after this patchset, and no longer have any issue with the current race condition. For anyone who is not familiar with the race condition I mention above, the basic description is that upon restarting libvirtd, any running QEMU domains using storage volumes are killed randomly due to their associated storage pool not yet being online. This is due to storage pool auto-start not having completed prior to QEMU initialization. In my prior testing, I found that this race condition affected at least one domain approximately 40% of the time. I sent this information to the mailing list back on 06DEC2013, if anyone is interested in going back and re-reading my description. I would appreciate any comments and suggestions about this patchset. It works for me on 4 machines running three different distros of Linux (Archlinux, Gentoo, and CentOS), so I would imagine that it should work most anywhere. Adam Walters (2): driver: Implement new state driver field libvirt: Implement tiered driver loading src/check-driverimpls.pl | 1 + src/driver.h | 7 +++++ src/interface/interface_backend_netcf.c | 1 + src/libvirt.c | 45 ++++++++++++++++++++------------- src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/network/bridge_driver.c | 1 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 1 + src/secret/secret_driver.c | 1 + src/storage/storage_driver.c | 1 + src/uml/uml_driver.c | 1 + src/xen/xen_driver.c | 1 + 16 files changed, 48 insertions(+), 18 deletions(-) -- 1.8.5.2

2 4

[libvirt] fix/re-do query-command-line-options
by Amos Kong 28 Jan '14

28 Jan '14

Hi QEMU/Libvirt list, When I worked on query-command-line-options, I first used some marcos [1] to generate two config & option tables. This will cover all the options, but it returns a string, it's difficult for libvirt to parse and use it. Finally I got a suggestion to read info from new interface (QemuOpts), We add opts info to vm_config_groups[], query-command-line-options will visit the array. It doesn't conver all the options, but the latest options are covered, so this implementation is acceptable. Problem: * QemuOpts was designed just for options with parameter, some new option without parameters is lost in query output (eg: -enable-fips) * block drive uses three QemuOpts, it's legacy issue. * QemuOpts of some options aren't updated, it might be difficult to updated when we add some new parameters * other We discussed to reimplement this command, but it seems DEF maroc is the only point to cover all the options, all the options are described in qemu-options.hx I'm considering to reuse the DEF marocs to generate a table, try to return the crude info if QemuOpts doesn't cover it. Or maintain a split array (like vm_config_groups[]), it only contains the option without parameter (option name & help info). If you touched some problem of the query-command-line-options, welcome to reply it, I will try to satisfy your requests. Thanks, Amos [1] http://www.redhat.com/archives/libvir-list/2013-January/msg01656.html |#elif defined(QEMU_OPTIONS_GENERATE_CONFIG) | |#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ | opt_help, | |#define DEFHEADING(text) |#define ARCHHEADING(text, arch_mask) | |#elif defined(QEMU_OPTIONS_GENERATE_NAME) | |#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ | option, | |#define DEFHEADING(text) |#define ARCHHEADING(text, arch_mask) char const *optionstr[] = { #define QEMU_OPTIONS_GENERATE_NAME #include "qemu-options-wrapper.h" }; char const *configstr[] = { #define QEMU_OPTIONS_GENERATE_CONFIG #include "qemu-options-wrapper.h" }; -- Amos.

4 10

[libvirt] [PATCHv3 0/4] Add a test for linuxNodeGetCPUStats
by Ján Tomko 28 Jan '14

28 Jan '14

v1: https://www.redhat.com/archives/libvir-list/2014-January/msg00951.html v2: https://www.redhat.com/archives/libvir-list/2014-January/msg00992.html use ticks instead of nsecs in test data v3: use nodeinfopriv.h instead of disgusting extern declarations touch up the impossible error message Ján Tomko (4): Move test-local declarations to nodeinfopriv.h Add test for linuxNodeGetCPUStats Simplify linuxNodeGetCPUStats Reword error message for oversized cpu time fields src/Makefile.am | 2 +- src/libvirt_linux.syms | 1 + src/nodeinfo.c | 87 ++++++---------- src/nodeinfopriv.h | 38 +++++++ tests/nodeinfodata/linux-cpustat-24cpu.out | 150 ++++++++++++++++++++++++++++ tests/nodeinfodata/linux-cpustat-24cpu.stat | 25 +++++ tests/nodeinfotest.c | 130 +++++++++++++++++++++++- 7 files changed, 373 insertions(+), 60 deletions(-) create mode 100644 src/nodeinfopriv.h create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.out create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.stat -- 1.8.3.2

3 13

Re: [libvirt] [PATCH 0/2] support compression with dumping guest memory
by Qiao Nuohan 28 Jan '14

28 Jan '14

Hello, Do you have some comments on this? On 01/21/2014 05:43 PM, qiaonuohan wrote: > --memory-only option is introduced without compression supported. Therefore, > this is a freature regression of virsh dump. This patchset is used to add > compression support in libvirt side and please refer the following address to > see the qemu side, the lastest version of qemu side v7(ready for comment now). > > http://lists.gnu.org/archive/html/qemu-devel/2014-01/msg02139.html > > qiaonuohan (2): > support compression when --memory-only option is specified > support configuring the format of dumping memory in qemu.conf > > include/libvirt/libvirt.h.in | 18 +++++++++---- > src/libvirt.c | 15 +++++++++++ > src/qemu/libvirtd_qemu.aug | 1 + > src/qemu/qemu.conf | 6 +++++ > src/qemu/qemu_conf.c | 2 ++ > src/qemu/qemu_conf.h | 1 + > src/qemu/qemu_driver.c | 52 +++++++++++++++++++++++++++++++++++--- > src/qemu/qemu_monitor.c | 6 ++--- > src/qemu/qemu_monitor.h | 3 ++- > src/qemu/qemu_monitor_json.c | 4 ++- > src/qemu/qemu_monitor_json.h | 3 ++- > src/qemu/test_libvirtd_qemu.aug.in | 1 + > tests/qemumonitorjsontest.c | 2 +- > tools/virsh-domain.c | 29 +++++++++++++++++++++ > 14 files changed, 127 insertions(+), 16 deletions(-) > -- Regards Qiao Nuohan

3 2

[libvirt] [PATCH glib v2] Fix event loop implementation on win32
by Daniel P. Berrange 28 Jan '14

28 Jan '14

Libvirt uses gnulib for making winsock look like POSIX sockets. This means that in the libvirt event handle callbacks the application will be given a file descriptor rather than a winsock HANDLE object. The g_io_channel_unix_new method will detect that it is an FD and delegate to the g_io_channel_win32_new_fd method. Unfortunately the glib Win32 event loop impl is not very good at dealing with FD objects, simulating poll() by doing a read() on the FD :-( The API docs for g_io_channel_win32_new_fd say "All reads from the file descriptor should be done by this internal GLib thread. Your code should call only g_io_channel_read()." This isn't going to fly for libvirt, since it has zero knowledge of glib at all, so is just doing normal read(). Fortunately we can work around this problem by turning the FD we get from libvirt back into a HANDLE using the _get_osfhandle() method. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-glib/libvirt-glib-event.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 87019b5..1e1ffec 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,6 +31,10 @@ #include "libvirt-glib/libvirt-glib.h" +#ifdef G_OS_WIN32 +#include <io.h> +#endif + /** * SECTION:libvirt-glib-event * @short_description: Integrate libvirt with the GMain event framework @@ -164,7 +168,11 @@ gvir_event_handle_add(int fd, data->events = events; data->cb = cb; data->opaque = opaque; +#ifdef G_OS_WIN32 + data->channel = g_io_channel_win32_new_socket(_get_osfhandle(fd)); +#else data->channel = g_io_channel_unix_new(fd); +#endif data->ff = ff; g_debug("Add handle %p %d %d %d %p\n", data, data->watch, data->fd, events, data->opaque); -- 1.8.4.2

2 1

[libvirt] [Question] About ivshmemory device and slot number confliction.
by Wangyufei (James) 28 Jan '14

28 Jan '14

Hello, I want to use ivshmemory device which is supported by qemu, but libvirt does not support it. So I use qemu:commandline to make ivshmemory device in qemu command pass-through. But then hot-plug a virtio-net device failed. The reason is that a qemu:commandline pci device's slot number is assigned by qemu not libvirt. And hot-plug device's slot is assigned by libvirt. So it failed beacause of slot confliction. I have two questions to ask: 1. Why libvirt does not support ivshmemory device? If libvirt intends to support it, when? 2. Can libvirt handle with qemu:commandline pci device's slot number? Just like pci:commandline to assign a slot number. what's your opinion? Best Regards, -WangYufei

3 2

[libvirt] [PATCH 0/5] Fix deadlock in nwfilter code
by Daniel P. Berrange 28 Jan '14

28 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. Daniel P. Berrange (5): Add a read/write lock implementation Remove windows thread implementation in favour of pthreads Push nwfilter update locking up to top level Add a mutex to serialize updates to firewall Turn nwfilter conf update mutex into a read/write lock configure.ac | 15 +- 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 | 12 +- src/nwfilter/nwfilter_gentech_driver.c | 21 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/qemu/qemu_driver.c | 6 + src/uml/uml_driver.c | 4 + src/util/virthread.c | 291 +++++++++++++++++++++++- 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 ----- 17 files changed, 395 insertions(+), 827 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

4 20

[libvirt] how nwfilter parse variable in xml file
by yue 28 Jan '14

28 Jan '14

hi,all we can define variable in nwfilter xml file, and assign value in domain xml . i add a new attribute , if the value is constant, it works . if it is variable, it will product wrong iptables rules. i want to know how libvirt process variable? where is the difference between processing constant and variable? when it is variable, if validator function is needed? thanks

1 0

[libvirt] [PATCH 0/3] Enhance virnetdevbandwidthtest
by Michal Privoznik 27 Jan '14

27 Jan '14

As discussed with Eric, we may need slightly different approach. Michal Privoznik (3): virfile: Introduce virFileAppendStr virCommand: Introduce virCommandSetDryRun virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet src/libvirt_private.syms | 2 + src/util/vircommand.c | 59 ++++++++++++++++++++++++- src/util/vircommand.h | 2 + src/util/virfile.c | 48 +++++++++++++++++---- src/util/virfile.h | 2 + tests/virnetdevbandwidthtest.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 10 deletions(-) -- 1.8.5.2

2 6

[libvirt] [PATCH RESEND V2 1/1] Add hw random number generator (/dev/hwrng) to cgroup ACL
by Pradipta Kr. Banerjee 27 Jan '14

27 Jan '14

From: "Pradipta Kr. Banerjee" <bpradip(a)in.ibm.com> Creating a qemu VM with /dev/hwrng as backend RNG device throws the following error - "Could not open '/dev/hwrng': Permission denied" This patch fixes the issue Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- v2: Added acl code as part of per-VM cgroup setup src/qemu/qemu_cgroup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f0cacd0..8e2076e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -533,6 +533,18 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, goto cleanup; } + if (vm->def->rng && + (vm->def->rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM)) { + VIR_DEBUG("Setting Cgroup ACL for RNG device"); + rv = virCgroupAllowDevicePath(priv->cgroup, vm->def->rng->source.file, + VIR_CGROUP_DEVICE_RW); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", + vm->def->rng->source.file, "rw", rv == 0); + if (rv < 0 && + !virLastErrorIsSystemErrno(ENOENT)) + goto cleanup; + } + ret = 0; cleanup: virObjectUnref(cfg); -- 1.8.3.1

3 2

[libvirt] [PATCH v3] qemu: Use virtio network device for aarch64/virt
by Oleg Strikov 27 Jan '14

27 Jan '14

This patch changes network device type used by default from rtl8139 to virtio when architecture type is aarch64 and machine type is virt. Qemu doesn't support any other machine types for aarch64 right now and we can't make any other aarch64-specific tuning in this function yet. Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- src/qemu/qemu_domain.c | 3 ++- .../qemuxml2argv-aarch64-virt-default-nic.args | 6 ++++++ .../qemuxml2argv-aarch64-virt-default-nic.xml | 22 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c947e2e..a0e9a33 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -795,11 +795,12 @@ qemuDomainDefaultNetModel(const virDomainDef *def) { if (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X) return "virtio"; - if (def->os.arch == VIR_ARCH_ARMV7L) { + if (def->os.arch == VIR_ARCH_ARMV7L || + def->os.arch == VIR_ARCH_AARCH64) { if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; if (STREQ(def->os.machine, "virt")) return "virtio"; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args new file mode 100644 index 0000000..d4d403b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append console=ttyAMA0 \ +-usb -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml new file mode 100644 index 0000000..868de94 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml @@ -0,0 +1,22 @@ +<domain type="qemu"> + <name>aarch64-virt-default-nic</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <features> + <acpi/> + </features> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <cmdline>console=ttyAMA0</cmdline> + </os> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a25264e..1a18ee2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1316,10 +1316,13 @@ mymain(void) DO_TEST("aarch64-virt-virtio", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("aarch64-virt-default-nic", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT, QEMU_CAPS_KVM_PIT_TICK_POLICY); -- 1.7.9.5

1 0

[libvirt] [PATCH] BSD: implement virProcess{Get,Set}Affinity
by Roman Bogorodskiy 27 Jan '14

27 Jan '14

I guess commit message provides enough information, but I want to share some testing info. So, with qemu driver I get: virsh # vcpuinfo qemu VCPU: 0 CPU: 0 State: running CPU Affinity: yyyy virsh # Check the corresponding process using cpuset(1) tool from base system: > sudo cpuset -g -p 1308 pid 1308 mask: 0, 1, 2, 3 > virsh # vcpupin qemu --vcpu 0 --live 2,3 virsh # vcpuinfo qemu VCPU: 0 CPU: 0 State: running CPU Affinity: --yy virsh # Now cpuset(1) says: > sudo cpuset -g -p 1308 pid 1308 mask: 2, 3 > Now, do: > sudo cpuset -l 0-3 -p 1308 And check back again: virsh # vcpuinfo qemu VCPU: 0 CPU: 0 State: running CPU Affinity: yyyy virsh # Roman Bogorodskiy (1): BSD: implement virProcess{Get,Set}Affinity src/util/virprocess.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) -- 1.8.4.3

2 2

[libvirt] [PATCH v2] qemu: Use virtio network device for aarch64/virt
by Oleg Strikov 27 Jan '14

27 Jan '14

This patch changes network device type used by default from rtl8139 to virtio when architecture type is aarch64 and machine type is virt. Qemu doesn't support any other machine types for aarch64 right now and we can't make any other aarch64-specific tuning in this function yet. Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- src/qemu/qemu_domain.c | 3 ++- .../qemuxml2argv-aarch64-virt-default-nic.args | 6 ++++++ .../qemuxml2argv-aarch64-virt-default-nic.xml | 22 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c947e2e..a0e9a33 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -795,11 +795,12 @@ qemuDomainDefaultNetModel(const virDomainDef *def) { if (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X) return "virtio"; - if (def->os.arch == VIR_ARCH_ARMV7L) { + if (def->os.arch == VIR_ARCH_ARMV7L || + def->os.arch == VIR_ARCH_AARCH64) { if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; if (STREQ(def->os.machine, "virt")) return "virtio"; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args new file mode 100644 index 0000000..d4d403b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append console=ttyAMA0 \ +-usb -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml new file mode 100644 index 0000000..868de94 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml @@ -0,0 +1,22 @@ +<domain type="qemu"> + <name>aarch64-virt-default-nic</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <features> + <acpi/> + </features> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <cmdline>console=ttyAMA0</cmdline> + </os> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a25264e..1a18ee2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1316,10 +1316,13 @@ mymain(void) DO_TEST("aarch64-virt-virtio", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("aarch64-virt-default-nic", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT, QEMU_CAPS_KVM_PIT_TICK_POLICY); -- 1.7.9.5

1 0

Re: [libvirt] [PATCH] Sheepdog: Auto Adding volume and correct refresh volume problem. Resent file
by joel SIMOES 27 Jan '14

27 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> --- 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 glib] Fix event loop implementation on win32
by Daniel P. Berrange 27 Jan '14

27 Jan '14

Libvirt uses gnulib for making winsock look like POSIX sockets. This means that in the libvirt event handle callbacks the application will be given a file descriptor rather than a winsock HANDLE object. The g_io_channel_unix_new method will detect that it is an FD and delegate to the g_io_channel_win32_new_fd method. Unfortunately the glib Win32 event loop impl is not very good at dealing with FD objects, simulating poll() by doing a read() on the FD :-( The API docs for g_io_channel_win32_new_fd say "All reads from the file descriptor should be done by this internal GLib thread. Your code should call only g_io_channel_read()." This isn't going to fly for libvirt, since it has zero knowledge of glib at all, so is just doing normal read(). Fortunately we can work around this problem by turning the FD we get from libvirt back into a HANDLE using the _get_osfhandle() method. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-glib/libvirt-glib-event.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 87019b5..826db2d 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,6 +31,10 @@ #include "libvirt-glib/libvirt-glib.h" +#ifdef G_OS_WIN32 +#include <io.h> +#endif + /** * SECTION:libvirt-glib-event * @short_description: Integrate libvirt with the GMain event framework @@ -164,7 +168,7 @@ gvir_event_handle_add(int fd, data->events = events; data->cb = cb; data->opaque = opaque; - data->channel = g_io_channel_unix_new(fd); + data->channel = g_io_channel_unix_new(_get_osfhandle(fd)); data->ff = ff; g_debug("Add handle %p %d %d %d %p\n", data, data->watch, data->fd, events, data->opaque); -- 1.8.4.2

2 2

[libvirt] [PATCH v2] Add helper program to create custom leases
by Nehal J Wani 27 Jan '14

27 Jan '14

Introduce helper program to catch events from dnsmasq and maintain a custom lease file per network. It supports DHCPv4 and DHCPv6. The file is saved as "<interface-name>.status". The format of each lease is: <expiry-time (epoch time)> <mac> <iaid> <ip-address> <hostname> <clientid> Example of custom leases file content: 1385245780 52:54:00:2f:ba:76 * 192.168.150.153 * * 1385245781 52:54:00:2f:ba:76 3127926 2001:db8:ca2:2:1::6c * 00:04:76:00:cf:ae:b3:0b:fc:cd:0e:22:2e:97:76:65:74:ec 1385245964 52:54:00:44:7c:d7 * 192.168.150.219 iiit-ad885e4aa1 01:52:54:00:44:7c:d7 1385245964 52:54:00:44:7c:d7 * 192.168.150.219 * 01:52:54:00:44:7c:d7 1385246016 52:54:00:5d:99:92 * 192.168.150.212 iiit-ad885e4aa1 01:52:54:00:5d:99:92 1385246041 52:54:00:3b:16:e0 * 192.168.150.207 * * 1385246081 52:54:00:db:dd:98 * 192.168.150.234 * * 1385246088 52:54:00:db:dd:98 14409112 2001:db8:ca2:2:1::6d * 00:04:76:00:cf:ae:b3:0b:fc:cd:0e:22:2e:97:76:65:74:ec --- As danpb suggested, I have split the previous patch into helper program & API Refer: https://www.redhat.com/archives/libvir-list/2013-December/msg00694.html Once this get ACKed, I'll send in the patches for the Leases API v6 src/Makefile.am | 20 ++++ src/network/bridge_driver.c | 4 + src/util/leaseshelper.c | 225 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 249 insertions(+) create mode 100644 src/util/leaseshelper.c diff --git a/src/Makefile.am b/src/Makefile.am index 57e163f..6e5b03c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -838,6 +838,9 @@ STORAGE_HELPER_DISK_SOURCES = \ UTIL_IO_HELPER_SOURCES = \ util/iohelper.c +UTIL_LEASES_HELPER_SOURCES = \ + util/leaseshelper.c + # Network filters NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ @@ -2408,6 +2411,23 @@ libvirt_iohelper_CFLAGS = \ $(NULL) endif WITH_LIBVIRTD +if WITH_LIBVIRTD +libexec_PROGRAMS += libvirt_leaseshelper +libvirt_leaseshelper_SOURCES = $(UTIL_LEASES_HELPER_SOURCES) +libvirt_leaseshelper_LDFLAGS = \ + $(NULL) +libvirt_leaseshelper_LDADD = \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la +if WITH_DTRACE_PROBES +libvirt_leaseshelper_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_leaseshelper_CFLAGS = \ + $(PIE_CFLAGS) \ + $(NULL) +endif WITH_LIBVIRTD + if WITH_STORAGE_DISK if WITH_LIBVIRTD libexec_PROGRAMS += libvirt_parthelper diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 95e4b65..2278dba 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1063,6 +1063,10 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); + + /* This helper is used to create cutom leases file for libvirt */ + virCommandAddArgFormat(cmd, "--dhcp-script=%s", LIBEXECDIR "/libvirt_leaseshelper"); + *cmdout = cmd; ret = 0; cleanup: diff --git a/src/util/leaseshelper.c b/src/util/leaseshelper.c new file mode 100644 index 0000000..486ebe3 --- /dev/null +++ b/src/util/leaseshelper.c @@ -0,0 +1,225 @@ +/* + * leasehelper.c: Helper program to create custom leases file + * + * 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/>. + * + * Author: Nehal J Wani <nehaljw.kkd1(a)gmail.com> + * + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> + +#include "virutil.h" +#include "virthread.h" +#include "virfile.h" +#include "virbuffer.h" +#include "virstring.h" +#include "virerror.h" +#include "viralloc.h" +#include "configmake.h" + +#define VIR_FROM_THIS VIR_FROM_NETWORK + +/** + * VIR_NETWORK_DHCP_LEASE_FIELDS: + * + * Macro providing the maximum number of fields in an entry in + * the leases file + */ +#define VIR_NETWORK_DHCP_LEASE_FIELDS 6 +/** + * VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX: + * + * Macro providing the upper limit on the size of leases file + */ +#define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX 2097152 + +/* + * Use this when passing possibly-NULL strings to printf-a-likes. + */ +# define EMPTY_STR(s) ((s) ? (s) : "*") + +int +main(int argc, char **argv) { + + /* Doesn't hurt to check */ + if (argc < 4) { + /* Refer man page of dnsmasq --dhcp-script for more details */ + fprintf(stderr, "Usage: $program $action ${mac|clientid} $ip\n"); + return -1; + } + + const char *program_name = argv[0]; + const char *action = argv[1]; + const char *interface = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_INTERFACE")); + const char *expirytime = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES")); + const char *mac = argv[2]; + const char *ip = argv[3]; + const char *iaid = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_IAID")); + const char *hostname = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME")); + const char *clientid = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_CLIENT_ID")); + const char *leases_str = NULL; + char *lease_file = NULL; + char *lease_entries = NULL; + char *lease_entry = NULL; + char **lease_fields = NULL; + bool delete = false; + bool add = false; + int rv = -1; + int lease_file_len = 0; + FILE *fp = NULL; + long long expirytime_tmp = 0; + virBuffer buf_new_lease = VIR_BUFFER_INITIALIZER; + virBuffer buf_all_leases = VIR_BUFFER_INITIALIZER; + + if (setlocale(LC_ALL, "") == NULL || + bindtextdomain(PACKAGE, LOCALEDIR) == NULL || + textdomain(PACKAGE) == NULL) { + fprintf(stderr, _("%s: initialization failed\n"), program_name); + exit(EXIT_FAILURE); + } + + if (virThreadInitialize() < 0 || + virErrorInitialize() < 0) { + fprintf(stderr, _("%s: initialization failed\n"), program_name); + exit(EXIT_FAILURE); + } + + if (virAsprintf(&lease_file, "%s/%s.status", LOCALSTATEDIR + "/lib/libvirt/dnsmasq/", interface) < 0) + goto cleanup; + + if (virGetEnvAllowSUID("DNSMASQ_IAID")) { + mac = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_MAC")); + clientid = argv[2]; + } + + /* Make sure dnsmasq knows the interface, otherwise something is wrong */ + if (STREQ(interface, "*")) + goto cleanup; + + /* Make sure the file exists. If not, 'touch' it */ + if (virFileTouch(lease_file, 0644) < 0) + goto cleanup; + + /* Read entire contents */ + if ((lease_file_len = virFileReadAll(lease_file, + VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, + &lease_entries)) < 0) { + goto cleanup; + } + + if (STREQ(action, "add") || STREQ(action, "old") || STREQ(action, "del")) { + if (mac || STREQ(action, "del")) { + /* Delete the corresponding lease */ + delete = true; + if (STREQ(action, "add") || STREQ(action, "old")) { + fprintf(stderr, "add|old\n"); + add = true; + /* Enter new lease */ + virBufferAsprintf(&buf_new_lease, "%s %s %s %s %s %s\n", + expirytime, mac, iaid, ip, hostname, clientid); + + if (virBufferError(&buf_new_lease)) { + virBufferFreeAndReset(&buf_new_lease); + virReportOOMError(); + goto cleanup; + } + } + } + } + + lease_entry = lease_entries[0] == '\0' ? NULL : lease_entries; + + while (lease_entry) { + int nfields = 0; + + char *eol = strchr(lease_entry, '\n'); + *eol = '\0'; + + /* Split the lease line */ + if (!(lease_fields = virStringSplit(lease_entry, " ", + VIR_NETWORK_DHCP_LEASE_FIELDS))) + goto cleanup; + + nfields = virStringListLength(lease_fields); + + /* Forward lease_entry to the next lease */ + lease_entry = strchr(lease_entry, '\0'); + if (lease_entry - lease_entries + 1 < lease_file_len) + lease_entry++; + else + lease_entry = NULL; + + if (nfields != VIR_NETWORK_DHCP_LEASE_FIELDS) + goto cleanup; + + if (virStrToLong_ll(lease_fields[0], NULL, 10, &expirytime_tmp) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to convert lease expiry time to integer: %s"), + lease_fields[0]); + goto cleanup; + } + + /* Check whether lease has expired or not */ + if (expirytime_tmp < (long long) time(NULL)) + continue; + else if (delete && STREQ(lease_fields[3], ip)) + continue; + else { + virBufferAsprintf(&buf_all_leases, "%s %s %s %s %s %s\n", + lease_fields[0], lease_fields[1], lease_fields[2], + lease_fields[3], lease_fields[4], lease_fields[5]); + + if (virBufferError(&buf_all_leases)) { + virBufferFreeAndReset(&buf_all_leases); + virReportOOMError(); + goto cleanup; + } + } + } + + if (add) { + virBufferAsprintf(&buf_all_leases, "%s", virBufferContentAndReset(&buf_new_lease)); + + if (virBufferError(&buf_all_leases)) { + virBufferFreeAndReset(&buf_all_leases); + virReportOOMError(); + goto cleanup; + } + } + + rv = 0; + + /* Write to file */ + leases_str = virBufferContentAndReset(&buf_all_leases); + if (!leases_str) + leases_str = ""; + + if (virFileWriteStr(lease_file, leases_str, 0) < 0) + rv = -1; + +cleanup: + VIR_FREE(lease_file); + VIR_FREE(lease_entries); + if (lease_fields) + virStringFreeList(lease_fields); + return rv; +} -- 1.8.1.4

2 3

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

27 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> --- src/storage/storage_backend_sheepdog.c | 91 ++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index a6981ce..fbed11a 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,71 @@ 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; + + 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); + + + + +cleanup: + virCommandFree(cmd); + VIR_FREE(lines); + VIR_FREE(cells); + return ret; +} static int virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -122,15 +188,16 @@ 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); + virStorageBackendSheepdogRefreshAllVol(conn, pool); +cleanup: virCommandFree(cmd); - VIR_FREE(output); return ret; } - static int virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -143,12 +210,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 +243,6 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } - static int virStorageBackendSheepdogBuildVol(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -195,12 +263,12 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, goto cleanup; ret = 0; + cleanup: virCommandFree(cmd); return ret; } - int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output) @@ -257,7 +325,8 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, return -1; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -295,7 +364,6 @@ cleanup: return ret; } - static int virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -310,7 +378,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

3 2

[libvirt] [PATCH] docs: add a permalink to html headers
by Dan Kenigsberg 27 Jan '14

27 Jan '14

Quite often, I need to cite URLs like http://libvirt.org/formatnetwork.html#elementQoS but it is annoying to copy them from the table of contents or the html source. This patch borrows from the Python documentation in order to make it easier to cite headers on libvirt's oneline documentation. --- docs/libvirt.css | 13 +++++++++++++ docs/page.xsl | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/docs/libvirt.css b/docs/libvirt.css index b324ac8..1d27873 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -498,3 +498,16 @@ div.description pre.code { padding: 5px 10px 5px 10px; margin-left: 2.5em; } + +a.headerlink { + text-decoration: none!important; + visibility: hidden; +} + +h2:hover > a.headerlink, +h3:hover > a.headerlink, +h4:hover > a.headerlink, +h5:hover > a.headerlink, +h6:hover > a.headerlink { + visibility: visible; +} diff --git a/docs/page.xsl b/docs/page.xsl index a2da854..107f6e2 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -185,4 +185,11 @@ <xsl:apply-templates select="exsl:node-set($inchtml)/html:html/html:body/*" mode="content"/> </xsl:template> + + <xsl:template match="html:h2 | html:h3 | html:h4 | html:h5 | html:h6" mode="content"> + <xsl:copy> + <xsl:copy-of select="./*"/> + <a class="headerlink" href="#{html:a/@name}" title="Permalink to this headline">¶</a> + </xsl:copy> + </xsl:template> </xsl:stylesheet> -- 1.8.3.1

4 6

[libvirt] Bug 1058149 �C libvirt crashed when executing qemu-agent-command during shutting down virutal machine
by hzguanqiang＠corp.netease.com 27 Jan '14

27 Jan '14

Hi experts, When I executing qemu-agent-command during shutting down the guest machine, libvirtd caught a segmentation violation and exited abnormally. Details can be seen from the url: https://bugzilla.redhat.com/show_bug.cgi?id=1058149 Is there anyone who would like to see it. Thanks~ ------------------ Best regards! GuanQiang 2014-01-27

1 0

[libvirt] Libvirt and QBG with VEB
by Padmanabhan Krishnan 27 Jan '14

27 Jan '14

Hello, I have a setup of virtual machines and wherein my virtual switch (OVS) takes care of switching locally and it uses the network for talking to VM's outside the server (like a VEB scenario I guess). I want Netlink messages to be sent to LLDPAD. I understand that i had to modify the XML files and start the VM. But, i see from the XML that it supports only VEPA, not VEB. But, irrespective of VEB or VEPA, those VM information should be known to the upstream switch through VDP. 802.1QBG seem to support this (both VEPA and VEB) http://www.ieee802.org/1/files/private/bg-drafts/d2/802-1qbg-d2-2.pdf But, for VEB, no net link messages are sent by libvirt. Why is that? From the XML example, I see that: <interface type=’direct’> <mac address=’d0:0f:d0:0f:02:01’/> <source dev=’eth2.20’ mode=’vepa’/> <source network=’default’/> <virtualport type=’802.1Qbg’> <parameters managerid=’12’ typeid=’0x123456’ typeidversion=’1’ instanceid=’09b00c53-8b5c-4eeb-8f00-d847aa05191b’ /> </virtualport> I tried different combinations by changing the interface type to bridge and and trying Qbg as in below, I find that it doesn't send a Netlink message to LLDPAD. There's no "mode=veb". </controller> <interface type='bridge'> <mac address='00:54:00:4e:46:04'/> <source bridge='xml_br'/> <virtualport type='802.1Qbg'> <parameters managerid='12' typeid='1193046' typeidversion='1' instanceid='09b00c53-8b5c-4eeb-8f00-d847aa05191b'/> </virtualport> <target dev='tap_xml'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> How do i get this to work? Is this a limitation? Thanks,KP

1 0

[libvirt] [PATCH] Fix segmentation fault when accessing default qemu machine type
by Yudai Yamagishi 26 Jan '14

26 Jan '14

From: Yudai Yamagish <yummy(a)sfc.wide.ad.jp> This patch fixes a segmentation fault when creating new virtual machines using QEMU. The segmentation fault is caused by commit f41830680e40d3ec845cefd25419bd87414b9ccf and commit cbb6ec42e2447d7920b30d66923b2a2b2670133b. In virQEMUCapsProbeQMPMachineTypes, when copying machines to qemuCaps, "none" is skipped. Therefore, the value of i and "qemuCaps->nmachineTypes - 1" do not always match. However, defIdx value (used to call virQEMUCapsSetDefaultMachine) is set using the value in i when the array elements are in qemuCaps->nmachineTypes - 1. So, when libvirt tries to create virtual machines using the default machine type, qemuCaps->machineTypes[defIdx] is accessed and since the defIdx is NULL, it results in segmentation fault. Signed-off-by: Yudai Yamagishi <yummy(a)sfc.wide.ad.jp> --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5e9c65e..5def55c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2150,7 +2150,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, machines[i]->name) < 0) goto cleanup; if (machines[i]->isDefault) - defIdx = i; + defIdx = qemuCaps->nmachineTypes - 1; qemuCaps->machineMaxCpus[qemuCaps->nmachineTypes - 1] = machines[i]->maxCpus; } -- 1.7.2.5

2 5

[libvirt] [PATCH] qemu: Enable 'host-passthrough' cpu mode for aarch64
by Oleg Strikov 25 Jan '14

25 Jan '14

This patch allows libvirt user to specify 'host-passthrough' cpu mode while using qemu/kvm backend on aarch64. It uses 'host' as a CPU model name instead of some other stub (correct CPU detection is not implemented yet) to allow libvirt user to specify 'host-model' cpu mode as well. Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- src/cpu/cpu_aarch64.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu_aarch64.c b/src/cpu/cpu_aarch64.c index 3959deb..4afe9db 100644 --- a/src/cpu/cpu_aarch64.c +++ b/src/cpu/cpu_aarch64.c @@ -25,6 +25,7 @@ #include "viralloc.h" #include "cpu.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_CPU @@ -44,16 +45,19 @@ AArch64NodeData(virArch arch) } static int -AArch64Decode(virCPUDefPtr cpu ATTRIBUTE_UNUSED, +AArch64Decode(virCPUDefPtr cpu, const virCPUData *data ATTRIBUTE_UNUSED, const char **models ATTRIBUTE_UNUSED, unsigned int nmodels ATTRIBUTE_UNUSED, const char *preferred ATTRIBUTE_UNUSED, unsigned int flags) { - virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, -1); + if (cpu->model == NULL && + VIR_STRDUP(cpu->model, "host") < 0) + return -1; + return 0; } @@ -63,6 +67,24 @@ AArch64DataFree(virCPUDataPtr data) VIR_FREE(data); } +static int +AArch64Update(virCPUDefPtr guest, + const virCPUDef *host) +{ + guest->match = VIR_CPU_MATCH_EXACT; + virCPUDefFreeModel(guest); + return virCPUDefCopyModel(guest, host, true); +} + +static virCPUCompareResult +AArch64GuestData(virCPUDefPtr host ATTRIBUTE_UNUSED, + virCPUDefPtr guest ATTRIBUTE_UNUSED, + virCPUDataPtr *data ATTRIBUTE_UNUSED, + char **message ATTRIBUTE_UNUSED) +{ + return VIR_CPU_COMPARE_IDENTICAL; +} + struct cpuArchDriver cpuDriverAARCH64 = { .name = "aarch64", .arch = archs, @@ -72,8 +94,8 @@ struct cpuArchDriver cpuDriverAARCH64 = { .encode = NULL, .free = AArch64DataFree, .nodeData = AArch64NodeData, - .guestData = NULL, + .guestData = AArch64GuestData, .baseline = NULL, - .update = NULL, + .update = AArch64Update, .hasFeature = NULL, }; -- 1.7.9.5

3 2

[libvirt] [PATCH] tests: Fix PCI test data filenames for Windows
by Matthias Bolte 25 Jan '14

25 Jan '14

Windows doesn't allow : in filenames. Commit 21685c955e546676a5b2a01f7b788d222e0ee0f5 added files with a : in their names. This broke git operations on Windows as git is not able to create those files on clone or pull. Replace : with - in the offending filenames and adapt the test case. --- tests/virpcimock.c | 19 ++++++++++++++++++- .../{0000:00:01.0.config => 0000-00-01.0.config} | Bin .../{0000:00:02.0.config => 0000-00-02.0.config} | Bin .../{0000:00:03.0.config => 0000-00-03.0.config} | Bin .../{0001:00:00.0.config => 0001-00-00.0.config} | Bin .../{0001:01:00.0.config => 0001-01-00.0.config} | Bin .../{0001:01:00.1.config => 0001-01-00.1.config} | Bin .../{0005:80:00.0.config => 0005-80-00.0.config} | Bin .../{0005:90:01.0.config => 0005-90-01.0.config} | Bin .../{0005:90:01.1.config => 0005-90-01.1.config} | Bin .../{0005:90:01.2.config => 0005-90-01.2.config} | Bin 11 files changed, 18 insertions(+), 1 deletion(-) rename tests/virpcitestdata/{0000:00:01.0.config => 0000-00-01.0.config} (100%) rename tests/virpcitestdata/{0000:00:02.0.config => 0000-00-02.0.config} (100%) rename tests/virpcitestdata/{0000:00:03.0.config => 0000-00-03.0.config} (100%) rename tests/virpcitestdata/{0001:00:00.0.config => 0001-00-00.0.config} (100%) rename tests/virpcitestdata/{0001:01:00.0.config => 0001-01-00.0.config} (100%) rename tests/virpcitestdata/{0001:01:00.1.config => 0001-01-00.1.config} (100%) rename tests/virpcitestdata/{0005:80:00.0.config => 0005-80-00.0.config} (100%) rename tests/virpcitestdata/{0005:90:01.0.config => 0005-90-01.0.config} (100%) rename tests/virpcitestdata/{0005:90:01.1.config => 0005-90-01.1.config} (100%) rename tests/virpcitestdata/{0005:90:01.2.config => 0005-90-01.2.config} (100%) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 1efcd33..b42e8bf 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -320,16 +320,33 @@ pci_device_new_from_stub(const struct pciDevice *data) { struct pciDevice *dev; char *devpath; + char *id; + char *c; char *configSrc; char tmp[32]; struct stat sb; + if (VIR_STRDUP_QUIET(id, data->id) < 0) + ABORT_OOM(); + + /* Replace ':' with '-' to create the config filename from the + * device ID. The device ID cannot be used directly as filename + * because it contains ':' and Windows does not allow ':' in + * filenames. */ + c = strchr(id, ':'); + + while (c) { + *c = '-'; + c = strchr(c, ':'); + } + if (VIR_ALLOC_QUIET(dev) < 0 || virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", - abs_srcdir, data->id) < 0 || + abs_srcdir, id) < 0 || virAsprintfQuiet(&devpath, "%s/devices/%s", fakesysfsdir, data->id) < 0) ABORT_OOM(); + VIR_FREE(id); memcpy(dev, data, sizeof(*dev)); if (virFileMakePath(devpath) < 0) diff --git a/tests/virpcitestdata/0000:00:01.0.config b/tests/virpcitestdata/0000-00-01.0.config similarity index 100% rename from tests/virpcitestdata/0000:00:01.0.config rename to tests/virpcitestdata/0000-00-01.0.config diff --git a/tests/virpcitestdata/0000:00:02.0.config b/tests/virpcitestdata/0000-00-02.0.config similarity index 100% rename from tests/virpcitestdata/0000:00:02.0.config rename to tests/virpcitestdata/0000-00-02.0.config diff --git a/tests/virpcitestdata/0000:00:03.0.config b/tests/virpcitestdata/0000-00-03.0.config similarity index 100% rename from tests/virpcitestdata/0000:00:03.0.config rename to tests/virpcitestdata/0000-00-03.0.config diff --git a/tests/virpcitestdata/0001:00:00.0.config b/tests/virpcitestdata/0001-00-00.0.config similarity index 100% rename from tests/virpcitestdata/0001:00:00.0.config rename to tests/virpcitestdata/0001-00-00.0.config diff --git a/tests/virpcitestdata/0001:01:00.0.config b/tests/virpcitestdata/0001-01-00.0.config similarity index 100% rename from tests/virpcitestdata/0001:01:00.0.config rename to tests/virpcitestdata/0001-01-00.0.config diff --git a/tests/virpcitestdata/0001:01:00.1.config b/tests/virpcitestdata/0001-01-00.1.config similarity index 100% rename from tests/virpcitestdata/0001:01:00.1.config rename to tests/virpcitestdata/0001-01-00.1.config diff --git a/tests/virpcitestdata/0005:80:00.0.config b/tests/virpcitestdata/0005-80-00.0.config similarity index 100% rename from tests/virpcitestdata/0005:80:00.0.config rename to tests/virpcitestdata/0005-80-00.0.config diff --git a/tests/virpcitestdata/0005:90:01.0.config b/tests/virpcitestdata/0005-90-01.0.config similarity index 100% rename from tests/virpcitestdata/0005:90:01.0.config rename to tests/virpcitestdata/0005-90-01.0.config diff --git a/tests/virpcitestdata/0005:90:01.1.config b/tests/virpcitestdata/0005-90-01.1.config similarity index 100% rename from tests/virpcitestdata/0005:90:01.1.config rename to tests/virpcitestdata/0005-90-01.1.config diff --git a/tests/virpcitestdata/0005:90:01.2.config b/tests/virpcitestdata/0005-90-01.2.config similarity index 100% rename from tests/virpcitestdata/0005:90:01.2.config rename to tests/virpcitestdata/0005-90-01.2.config -- 1.8.1.2

2 2

[libvirt] [RFC PATCH] Cannot set persistent config mem/vcpu above live maxmem/maxvcpu
by Geoff Franks 25 Jan '14

25 Jan '14

I submitted bug https://bugzilla.redhat.com/show_bug.cgi?id=1038363 for being unable to raise the persistent mem/vcpu values above a live domain’s maxmem/maxvcpu values (rather than the persistent maxmem/maxvcpu values). I was asked to submit my patch here for a wider review. For memory, check the newmem value against mem.max_baloon of the live def for non-persistent changes, or mem.max_baloon of the persistent def for persistent changes. Same theory for setting vcpus/maxvcpus. --- a/libvirt0/libvirt-1.1.1/src/qemu/qemu_driver.c +++ b/libvirt0/libvirt-1.1.1/src/qemu/qemu_driver.c @@ -2236,13 +2236,13 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, } else { /* resize the current memory */ - if (newmem > vm->def->mem.max_balloon) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("cannot set memory higher than max memory")); - goto endjob; - } - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (newmem > vm->def->mem.max_balloon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot set memory higher than max memory")); + goto endjob; + } + priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); r = qemuMonitorSetBalloon(priv->mon, newmem); @@ -2262,6 +2262,12 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (newmem > persistentDef->mem.max_balloon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot set memory higher than max memory")); + goto endjob; + } + sa_assert(persistentDef); persistentDef->mem.cur_balloon = newmem; ret = virDomainSaveConfig(cfg->configDir, persistentDef); @@ -4160,6 +4166,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, virDomainDefPtr persistentDef; int ret = -1; bool maximum; + unsigned int maxvcpus; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; qemuAgentCPUInfoPtr cpuinfo = NULL; @@ -4207,11 +4214,12 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } - if (!maximum && nvcpus > vm->def->maxvcpus) { + maxvcpus = (flags & VIR_DOMAIN_AFFECT_LIVE) ? vm->def->maxvcpus : persistentDef->maxvcpus; + if (!maximum && nvcpus > maxvcpus) { virReportError(VIR_ERR_INVALID_ARG, _("requested vcpus is greater than max allowable" " vcpus for the domain: %d > %d"), - nvcpus, vm->def->maxvcpus); + nvcpus, maxvcpus); goto endjob; }

2 2

[libvirt] [PATCH] Using qemu with sheepdog pool
by joel SIMOES 25 Jan '14

25 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> --- src/qemu/qemu_conf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ac53f6d..dfafcdc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1185,6 +1185,56 @@ int qemuDriverAllocateID(virQEMUDriverPtr driver) return virAtomicIntInc(&driver->nextvmid); } + +static int +qemuAddSheepPoolSourceHost(virDomainDiskDefPtr def, + virStoragePoolDefPtr pooldef) +{ + int ret = -1; + char **tokens = NULL; + + /* Only support one host */ + if (pooldef->source.nhost != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Expected exactly 1 host for the storage pool")); + goto cleanup; + } + + /* iscsi pool only supports one host */ + def->nhosts = 1; + + if (VIR_ALLOC_N(def->hosts, def->nhosts) < 0) + goto cleanup; + + if (VIR_STRDUP(def->hosts[0].name, pooldef->source.hosts[0].name) < 0) + goto cleanup; + + if (virAsprintf(&def->hosts[0].port, "%d", + pooldef->source.hosts[0].port ? + pooldef->source.hosts[0].port : + 7000) < 0) + goto cleanup; + + + + + + /* Storage pool have not supported these 2 attributes yet, + * use the defaults. + */ + def->hosts[0].transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; + def->hosts[0].socket = NULL; + + + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + + ret = 0; + +cleanup: + virStringFreeList(tokens); + return ret; +} + static int qemuAddISCSIPoolSourceHost(virDomainDiskDefPtr def, virStoragePoolDefPtr pooldef) @@ -1352,14 +1402,15 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { + + if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI && !(def->srcpool->mode == VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG) ) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " - "storage pool is of iscsi type")); + "storage pool is of iscsi type or only direct for sheepdog ")); goto cleanup; } - + VIR_FREE(def->src); virDomainDiskHostDefFree(def->nhosts, def->hosts); virDomainDiskAuthClear(def); @@ -1439,9 +1490,17 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } break; - case VIR_STORAGE_POOL_MPATH: - case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_SHEEPDOG: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + // force direct mode + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + def->src = virStorageVolGetPath(vol); + + qemuAddSheepPoolSourceHost(def, pooldef); + break; + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

2 1

[libvirt] [PATCH v2] Block info query: Add check for transient domain
by John Ferlan 24 Jan '14

24 Jan '14

Currently the qemuDomainGetBlockInfo will return allocation == physical for most backing stores. For a qcow2 block backed device it's possible to return the highest lv extent allocated from qemu for an active guest. That is a value where allocation != physical and one would hope be less. However, if the guest is not running, then the code falls back to returning allocation == physical. This turns out to be problematic for rhev which monitors the size of the backing store. During a migration, before the VM has been started on the target and while it is deemed inactive on the source, there's a small window of time where the allocation is returned as physical triggering the code to extend the file unnecessarily. Since rhev uses transient domains and this is edge condition for a transient domain, rather than returning good status and allocation == physical when this "window of opportunity" exists, this patch will check for a transient (or non persistent) domain and return a failure to the caller rather than returning the defaults. For a persistent domain, the defaults will be returned. The description for the virDomainGetBlockInfo has been updated to describe the phenomena. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- The v1 of this patch is at: https://www.redhat.com/archives/libvir-list/2013-December/msg00984.html There is a bz associated as well: https://bugzilla.redhat.com/show_bug.cgi?id=1040507 I've read, reread, changed the text for the function so many times. I'm open to any suggestions for adjustments! It's not easy to describe the issues without getting into too much detail. include/libvirt/libvirt.h.in | 8 ++++--- src/libvirt.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_driver.c | 29 +++++++++++++++++++----- 3 files changed, 82 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 47a896b..b3ce000 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2140,7 +2140,8 @@ int virDomainBlockResize (virDomainPtr dom, /** virDomainBlockInfo: * - * This struct provides information about the size of a block device backing store + * This struct provides information about the size of a block device + * backing store * * Examples: * @@ -2153,11 +2154,12 @@ int virDomainBlockResize (virDomainPtr dom, * * - qcow2 file in filesystem * * capacity: logical size from qcow2 header - * * allocation, physical: logical size of the file / highest qcow extent (identical) + * * allocation, physical: logical size of the file / + * highest qcow extent (identical) * * - qcow2 file in a block device * * capacity: logical size from qcow2 header - * * allocation: highest qcow extent written + * * allocation: highest qcow extent written for an active domain * * physical: size of the block device container */ typedef struct _virDomainBlockInfo virDomainBlockInfo; diff --git a/src/libvirt.c b/src/libvirt.c index c15e29a..9cc5b1c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -8403,6 +8403,59 @@ error: * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * + * For QEMU domains, the allocation and physical virDomainBlockInfo + * values returned will generally be the same, except when using a + * non raw, block backing device, such as qcow2 for an active domain. + * When the persistent domain is not active, QEMU will return the + * default which is the same value for allocation and physical. + * + * Active QEMU domains can return an allocation value which is more + * representative of the currently used blocks by the device compared + * to the physical size of the device. Applications can use/monitor + * the allocation value with the understanding that if the domain + * becomes inactive during an attempt to get the value, the default + * values will be returned. Thus, the application should check + * after the call for the domain being inactive if the values are + * the same. Optionally, the application could be watching for a + * shutdown event and then ignore any values received afterwards. + * This can be an issue when a domain is being migrated and the + * exact timing of the domain being made inactive and check of + * the allocation value results the default being returned. For + * a transient domain in the similar situation, this call will return + * -1 and an error message indicating the "domain is not running". + * + * The following is some pseudo code illustrating the call sequence: + * + * ... + * virDomainPtr dom; + * virDomainBlockInfo info; + * char *device; + * ... + * // Either get a list of all domains or a specific domain + * // via a virDomainLookupBy*() call. + * // + * // It's also required to fill in the device pointer, but that's + * // specific to the implementation. For the purposes of this example + * // a qcow2 backed device name string would need to be provided. + * ... + * // If the following call is made on a persistent domain with a + * // qcow2 block backed block device, then it's possible the returned + * // allocation equals the physical value. In that case, the domain + * // that may have been active prior to calling has become inactive, + * // such as is the case during a domain migration. Thus once we + * // get data returned, check for active domain when the values are + * // the same. + * if (virDomainGetBlockInfo(dom, device, &info, 0) < 0) + * goto failure; + * if (info.allocation == info.physical) { + * // If the domain is no longer active, + * // then the defaults are being returned. + * if (!virDomainIsActive()) + * goto ignore_return; + * } + * // Do something with the allocation and physical values + * ... + * * Returns 0 in case of success and -1 in case of failure. */ int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6e21267..699cbf5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10166,6 +10166,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, struct stat sb; int idx; int format; + int activeFail = false; virQEMUDriverConfigPtr cfg = NULL; char *alias = NULL; @@ -10265,15 +10266,23 @@ qemuDomainGetBlockInfo(virDomainPtr dom, /* Set default value .. */ info->allocation = info->physical; - /* ..but if guest is running & not using raw - disk format and on a block device, then query - highest allocated extent from QEMU */ + /* ..but if guest is not using raw disk format and on a block device, + * then query highest allocated extent from QEMU + */ if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && format != VIR_STORAGE_FILE_RAW && - S_ISBLK(sb.st_mode) && - virDomainObjIsActive(vm)) { + S_ISBLK(sb.st_mode)) { qemuDomainObjPrivatePtr priv = vm->privateData; + /* If the guest is not running, then success/failure return + * depends on whether domain is persistent + */ + if (!virDomainObjIsActive(vm)) { + activeFail = true; + ret = 0; + goto cleanup; + } + if (VIR_STRDUP(alias, disk->info.alias) < 0) goto cleanup; @@ -10287,6 +10296,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, &info->allocation); qemuDomainObjExitMonitor(driver, vm); } else { + activeFail = true; ret = 0; } @@ -10300,6 +10310,15 @@ cleanup: VIR_FREE(alias); virStorageFileFreeMetadata(meta); VIR_FORCE_CLOSE(fd); + + /* If we failed to get data from a domain because it's inactive and + * it's not a persisent domain, then force failure. + */ + if (activeFail && vm && !vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + ret = -1; + } if (vm) virObjectUnlock(vm); virObjectUnref(cfg); -- 1.8.4.2

2 2

[libvirt] [PATCH] [PATCH]Correct syntax-check Using qemu with sheepdog pool
by joel SIMOES 24 Jan '14

24 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> --- src/qemu/qemu_conf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index dfafcdc..954542a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1215,17 +1215,13 @@ qemuAddSheepPoolSourceHost(virDomainDiskDefPtr def, 7000) < 0) goto cleanup; - - - - /* Storage pool have not supported these 2 attributes yet, * use the defaults. */ def->hosts[0].transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; def->hosts[0].socket = NULL; - + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; ret = 0; @@ -1402,15 +1398,14 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI && !(def->srcpool->mode == VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG) ) { - + + if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI && !(def->srcpool->mode == VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " "storage pool is of iscsi type or only direct for sheepdog ")); goto cleanup; } - + VIR_FREE(def->src); virDomainDiskHostDefFree(def->nhosts, def->hosts); virDomainDiskAuthClear(def); @@ -1496,11 +1491,10 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT; def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; def->src = virStorageVolGetPath(vol); - qemuAddSheepPoolSourceHost(def, pooldef); break; case VIR_STORAGE_POOL_MPATH: - case VIR_STORAGE_POOL_RBD: + case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

2 1

[libvirt] [question]Is there a good way to get the mac of guest interface after I attached it to a guest
by Sheldon 24 Jan '14

24 Jan '14

Now I working on a new KVM management tool base on html5 and libvirt we will support a REST API for detach and attach guest interface. we want to use mac as the identifier of the network interface. That meas we should get the mac after the user create a interface. also other people may be doing the exact same thing at the exact same time to create a interface. Here are the demo codes: dom = self._get_vm(vm) xml = """ <interface type='network'> <source network='default'/> </interface> """ dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) # now I want to get the mac, how to get it? I have check libvirt use this code to generate a mac address. does libvirt can gurantee that the MAC address generated is unique? void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], virMacAddrPtr addr) { addr->addr[0] = prefix[0]; addr->addr[1] = prefix[1]; addr->addr[2] = prefix[2]; addr->addr[3] = virRandomBits(8); addr->addr[4] = virRandomBits(8); addr->addr[5] = virRandomBits(8); } libvirt also use the KVM prefix as default as it's in the privately administered range: 52:54:00:XX:XX:XX -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 7

[libvirt] [PATCH 00/16] lxc driver connectDomainXMLFromNative
by Cédric Bosdonnat 24 Jan '14

24 Jan '14

The aim of these patches is to provide users a way to easily convert existing LXC containers into libvirt LXC domains. This conversion is mostly based on the use of connectDomainXMLFromNative implementation, but there are small bits that will still need to be manually tweaked, like creating a VLAN interface on the host or precise the rootfs format for image files. Cédric Bosdonnat (16): LXC driver: started implementing connectDomainXMLFromNative LXC from native: import rootfs LXC from native: migrate fstab and lxc.mount.entry LXC from native: implement no network conversion LXC from native: migrate veth network configuration LXC from native: convert phys network types to net hostdev devices LXC from native: convert lxc.tty to console devices LXC from native: convert macvlan network configuration LXC from native: convert lxc.id_map into <idmap> LXC from native: migrate memory tuning LXC from native: map lxc.cgroup.cpu.* LXC from native: map lxc.cgroup.cpuset.* LXC from native: add lxc.cgroup.blkio.* mapping LXC from native: map lxc.arch to /domain/os/type@arch LXC from native: map block filesystems LXC from native: map vlan network type .gitignore | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/lxc/lxc_container.c | 2 +- src/lxc/lxc_container.h | 2 + src/lxc/lxc_driver.c | 36 +- src/lxc/lxc_native.c | 1027 ++++++++++++++++++++ src/lxc/lxc_native.h | 34 + tests/Makefile.am | 7 +- tests/lxcconf2xmldata/lxcconf2xml-blkiotune.config | 9 + tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml | 44 + .../lxcconf2xmldata/lxcconf2xml-cpusettune.config | 8 + tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml | 36 + tests/lxcconf2xmldata/lxcconf2xml-cputune.config | 9 + tests/lxcconf2xmldata/lxcconf2xml-cputune.xml | 38 + tests/lxcconf2xmldata/lxcconf2xml-idmap.config | 6 + tests/lxcconf2xmldata/lxcconf2xml-idmap.xml | 32 + .../lxcconf2xml-macvlannetwork.config | 14 + .../lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 30 + tests/lxcconf2xmldata/lxcconf2xml-memtune.config | 12 + tests/lxcconf2xmldata/lxcconf2xml-memtune.xml | 38 + tests/lxcconf2xmldata/lxcconf2xml-nonetwork.config | 5 + tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml | 33 + .../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 8 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 35 + tests/lxcconf2xmldata/lxcconf2xml-simple.config | 39 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 41 + .../lxcconf2xmldata/lxcconf2xml-vlannetwork.config | 13 + tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 30 + tests/lxcconf2xmldata/lxcconf2xml.fstab | 3 + tests/lxcconf2xmltest.c | 133 +++ 31 files changed, 1724 insertions(+), 3 deletions(-) create mode 100644 src/lxc/lxc_native.c create mode 100644 src/lxc/lxc_native.h create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-blkiotune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cpusettune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cputune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cputune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-idmap.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-idmap.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-memtune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-memtune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-nonetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-simple.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-simple.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml.fstab create mode 100644 tests/lxcconf2xmltest.c -- 1.8.5.2

3 41

[libvirt] [PATCH] qemu: Use virtio network device for aarch64/virt
by Oleg Strikov 24 Jan '14

24 Jan '14

This patch changes network device type used by default from rtl8139 to virtio when architecture type is aarch64 and machine type is virt. Qemu doesn't support any other machine types for aarch64 right now and we can't make any other aarch64-specific tuning in this function yet. Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c947e2e..a0e9a33 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -795,11 +795,12 @@ qemuDomainDefaultNetModel(const virDomainDef *def) { if (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X) return "virtio"; - if (def->os.arch == VIR_ARCH_ARMV7L) { + if (def->os.arch == VIR_ARCH_ARMV7L || + def->os.arch == VIR_ARCH_AARCH64) { if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; if (STREQ(def->os.machine, "virt")) return "virtio"; -- 1.7.9.5

2 1

[libvirt] [libvirt-sandbox PATCH v3] Add filter support.
by Ian Main 24 Jan '14

24 Jan '14

This patch adds two new classes, filterref and filterref-parameter. Network interfaces can now have an associated filter reference with any number of filterref parameters. Also added filter= option to virt-sandbox tool. --- V2: - Changed set_filter to set_name and get_filter to get_name. V3: - Added type checks on all public methods. - Call setters on property set. - Fix install_property flags. - Remove unneeded HANDLE defines. - Add missing g_list_free(). - Add missing unref(). - Fixed names in copyright notices. - Change order of files in Makefile.am libvirt-sandbox/Makefile.am | 4 + .../libvirt-sandbox-builder-container.c | 36 ++++ libvirt-sandbox/libvirt-sandbox-builder-machine.c | 36 ++++ ...rt-sandbox-config-network-filterref-parameter.c | 208 ++++++++++++++++++++ ...rt-sandbox-config-network-filterref-parameter.h | 73 +++++++ .../libvirt-sandbox-config-network-filterref.c | 218 +++++++++++++++++++++ .../libvirt-sandbox-config-network-filterref.h | 74 +++++++ libvirt-sandbox/libvirt-sandbox-config-network.c | 42 ++++ libvirt-sandbox/libvirt-sandbox-config-network.h | 4 + libvirt-sandbox/libvirt-sandbox-config.c | 39 ++++ libvirt-sandbox/libvirt-sandbox.h | 3 + libvirt-sandbox/libvirt-sandbox.sym | 16 ++ 12 files changed, 753 insertions(+) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref.h diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am index 0882490..720bb06 100644 --- a/libvirt-sandbox/Makefile.am +++ b/libvirt-sandbox/Makefile.am @@ -57,6 +57,8 @@ SANDBOX_HEADER_FILES = \ libvirt-sandbox-config.h \ libvirt-sandbox-config-network.h \ libvirt-sandbox-config-network-address.h \ + libvirt-sandbox-config-network-filterref-parameter.h \ + libvirt-sandbox-config-network-filterref.h \ libvirt-sandbox-config-network-route.h \ libvirt-sandbox-config-mount.h \ libvirt-sandbox-config-mount-file.h \ @@ -85,6 +87,8 @@ SANDBOX_SOURCE_FILES = \ libvirt-sandbox-config.c \ libvirt-sandbox-config-network.c \ libvirt-sandbox-config-network-address.c \ + libvirt-sandbox-config-network-filterref.c \ + libvirt-sandbox-config-network-filterref-parameter.c \ libvirt-sandbox-config-network-route.c \ libvirt-sandbox-config-mount.c \ libvirt-sandbox-config-mount-file.c \ diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c b/libvirt-sandbox/libvirt-sandbox-builder-container.c index 43ee5ef..bac8c70 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-container.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c @@ -324,6 +324,8 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil while (tmp) { const gchar *source, *mac; GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + GVirSandboxConfigNetworkFilterref *filterref; + GVirConfigDomainInterfaceFilterref *glib_fref; iface = gvir_config_domain_interface_network_new(); source = gvir_sandbox_config_network_get_source(network); @@ -339,6 +341,40 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil gvir_config_domain_add_device(domain, GVIR_CONFIG_DOMAIN_DEVICE(iface)); + + filterref = gvir_sandbox_config_network_get_filterref(network); + if (filterref) { + GList *param_iter, *parameters; + const gchar *fref_name = gvir_sandbox_config_network_filterref_get_name(filterref); + glib_fref = gvir_config_domain_interface_filterref_new(); + gvir_config_domain_interface_filterref_set_name(glib_fref, fref_name); + param_iter = parameters = gvir_sandbox_config_network_filterref_get_parameters(filterref); + while (param_iter) { + const gchar *name; + const gchar *value; + GVirSandboxConfigNetworkFilterrefParameter *param = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(param_iter->data); + GVirConfigDomainInterfaceFilterrefParameter *glib_param; + + name = gvir_sandbox_config_network_filterref_parameter_get_name(param); + value = gvir_sandbox_config_network_filterref_parameter_get_value(param); + + glib_param = gvir_config_domain_interface_filterref_parameter_new(); + gvir_config_domain_interface_filterref_parameter_set_name(glib_param, name); + gvir_config_domain_interface_filterref_parameter_set_value(glib_param, value); + + gvir_config_domain_interface_filterref_add_parameter(glib_fref, glib_param); + g_object_unref(glib_param); + + param_iter = param_iter->next; + } + + g_list_foreach(parameters, (GFunc)g_object_unref, NULL); + g_list_free(parameters); + + gvir_config_domain_interface_set_filterref(GVIR_CONFIG_DOMAIN_INTERFACE(iface), glib_fref); + g_object_unref(glib_fref); + } + g_object_unref(iface); tmp = tmp->next; diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index 131b376..542663c 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -581,6 +581,8 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde while (tmp) { const gchar *source, *mac; GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + GVirSandboxConfigNetworkFilterref *filterref; + GVirConfigDomainInterfaceFilterref *glib_fref; source = gvir_sandbox_config_network_get_source(network); if (source) { @@ -600,6 +602,40 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde gvir_config_domain_add_device(domain, GVIR_CONFIG_DOMAIN_DEVICE(iface)); + + filterref = gvir_sandbox_config_network_get_filterref(network); + if (filterref) { + GList *param_iter, *parameters; + const gchar *fref_name = gvir_sandbox_config_network_filterref_get_name(filterref); + glib_fref = gvir_config_domain_interface_filterref_new(); + gvir_config_domain_interface_filterref_set_name(glib_fref, fref_name); + param_iter = parameters = gvir_sandbox_config_network_filterref_get_parameters(filterref); + while (param_iter) { + const gchar *name; + const gchar *value; + GVirSandboxConfigNetworkFilterrefParameter *param = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(param_iter->data); + GVirConfigDomainInterfaceFilterrefParameter *glib_param; + + name = gvir_sandbox_config_network_filterref_parameter_get_name(param); + value = gvir_sandbox_config_network_filterref_parameter_get_value(param); + + glib_param = gvir_config_domain_interface_filterref_parameter_new(); + gvir_config_domain_interface_filterref_parameter_set_name(glib_param, name); + gvir_config_domain_interface_filterref_parameter_set_value(glib_param, value); + + gvir_config_domain_interface_filterref_add_parameter(glib_fref, glib_param); + g_object_unref(glib_param); + + param_iter = param_iter->next; + } + + g_list_foreach(parameters, (GFunc)g_object_unref, NULL); + g_list_free(parameters); + + gvir_config_domain_interface_set_filterref(iface, glib_fref); + g_object_unref(glib_fref); + } + g_object_unref(iface); tmp = tmp->next; diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c new file mode 100644 index 0000000..fabed90 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c @@ -0,0 +1,208 @@ +/* + * libvirt-sandbox-config-network-filterref-parameter.c: libvirt sandbox configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> +#include <string.h> + +#include "libvirt-sandbox/libvirt-sandbox.h" + +/** + * SECTION: libvirt-sandbox-config-network-filterref-parameter + * @short_description: Set parameters for a filter reference. + * @include: libvirt-sandbox/libvirt-sandbox.h + * + * Provides an object to store filter parameter name and value. + * + * The GVirSandboxConfigNetworkFilterrefParameter object stores a + * name and value required to set a single parameter of a filter reference. + */ + +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterPrivate)) + +struct _GVirSandboxConfigNetworkFilterrefParameterPrivate +{ + gchar *name; + gchar *value; +}; + +G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterrefParameter, gvir_sandbox_config_network_filterref_parameter, G_TYPE_OBJECT); + + +enum { + PROP_0, + PROP_NAME, + PROP_VALUE, +}; + +enum { + LAST_SIGNAL +}; + +//static gint signals[LAST_SIGNAL]; + + +static void gvir_sandbox_config_network_filterref_parameter_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_NAME: + g_value_set_string(value, priv->name); + break; + + case PROP_VALUE: + g_value_set_string(value, priv->value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_parameter_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterrefParameter *filter = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + + switch (prop_id) { + case PROP_NAME: + gvir_sandbox_config_network_filterref_parameter_set_name(filter, g_value_get_string(value)); + break; + + case PROP_VALUE: + gvir_sandbox_config_network_filterref_parameter_set_value(filter, g_value_get_string(value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_parameter_finalize(GObject *object) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + g_free(priv->name); + g_free(priv->value); + + G_OBJECT_CLASS(gvir_sandbox_config_network_filterref_parameter_parent_class)->finalize(object); +} + + +static void gvir_sandbox_config_network_filterref_parameter_class_init(GVirSandboxConfigNetworkFilterrefParameterClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + object_class->finalize = gvir_sandbox_config_network_filterref_parameter_finalize; + object_class->get_property = gvir_sandbox_config_network_filterref_parameter_get_property; + object_class->set_property = gvir_sandbox_config_network_filterref_parameter_set_property; + + g_object_class_install_property(object_class, + PROP_NAME, + g_param_spec_string("name", + "Name", + "Name of parameter", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, + PROP_VALUE, + g_param_spec_string("value", + "Value", + "Value of parameter", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefParameterPrivate)); +} + + +static void gvir_sandbox_config_network_filterref_parameter_init(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + param->priv = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_PRIVATE(param); +} + + +/** + * gvir_sandbox_config_network_filterref_parameter_new: + * + * Create a new network config with DHCP enabled + * + * Returns: (transfer full): a new sandbox network object + */ +GVirSandboxConfigNetworkFilterrefParameter *gvir_sandbox_config_network_filterref_parameter_new(void) +{ + return GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(g_object_new(GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, + NULL)); +} + +void gvir_sandbox_config_network_filterref_parameter_set_name(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *name) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv; + + g_return_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(param)); + priv = param->priv; + g_free(priv->name); + priv->name = g_strdup(name); +} + +const gchar *gvir_sandbox_config_network_filterref_parameter_get_name(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv; + + g_return_val_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(param), NULL); + priv = param->priv; + return priv->name; +} + +void gvir_sandbox_config_network_filterref_parameter_set_value(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *value) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv; + + g_return_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(param)); + priv = param->priv; + g_free(priv->value); + priv->value = g_strdup(value); +} + +const gchar *gvir_sandbox_config_network_filterref_parameter_get_value(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv; + + g_return_val_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(param), NULL); + priv = param->priv; + return priv->value; +} diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h new file mode 100644 index 0000000..9544539 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h @@ -0,0 +1,73 @@ +/* + * libvirt-sandbox-config-network-filterref-parameter.h: libvirt sandbox configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_SANDBOX_H__) && !defined(LIBVIRT_SANDBOX_BUILD) +#error "Only <libvirt-sandbox/libvirt-sandbox.h> can be included directly." +#endif + +#ifndef __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ +#define __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ + +G_BEGIN_DECLS + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER (gvir_sandbox_config_network_filterref_parameter_get_type ()) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameter)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterClass)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterClass)) + +typedef struct _GVirSandboxConfigNetworkFilterrefParameter GVirSandboxConfigNetworkFilterrefParameter; +typedef struct _GVirSandboxConfigNetworkFilterrefParameterPrivate GVirSandboxConfigNetworkFilterrefParameterPrivate; +typedef struct _GVirSandboxConfigNetworkFilterrefParameterClass GVirSandboxConfigNetworkFilterrefParameterClass; + +struct _GVirSandboxConfigNetworkFilterrefParameter +{ + GObject parent; + + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirSandboxConfigNetworkFilterrefParameterClass +{ + GObjectClass parent_class; + + gpointer padding[LIBVIRT_SANDBOX_CLASS_PADDING]; +}; + +GType gvir_sandbox_config_network_filterref_parameter_get_type(void); + +GVirSandboxConfigNetworkFilterrefParameter *gvir_sandbox_config_network_filterref_parameter_new(void); + +void gvir_sandbox_config_network_filterref_parameter_set_name(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *name); +const gchar *gvir_sandbox_config_network_filterref_parameter_get_name(GVirSandboxConfigNetworkFilterrefParameter *param); + +void gvir_sandbox_config_network_filterref_parameter_set_value(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *value); +const gchar *gvir_sandbox_config_network_filterref_parameter_get_value(GVirSandboxConfigNetworkFilterrefParameter *param); + +G_END_DECLS + +#endif /* __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c new file mode 100644 index 0000000..85b41ae --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c @@ -0,0 +1,218 @@ +/* + * libvirt-sandbox-config-network-filterref.c: libvirt sandbox filterr reference + * configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> +#include <string.h> + +#include "libvirt-sandbox/libvirt-sandbox.h" + +/** + * SECTION: libvirt-sandbox-config-network-filterref + * @short_description: Add a network filter to a network interface. + * @include: libvirt-sandbox/libvirt-sandbox.h + * @see_aloso: #GVirSandboxConfig + * + * Provides an object to store the name of the filter reference. + * + * The GVirSandboxConfigNetworkFilterref object stores the name of the filter + * references associated with a network interface. + */ + +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefPrivate)) + +struct _GVirSandboxConfigNetworkFilterrefPrivate +{ + gchar *filter; + GList *parameters; +}; + +G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterref, gvir_sandbox_config_network_filterref, G_TYPE_OBJECT); + + +enum { + PROP_0, + PROP_FILTER +}; + +enum { + LAST_SIGNAL +}; + +//static gint signals[LAST_SIGNAL]; + +static void gvir_sandbox_config_network_filterref_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_FILTER: + g_value_set_string(value, priv->filter); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterref *filterref = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + + switch (prop_id) { + case PROP_FILTER: + gvir_sandbox_config_network_filterref_set_name(filterref, g_value_get_string(value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + + +static void gvir_sandbox_config_network_filterref_finalize(GObject *object) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + g_free(priv->filter); + g_list_foreach(priv->parameters, (GFunc)g_object_unref, NULL); + g_list_free(priv->parameters); + + G_OBJECT_CLASS(gvir_sandbox_config_network_filterref_parent_class)->finalize(object); +} + + +static void gvir_sandbox_config_network_filterref_class_init(GVirSandboxConfigNetworkFilterrefClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + object_class->finalize = gvir_sandbox_config_network_filterref_finalize; + object_class->get_property = gvir_sandbox_config_network_filterref_get_property; + object_class->set_property = gvir_sandbox_config_network_filterref_set_property; + + g_object_class_install_property(object_class, + PROP_FILTER, + g_param_spec_string("filter", + "Filter name", + "The filter reference name", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefPrivate)); +} + +/** + * gvir_sandbox_config_network_filterref_new: + * + * Create a new network filterref config. + * + * Returns: (transfer full): a new sandbox network_filterref object + */ +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_filterref_new(void) +{ + return GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(g_object_new(GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, + NULL)); +} + + +static void gvir_sandbox_config_network_filterref_init(GVirSandboxConfigNetworkFilterref *config) +{ + config->priv = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_PRIVATE(config); +} + + +/** + * gvir_sandbox_config_network_filterref_get_name: + * @config: (transfer none): the network filter reference name + * + * Retrieves the network filter reference name. + * + * Returns: (transfer none): the network filter reference name. + */ +const gchar *gvir_sandbox_config_network_filterref_get_name(GVirSandboxConfigNetworkFilterref *filterref) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv; + + g_return_val_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(filterref), NULL); + priv = filterref->priv; + return priv->filter; +} + +void gvir_sandbox_config_network_filterref_set_name(GVirSandboxConfigNetworkFilterref *filterref, + const gchar *name) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv; + + g_return_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(filterref)); + priv = filterref->priv; + g_free(priv->filter); + priv->filter = g_strdup(name); +} + +/** + * gvir_sandbox_config_network_filterref_add_parameter: + * @filter: (transfer none): the network filter reference. + * @param: (transfer none): the filter parameter + * + * Add a parameter to a network filter reference. + */ +void gvir_sandbox_config_network_filterref_add_parameter(GVirSandboxConfigNetworkFilterref *filter, + GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv; + + g_return_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(filter)); + g_return_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(param)); + priv = filter->priv; + priv->parameters = g_list_append(priv->parameters, g_object_ref(param)); +} + + +/** + * gvir_sandbox_config_network_filterref_get_parameters: + * @filter: (transfer none): the filter reference configuration + * + * Retrieve the list of parameters associated with a network filter reference + * + * Returns: (transfer full)(element-type GVirSandboxConfigNetworkFilterrefParameter): the parameter list + */ +GList *gvir_sandbox_config_network_filterref_get_parameters(GVirSandboxConfigNetworkFilterref *filter) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv; + + g_return_val_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(filter), NULL); + priv = filter->priv; + g_list_foreach(priv->parameters, (GFunc)g_object_ref, NULL); + return g_list_copy(priv->parameters); +} diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h new file mode 100644 index 0000000..e036a93 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h @@ -0,0 +1,74 @@ +/* + * libvirt-sandbox-config-network-filterref.h: libvirt sandbox filter reference + * configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_SANDBOX_H__) && !defined(LIBVIRT_SANDBOX_BUILD) +#error "Only <libvirt-sandbox/libvirt-sandbox.h> can be included directly." +#endif + +#ifndef __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ +#define __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ + +G_BEGIN_DECLS + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF (gvir_sandbox_config_network_filterref_get_type ()) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterref)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefClass)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefClass)) + +typedef struct _GVirSandboxConfigNetworkFilterref GVirSandboxConfigNetworkFilterref; +typedef struct _GVirSandboxConfigNetworkFilterrefPrivate GVirSandboxConfigNetworkFilterrefPrivate; +typedef struct _GVirSandboxConfigNetworkFilterrefClass GVirSandboxConfigNetworkFilterrefClass; + +struct _GVirSandboxConfigNetworkFilterref +{ + GObject parent; + + GVirSandboxConfigNetworkFilterrefPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirSandboxConfigNetworkFilterrefClass +{ + GObjectClass parent_class; + + gpointer padding[LIBVIRT_SANDBOX_CLASS_PADDING]; +}; + +GType gvir_sandbox_config_network_filterref_get_type(void); + +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_filterref_new(void); + +const gchar *gvir_sandbox_config_network_filterref_get_name(GVirSandboxConfigNetworkFilterref *config); +void gvir_sandbox_config_network_filterref_set_name(GVirSandboxConfigNetworkFilterref *filter, const gchar *name); + +void gvir_sandbox_config_network_filterref_add_parameter(GVirSandboxConfigNetworkFilterref *filter, + GVirSandboxConfigNetworkFilterrefParameter *param); +GList *gvir_sandbox_config_network_filterref_get_parameters(GVirSandboxConfigNetworkFilterref *filter); + + +G_END_DECLS + +#endif /* __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c index f04cf4c..2bb55bf 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -47,6 +47,7 @@ struct _GVirSandboxConfigNetworkPrivate gchar *mac; GList *routes; GList *addrs; + GVirSandboxConfigNetworkFilterref *filterref; }; G_DEFINE_TYPE(GVirSandboxConfigNetwork, gvir_sandbox_config_network, G_TYPE_OBJECT); @@ -133,6 +134,8 @@ static void gvir_sandbox_config_network_finalize(GObject *object) g_list_free(priv->addrs); g_list_foreach(priv->routes, (GFunc)g_object_unref, NULL); g_list_free(priv->routes); + if (priv->filterref) + g_object_unref(priv->filterref); G_OBJECT_CLASS(gvir_sandbox_config_network_parent_class)->finalize(object); } @@ -287,6 +290,45 @@ GList *gvir_sandbox_config_network_get_addresses(GVirSandboxConfigNetwork *confi } /** + * gvir_sandbox_config_network_set_filterref: + * @config: (transfer none): the sandbox network configuration + * @ref: (transfer none): the network filterref + * + * Set a network filterref for the given network. + */ +void gvir_sandbox_config_network_set_filterref(GVirSandboxConfigNetwork *config, + GVirSandboxConfigNetworkFilterref *filterref) +{ + GVirSandboxConfigNetworkPrivate *priv; + + g_return_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK(config)); + g_return_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(filterref)); + priv = config->priv; + if (priv->filterref) + g_object_unref(priv->filterref); + priv->filterref = g_object_ref(filterref); +} + + +/** + * gvir_sandbox_config_network_get_filterref: + * @config: (transfer none): the sandbox network configuration + * + * Retrieve the associated filter reference. + * + * Returns: (transfer none): The associated filter reference. + */ +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_get_filterref(GVirSandboxConfigNetwork *config) +{ + GVirSandboxConfigNetworkPrivate *priv; + + g_return_val_if_fail(GVIR_SANDBOX_IS_CONFIG_NETWORK(config), NULL); + priv = config->priv; + return priv->filterref; +} + + +/** * gvir_sandbox_config_network_add_route: * @config: (transfer none): the sandbox network configuration * @addr: (transfer none): the network route diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.h b/libvirt-sandbox/libvirt-sandbox-config-network.h index d926fd1..4a52221 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.h +++ b/libvirt-sandbox/libvirt-sandbox-config-network.h @@ -78,6 +78,10 @@ void gvir_sandbox_config_network_add_address(GVirSandboxConfigNetwork *config, GVirSandboxConfigNetworkAddress *addr); GList *gvir_sandbox_config_network_get_addresses(GVirSandboxConfigNetwork *config); +void gvir_sandbox_config_network_set_filterref(GVirSandboxConfigNetwork *config, + GVirSandboxConfigNetworkFilterref *ref); +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_get_filterref(GVirSandboxConfigNetwork *config); + void gvir_sandbox_config_network_add_route(GVirSandboxConfigNetwork *config, GVirSandboxConfigNetworkRoute *addr); GList *gvir_sandbox_config_network_get_routes(GVirSandboxConfigNetwork *config); diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index b1525a1..f996ea5 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -911,6 +911,8 @@ gboolean gvir_sandbox_config_add_network_strv(GVirSandboxConfig *config, * source=private,address=192.168.122.1/24%192.168.122.255, * address=192.168.122.1/24%192.168.122.255,address=2001:212::204:2/64 * route=192.168.122.255/24%192.168.1.1 + * filter=clean-traffic + * filter.ip=192.168.122.1 */ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, const gchar *network, @@ -924,8 +926,10 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, gchar **params = g_strsplit(network, ",", 50); gsize j = 0; GVirSandboxConfigNetwork *net; + GVirSandboxConfigNetworkFilterref *filter; net = gvir_sandbox_config_network_new(); + filter = gvir_sandbox_config_network_filterref_new(); gvir_sandbox_config_network_set_dhcp(net, FALSE); while (params && params[j]) { @@ -947,6 +951,40 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, } else if (g_str_has_prefix(param, "mac=")) { gvir_sandbox_config_network_set_mac(net, param + strlen("mac=")); + } else if (g_str_has_prefix(param, "filter.")) { + GVirSandboxConfigNetworkFilterrefParameter *filter_param; + gchar *tail = g_strdup(param + strlen("filter.")); + gchar *equ = g_strrstr(tail, "="); + gchar *name, *name_up, *value; + + if (equ == NULL) { + g_free(tail); + g_set_error(error, GVIR_SANDBOX_CONFIG_ERROR, 0, + _("No assignment in filter parameter configuration")); + g_object_unref(net); + goto cleanup; + } + + name = g_strndup(tail, equ - tail); + value = g_strdup(equ + 1); + /* Convert to upcase for convenience. */ + name_up = g_ascii_strup(name, -1); + g_free(name); + + filter_param = gvir_sandbox_config_network_filterref_parameter_new(); + gvir_sandbox_config_network_filterref_parameter_set_name(filter_param, name_up); + gvir_sandbox_config_network_filterref_parameter_set_value(filter_param, value); + gvir_sandbox_config_network_filterref_add_parameter(filter, filter_param); + + g_free(tail); + g_free(name_up); + g_free(value); + } else if (g_str_has_prefix(param, "filter=")) { + gchar *name = g_strdup(param + strlen("filter=")); + + gvir_sandbox_config_network_filterref_set_name(filter, name); + gvir_sandbox_config_network_set_filterref(net, filter); + g_free(name); } else if (g_str_has_prefix(param, "address=")) { GVirSandboxConfigNetworkAddress *addr; GInetAddress *primaryaddr; @@ -1090,6 +1128,7 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, ret = TRUE; cleanup: + g_object_unref(filter); return ret; } diff --git a/libvirt-sandbox/libvirt-sandbox.h b/libvirt-sandbox/libvirt-sandbox.h index a3f0b2c..adb21a1 100644 --- a/libvirt-sandbox/libvirt-sandbox.h +++ b/libvirt-sandbox/libvirt-sandbox.h @@ -25,6 +25,7 @@ /* External includes */ #include <libvirt-gobject/libvirt-gobject.h> +#include <locale.h> /* Local includes */ #include <libvirt-sandbox/libvirt-sandbox-main.h> @@ -37,6 +38,8 @@ #include <libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.h> #include <libvirt-sandbox/libvirt-sandbox-config-mount-ram.h> #include <libvirt-sandbox/libvirt-sandbox-config-network-address.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref.h> #include <libvirt-sandbox/libvirt-sandbox-config-network-route.h> #include <libvirt-sandbox/libvirt-sandbox-config-network.h> #include <libvirt-sandbox/libvirt-sandbox-config.h> diff --git a/libvirt-sandbox/libvirt-sandbox.sym b/libvirt-sandbox/libvirt-sandbox.sym index 7b7c8be..7afef53 100644 --- a/libvirt-sandbox/libvirt-sandbox.sym +++ b/libvirt-sandbox/libvirt-sandbox.sym @@ -44,6 +44,7 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_mount_ram_set_usage; gvir_sandbox_config_network_add_address; + gvir_sandbox_config_network_set_filterref; gvir_sandbox_config_network_add_route; gvir_sandbox_config_network_get_type; gvir_sandbox_config_network_get_dhcp; @@ -51,6 +52,7 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_network_get_source; gvir_sandbox_config_network_get_routes; gvir_sandbox_config_network_get_addresses; + gvir_sandbox_config_network_get_filterref; gvir_sandbox_config_network_new; gvir_sandbox_config_network_set_dhcp; gvir_sandbox_config_network_set_mac; @@ -65,6 +67,20 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_network_address_set_primary; gvir_sandbox_config_network_address_set_prefix; + gvir_sandbox_config_network_filterref_get_type; + gvir_sandbox_config_network_filterref_new; + gvir_sandbox_config_network_filterref_get_name; + gvir_sandbox_config_network_filterref_set_name; + gvir_sandbox_config_network_filterref_add_parameter; + gvir_sandbox_config_network_filterref_get_parameters; + + gvir_sandbox_config_network_filterref_parameter_get_type; + gvir_sandbox_config_network_filterref_parameter_new; + gvir_sandbox_config_network_filterref_parameter_get_name; + gvir_sandbox_config_network_filterref_parameter_set_name; + gvir_sandbox_config_network_filterref_parameter_get_value; + gvir_sandbox_config_network_filterref_parameter_set_value; + gvir_sandbox_config_network_route_get_type; gvir_sandbox_config_network_route_get_prefix; gvir_sandbox_config_network_route_get_gateway; -- 1.8.1.4

2 7

[libvirt] [PATCH v3] qemu: Don't fail if the SCSI host device is shareable between domains
by Osier Yang 24 Jan '14

24 Jan '14

It doesn't make sense to fail if the SCSI host device is specified as "shareable" explicitly between domains (NB, it works if and only if the device is specified as "shareable" for *all* domains, otherwise it fails). To fix the problem, this patch introduces an array for virSCSIDevice struct, which records all the names of domain which are using the device (note that the recorded domains must specifiy the device as shareable). And the change on the data struct brings on many subsequent changes in the code. Since prior to this patch, the "shareable" tag didn't work as expected, it actually work like "non-shareable". If there was a live domain using the SCSI device with "shareable" specified, then after upgrading (assuming the live domain keep running during upgrading) the older libvirt (without this patch) to newer libvirt (with this patch), it may cause some confusion when user tries to start later domains as "shareable". So this patch also added notes in formatdomain.html to declare the fact. * src/util/virscsi.h: - Remove virSCSIDeviceGetUsedBy - Change definition of virSCSIDeviceGetUsedBy and virSCSIDeviceListDel - Add virSCSIDeviceIsAvailable * src/util/virscsi.c: - struct virSCSIDevice: Change "used_by" to be an array; Add "n_used_by" as the array count - virSCSIDeviceGetUsedBy: Removed - virSCSIDeviceFree: frees the "used_by" array - virSCSIDeviceSetUsedBy: Copy the domain name to avoid potential memory corruption - virSCSIDeviceIsAvailable: New - virSCSIDeviceListDel: Change the logic, for device which is already in the list, just remove the corresponding entry in "used_by". And since it's only used in one place, we can safely removing the code to find out the dev in the list first. - Copyright updating * src/libvirt_private.sys: - virSCSIDeviceGetUsedBy: Remove - virSCSIDeviceIsAvailable: New * src/qemu/qemu_hostdev.c: - qemuUpdateActiveScsiHostdevs: Check if the device existing before adding it to the list; - qemuPrepareHostdevSCSIDevices: Error out if the not all domains use the device as "shareable"; Also don't try to add the device to the activeScsiHostdevs list if it already there; And make more sensible error w.r.t the current "shareable" value in driver->activeScsiHostdevs. - qemuDomainReAttachHostScsiDevices: Change the logic according to the changes on helpers. --- docs/formatdomain.html.in | 6 ++++ src/libvirt_private.syms | 2 +- src/qemu/qemu_hostdev.c | 77 ++++++++++++++++++++++++++--------------------- src/util/virscsi.c | 45 +++++++++++++++++++++------ src/util/virscsi.h | 7 +++-- 5 files changed, 90 insertions(+), 47 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ff50214..18bfad1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2798,6 +2798,12 @@ between domains (assuming the hypervisor and OS support this). Only supported by SCSI host device. Since 1.0.6 + + Note: though <code>shareable</shareable> was introduced + since 1.0.6, but it doesn't work as + as expected (actually works like non-shareable) until + 1.2.2. + </dd> </dl> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 13caf93..0f30292 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1686,7 +1686,7 @@ virSCSIDeviceGetSgName; virSCSIDeviceGetShareable; virSCSIDeviceGetTarget; virSCSIDeviceGetUnit; -virSCSIDeviceGetUsedBy; +virSCSIDeviceIsAvailable; virSCSIDeviceListAdd; virSCSIDeviceListCount; virSCSIDeviceListDel; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 86a463a..2b9d274 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -250,13 +250,14 @@ qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver, virDomainHostdevDefPtr hostdev = NULL; size_t i; int ret = -1; + virSCSIDevicePtr scsi = NULL; + virSCSIDevicePtr tmp = NULL; if (!def->nhostdevs) return 0; virObjectLock(driver->activeScsiHostdevs); for (i = 0; i < def->nhostdevs; i++) { - virSCSIDevicePtr scsi = NULL; hostdev = def->hostdevs[i]; if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || @@ -271,11 +272,18 @@ qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver, hostdev->shareable))) goto cleanup; - virSCSIDeviceSetUsedBy(scsi, def->name); - - if (virSCSIDeviceListAdd(driver->activeScsiHostdevs, scsi) < 0) { + if ((tmp = virSCSIDeviceListFind(driver->activeScsiHostdevs, scsi))) { + if (virSCSIDeviceSetUsedBy(tmp, def->name) < 0) { + virSCSIDeviceFree(scsi); + goto cleanup; + } virSCSIDeviceFree(scsi); - goto cleanup; + } else { + if (virSCSIDeviceSetUsedBy(scsi, def->name) < 0 || + virSCSIDeviceListAdd(driver->activeScsiHostdevs, scsi) < 0) { + virSCSIDeviceFree(scsi); + goto cleanup; + } } } ret = 0; @@ -1118,24 +1126,29 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver, for (i = 0; i < count; i++) { virSCSIDevicePtr scsi = virSCSIDeviceListGet(list, i); if ((tmp = virSCSIDeviceListFind(driver->activeScsiHostdevs, scsi))) { - const char *other_name = virSCSIDeviceGetUsedBy(tmp); + bool scsi_shareable = virSCSIDeviceGetShareable(scsi); + bool tmp_shareable = virSCSIDeviceGetShareable(tmp); - if (other_name) - virReportError(VIR_ERR_OPERATION_INVALID, - _("SCSI device %s is in use by domain %s"), - virSCSIDeviceGetName(tmp), other_name); - else + if (!(scsi_shareable && tmp_shareable)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("SCSI device %s is already in use"), + _("SCSI device %s is already in use by " + "other domain(s) as '%s'"), + tmp_shareable ? "shareable" : "non-shareable", virSCSIDeviceGetName(tmp)); - goto error; - } + goto error; + } - virSCSIDeviceSetUsedBy(scsi, name); - VIR_DEBUG("Adding %s to activeScsiHostdevs", virSCSIDeviceGetName(scsi)); + if (virSCSIDeviceSetUsedBy(tmp, name) < 0) + goto error; + } else { + if (virSCSIDeviceSetUsedBy(scsi, name) < 0) + goto error; - if (virSCSIDeviceListAdd(driver->activeScsiHostdevs, scsi) < 0) - goto error; + VIR_DEBUG("Adding %s to activeScsiHostdevs", virSCSIDeviceGetName(scsi)); + + if (virSCSIDeviceListAdd(driver->activeScsiHostdevs, scsi) < 0) + goto error; + } } virObjectUnlock(driver->activeScsiHostdevs); @@ -1380,8 +1393,8 @@ qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr driver, virObjectLock(driver->activeScsiHostdevs); for (i = 0; i < nhostdevs; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; - virSCSIDevicePtr scsi, tmp; - const char *used_by = NULL; + virSCSIDevicePtr scsi; + virSCSIDevicePtr tmp; virDomainDeviceDef dev; dev.type = VIR_DOMAIN_DEVICE_HOSTDEV; @@ -1411,30 +1424,26 @@ qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr driver, /* Only delete the devices which are marked as being used by @name, * because qemuProcessStart could fail on the half way. */ - tmp = virSCSIDeviceListFind(driver->activeScsiHostdevs, scsi); - virSCSIDeviceFree(scsi); - - if (!tmp) { + if (!(tmp = virSCSIDeviceListFind(driver->activeScsiHostdevs, scsi))) { VIR_WARN("Unable to find device %s:%d:%d:%d " "in list of active SCSI devices", hostdev->source.subsys.u.scsi.adapter, hostdev->source.subsys.u.scsi.bus, hostdev->source.subsys.u.scsi.target, hostdev->source.subsys.u.scsi.unit); + virSCSIDeviceFree(scsi); continue; } - used_by = virSCSIDeviceGetUsedBy(tmp); - if (STREQ_NULLABLE(used_by, name)) { - VIR_DEBUG("Removing %s:%d:%d:%d dom=%s from activeScsiHostdevs", - hostdev->source.subsys.u.scsi.adapter, - hostdev->source.subsys.u.scsi.bus, - hostdev->source.subsys.u.scsi.target, - hostdev->source.subsys.u.scsi.unit, - name); + VIR_DEBUG("Removing %s:%d:%d:%d dom=%s from activeScsiHostdevs", + hostdev->source.subsys.u.scsi.adapter, + hostdev->source.subsys.u.scsi.bus, + hostdev->source.subsys.u.scsi.target, + hostdev->source.subsys.u.scsi.unit, + name); - virSCSIDeviceListDel(driver->activeScsiHostdevs, tmp); - } + virSCSIDeviceListDel(driver->activeScsiHostdevs, tmp, name); + virSCSIDeviceFree(scsi); } virObjectUnlock(driver->activeScsiHostdevs); } diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 58d9e25..2c6d865 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -1,6 +1,7 @@ /* * virscsi.c: helper APIs for managing host SCSI devices * + * Copyright (C) 2013 - 2014 Red Hat, Inc. * Copyright (C) 2013 Fujitsu, Inc. * * This library is free software; you can redistribute it and/or @@ -55,7 +56,8 @@ struct _virSCSIDevice { char *name; /* adapter:bus:target:unit */ char *id; /* model:vendor */ char *sg_path; /* e.g. /dev/sg2 */ - const char *used_by; /* name of the domain using this dev */ + char **used_by; /* name of the domains using this dev */ + size_t n_used_by; /* how many domains are using this dev */ bool readonly; bool shareable; @@ -256,26 +258,37 @@ cleanup: void virSCSIDeviceFree(virSCSIDevicePtr dev) { + size_t i; + if (!dev) return; VIR_FREE(dev->id); VIR_FREE(dev->name); VIR_FREE(dev->sg_path); + for (i = 0; i < dev->n_used_by; i++) { + VIR_FREE(dev->used_by[i]); + } + VIR_FREE(dev->used_by); VIR_FREE(dev); } -void +int virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, const char *name) { - dev->used_by = name; + char *copy = NULL; + + if (VIR_STRDUP(copy, name) < 0) + return -1; + + return VIR_APPEND_ELEMENT(dev->used_by, dev->n_used_by, copy); } -const char * -virSCSIDeviceGetUsedBy(virSCSIDevicePtr dev) +bool +virSCSIDeviceIsAvailable(virSCSIDevicePtr dev) { - return dev->used_by; + return dev->n_used_by == 0; } const char * @@ -406,10 +419,24 @@ virSCSIDeviceListSteal(virSCSIDeviceListPtr list, void virSCSIDeviceListDel(virSCSIDeviceListPtr list, - virSCSIDevicePtr dev) + virSCSIDevicePtr dev, + const char *name) { - virSCSIDevicePtr ret = virSCSIDeviceListSteal(list, dev); - virSCSIDeviceFree(ret); + virSCSIDevicePtr ret = NULL; + size_t i; + + for (i = 0; i < ret->n_used_by; i++) { + if (STREQ_NULLABLE(ret->used_by[i], name)) { + if (ret->n_used_by > 1) { + VIR_DELETE_ELEMENT(ret->used_by, i, ret->n_used_by); + } else { + ret = virSCSIDeviceListSteal(list, dev); + virSCSIDeviceFree(ret); + } + + break; + } + } } virSCSIDevicePtr diff --git a/src/util/virscsi.h b/src/util/virscsi.h index b2e98ca..aff7e5a 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -50,8 +50,8 @@ virSCSIDevicePtr virSCSIDeviceNew(const char *adapter, bool shareable); void virSCSIDeviceFree(virSCSIDevicePtr dev); -void virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, const char *name); -const char *virSCSIDeviceGetUsedBy(virSCSIDevicePtr dev); +int virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, const char *name); +bool virSCSIDeviceIsAvailable(virSCSIDevicePtr dev); const char *virSCSIDeviceGetName(virSCSIDevicePtr dev); unsigned int virSCSIDeviceGetAdapter(virSCSIDevicePtr dev); unsigned int virSCSIDeviceGetBus(virSCSIDevicePtr dev); @@ -83,7 +83,8 @@ size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list); virSCSIDevicePtr virSCSIDeviceListSteal(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); void virSCSIDeviceListDel(virSCSIDeviceListPtr list, - virSCSIDevicePtr dev); + virSCSIDevicePtr dev, + const char *name); virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); -- 1.8.1.4

2 2

[libvirt] [PATCH] wireshark: Fix VPATH build
by Jiri Denemark 24 Jan '14

24 Jan '14

config-post.h included indirectly from packet-libvirt.c stays in $(top_srcdir) rather than $(top_builddir) which is added automatically. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/wireshark/src/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am index 81e7041..afe9975 100644 --- a/tools/wireshark/src/Makefile.am +++ b/tools/wireshark/src/Makefile.am @@ -17,6 +17,9 @@ # <http://www.gnu.org/licenses/>. # # Author: Yuto KAWAMURA(kawamuray) + +INCLUDES = -I$(top_srcdir) + ws_plugin_LTLIBRARIES = libvirt.la libvirt_la_SOURCES = packet-libvirt.c plugin.c libvirt_la_CPPFLAGS = $(WS_DISSECTOR_CPPFLAGS) -- 1.8.5.3

2 2

[libvirt] [PATCH] maint: update to latest gnulib, for mingw improvements
by Eric Blake 23 Jan '14

23 Jan '14

On Fedora 20, mingw-headers has switched over to winpthreads as the provider for its <pthread.h>. winpthreads is notorious for providing a less-than-stellar header, and needs several workarounds before it can be used in a project assuming POSIX semantics. While we still use Windows primitives rather than pthread when compiling for mingw, this update will make it possible to switch to mingw pthreads. * .gnulib: Update to latest, for mingw fixes. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- We're in between releases, so I'm pushing this under the gnulib/trivial rule. * .gnulib d18d1b8...d5fec6c (15): > pthread: work around winpthread header pollution on mingw > qacl: check for fchmod > Fix typo in ChangeLog. > fdopen-tests: port to Tru64 > stdalign: port to HP-UX compilers > strtoimax: port to platforms lacking 'long long' > update from texinfo > relocatable-maint.texi: escape braces > maint: remove duplicate ChangeLog entry > maint.mk: adapt openat.h-include-without-use test > relocatable-perl: like relocatable-script, but for Perl scripts > relocatable-shell: Update suggested usage in maintainer documentation. > tests: fix export bug in previous patch > tests: simplify porting to Solaris 10 /bin/sh > update from texinfo .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index d18d1b8..d5fec6c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d18d1b8023822220bb8f0a079c7312a1adffdce0 +Subproject commit d5fec6c22f03c6a73d62260c9ce091c10c0a9cbd -- 1.8.5.3

1 0

[libvirt] [v0.9.12-maint 0/8] Backport changes for CVE-2013-6458 to v0.9.12-maint
by Guido Günther 23 Jan '14

23 Jan '14

Hi, attached patches backport the fixes for CVE-2013-6458 to v0.9.12-maint. I decided to cherry-pick the introduction of VIR_STRDUP and virReportError as well to ease backporting of future fixes. I'd be happy about any review. Daniel P. Berrange (1): Introduce virReportError macro for general error reporting Eric Blake (2): string: make VIR_STRDUP easier to use string: test VIR_STRDUP Jiri Denemark (4): qemu: Do not access stale data in virDomainBlockStats qemu: Avoid using stale data in virDomainGetBlockInfo qemu: Fix job usage in qemuDomainBlockJobImpl qemu: Fix job usage in virDomainGetBlockIoTune Michal Privoznik (1): virstring: Introduce VIR_STRDUP and VIR_STRNDUP HACKING | 16 ++++++++ cfg.mk | 1 + docs/hacking.html.in | 24 ++++++++++- src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 68 ++++++++++++++++--------------- src/util/virprocess.c | 3 -- src/util/virstring.c | 78 ++++++++++++++++++++++++++++++++++++ src/util/virstring.h | 70 ++++++++++++++++++++++++++++++++ src/util/virterror_internal.h | 3 ++ tests/virstringtest.c | 93 ++++++++++++++++++++++++++++++++++++++++++- 10 files changed, 320 insertions(+), 38 deletions(-) -- 1.8.5.2

4 16

[libvirt] What is the robust/recommended way to retrieve the PID of a VM's init process ?
by Thierry Parmentelat 23 Jan '14

23 Jan '14

Hello there I am trying to locate the namespaces in place for a given lxc container (specifically /proc/<pid>/ns/*) And to this end I was wondering what is the recommended way to probe for an lxc container's init pid (mostly I'm after the mnt and pid namespaces, and probably network ones, but the actual list probably should not matter) I've found about "virsh domid" but this gives me the pid for libvirt_lxc, which turns out to have unmodified namespaces (at least as far as the mnt ns) OTOH this process has exactly one child which is the container's init, which seems to have the right set of namespaces My angle right now is to look in /proc/<domid_pid>/task/children for a - hopefully single - pid and that seems to work for now, but I am concerned this code may be fragile so I would rather use a more robust approach; or maybe this is robust ? Any insight would be most welcome -- Thanks in advance --- PS. I am using a stock fedora20 box with [root@vnode11 ~]# rpm -q libvirt libvirt-1.1.3.2-1.fc20.x86_64

4 11

[libvirt] [PATCH] add nocow feature option to vol-create
by Chunyan Liu 23 Jan '14

23 Jan '14

Btrfs has terrible performance when hosting VM images, even more when the guest in those VM are also using btrfs as file system. One way to mitigate this bad performance is to turn off COW attributes on VM files (since having copy on write for this kind of data is not useful). According to 'chattr' manpage, NOCOW could be set to new or empty file only on btrfs, so this patch tries to add nocow feature option in volume xml and handle it in vol-create, so that users could have a chance to set NOCOW to a new volume if that happens on a btrfs like file system. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- This is a revised version to: http://www.redhat.com/archives/libvir-list/2013-December/msg00303.html Changes: * fix Daniel's comments --- docs/formatstorage.html.in | 12 +++++--- docs/schemas/storagefilefeatures.rng | 3 ++ src/conf/storage_conf.c | 9 ++++-- src/storage/storage_backend.c | 4 +- src/storage/storage_backend_fs.c | 48 ++++++++++++++++++++++++++++++++++ src/util/virstoragefile.c | 1 + src/util/virstoragefile.h | 1 + 7 files changed, 69 insertions(+), 9 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index a089a31..3de1a2b 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -385,6 +385,7 @@ <compat>1.1</compat> <features> <lazy_refcounts/> + <nocow/> </features> </target></pre> @@ -423,11 +424,14 @@ Since 1.1.0 </dd> <dt><code>features</code></dt> - <dd>Format-specific features. Only used for <code>qcow2</code> now. - Valid sub-elements are: - <ul> + <dd>Format-specific features. Valid sub-elements are: + <ul> <li><code><lazy_refcounts/></code> - allow delayed reference - counter updates. Since 1.1.0</li> + counter updates. Only used for <code>qcow2</code> now. + Since 1.1.0</li> + <li><code><nocow/></code> - turn off copy-on-write. Only valid + to volume on <code>btrfs</code>, can improve performance. + Since 1.2.2</li> </ul> </dd> </dl> diff --git a/docs/schemas/storagefilefeatures.rng b/docs/schemas/storagefilefeatures.rng index 424b4e2..0cf3513 100644 --- a/docs/schemas/storagefilefeatures.rng +++ b/docs/schemas/storagefilefeatures.rng @@ -17,6 +17,9 @@ <element name='lazy_refcounts'> <empty/> </element> + <element name='nocow'> + <empty/> + </element> </optional> </interleave> </element> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 22e38c1..b6409a6 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1398,9 +1398,6 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, if ((n = virXPathNodeSet("./target/features/*", ctxt, &nodes)) < 0) goto error; - if (!ret->target.compat && VIR_STRDUP(ret->target.compat, "1.1") < 0) - goto error; - if (!(ret->target.features = virBitmapNew(VIR_STORAGE_FILE_FEATURE_LAST))) goto error; @@ -1412,6 +1409,12 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, (const char*)nodes[i]->name); goto error; } + + if (f == VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS) { + if (!ret->target.compat && VIR_STRDUP(ret->target.compat, "1.1") < 0) + goto error; + } + ignore_value(virBitmapSetBit(ret->target.features, f)); } VIR_FREE(nodes); diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b08d646..b4ab866 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -423,7 +423,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, operation_flags |= VIR_FILE_OPEN_FORK; if ((fd = virFileOpenAs(vol->target.path, - O_RDWR | O_CREAT | O_EXCL, + O_RDWR | O_CREAT, vol->target.perms.mode, vol->target.perms.uid, vol->target.perms.gid, @@ -729,7 +729,7 @@ virStorageBackendCreateQemuImgOpts(char **opts, break; /* coverity[dead_error_begin] */ - case VIR_STORAGE_FILE_FEATURE_LAST: + default: ; } virBufferAsprintf(&buf, "%s,", diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 95783be..dc26f6d 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -51,6 +51,13 @@ #include "virfile.h" #include "virlog.h" #include "virstring.h" +#ifdef __linux__ +# include <sys/ioctl.h> +# include <linux/fs.h> +#ifndef FS_NOCOW_FL +#define FS_NOCOW_FL 0x00800000 /* Do not cow file */ +#endif +#endif #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1061,6 +1068,7 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn, { virStorageBackendBuildVolFrom create_func; int tool_type; + bool nocow; if (inputvol) { if (vol->target.encryption != NULL) { @@ -1090,6 +1098,46 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn, return -1; } + if (vol->target.features) + ignore_value(virBitmapGetBit(vol->target.features, + VIR_STORAGE_FILE_FEATURE_NOCOW, &nocow)); + if (nocow) { +#ifdef __linux__ + /* create an empty file and set nocow flag. + * This could optimize performance on file system like btrfs. + */ + int attr, fd; + int operation_flags = VIR_FILE_OPEN_FORCE_MODE | VIR_FILE_OPEN_FORCE_OWNER; + if (pool->def->type == VIR_STORAGE_POOL_NETFS) + operation_flags |= VIR_FILE_OPEN_FORK; + + if ((fd = virFileOpenAs(vol->target.path, + O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE, + vol->target.perms.mode, + vol->target.perms.uid, + vol->target.perms.gid, + operation_flags)) < 0) { + virReportSystemError(-fd, + _("Failed to create file '%s'"), + vol->target.path); + return -1; + } + + /* This is an optimisation. The FS_IOC_SETFLAGS ioctl return value will + * be ignored since any failure of this operation should not block the + * left work. + */ + if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0) { + attr |= FS_NOCOW_FL; + ioctl(fd, FS_IOC_SETFLAGS, &attr); + } + + VIR_FORCE_CLOSE(fd); +#endif + if (virBitmapClearBit(vol->target.features, VIR_STORAGE_FILE_FEATURE_NOCOW) < 0) + return -1; + } + if (create_func(conn, pool, vol, inputvol, flags) < 0) return -1; return 0; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index e45236f..6e34e4c 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -62,6 +62,7 @@ VIR_ENUM_IMPL(virStorageFileFormat, VIR_ENUM_IMPL(virStorageFileFeature, VIR_STORAGE_FILE_FEATURE_LAST, "lazy_refcounts", + "nocow", ) enum lv_endian { diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 7bd2fe0..f45743a 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -62,6 +62,7 @@ VIR_ENUM_DECL(virStorageFileFormat); enum virStorageFileFeature { VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS = 0, + VIR_STORAGE_FILE_FEATURE_NOCOW = 1, VIR_STORAGE_FILE_FEATURE_LAST }; -- 1.6.0.2

2 2

[libvirt] [PATCH 0/2] Storage: Fixes for the "fc_host" type pool
by Osier Yang 23 Jan '14

23 Jan '14

*** Enough details in the patch commits *** Osier Yang (2): storage: Fix autostart of pool with "fc_host" type adapter storage: Polling the sysfs for pool with "fc_host" type adapter src/storage/storage_backend_scsi.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) -- 1.8.1.4

2 17

[libvirt] [PATCH] storage: Fix the memory leak
by Osier Yang 23 Jan '14

23 Jan '14

The return value of virGetFCHostNameByWWN is a strdup'ed string. Also add comments to declare that the caller should take care of freeing it. --- src/storage/storage_backend_scsi.c | 15 ++++++++++----- src/util/virutil.c | 5 ++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index fce2bae..b38e530 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -668,6 +668,8 @@ static int deleteVport(virStoragePoolSourceAdapter adapter) { unsigned int parent_host; + char *name = NULL; + int ret = -1; if (adapter.type != VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) return 0; @@ -680,18 +682,21 @@ deleteVport(virStoragePoolSourceAdapter adapter) if (!adapter.data.fchost.parent) return 0; - if (!(virGetFCHostNameByWWN(NULL, adapter.data.fchost.wwnn, - adapter.data.fchost.wwpn))) + if (!(name = virGetFCHostNameByWWN(NULL, adapter.data.fchost.wwnn, + adapter.data.fchost.wwpn))) return -1; if (getHostNumber(adapter.data.fchost.parent, &parent_host) < 0) - return -1; + goto cleanup; if (virManageVport(parent_host, adapter.data.fchost.wwpn, adapter.data.fchost.wwnn, VPORT_DELETE) < 0) - return -1; + goto cleanup; - return 0; + ret = 0; +cleanup: + VIR_FREE(name); + return ret; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 87cc2e7..7a2fbb0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1820,7 +1820,10 @@ cleanup: /* virGetHostNameByWWN: * * Iterate over the sysfs tree to get FC host name (e.g. host5) - * by wwnn,wwpn pair. + * by the provided "wwnn,wwpn" pair. + * + * Returns the FC host name which must be freed by the caller, + * or NULL on failure. */ char * virGetFCHostNameByWWN(const char *sysfs_prefix, -- 1.8.1.4

2 2

[libvirt] [libvirt-java] state of affairs
by Claudio Bley 23 Jan '14

23 Jan '14

Hi. It seems the Java wrapper is nearly dead. It has fallen way behind libvirt development. [in my local tree, there're still 120 libvirt API functions missing from the Java interface which /probably/ are worth to be added] I have send a few patches to the list, but no one is willing / able to review them. Some of those patches date almost a year back. Slowly I'm getting a bit frustrated and maybe also a tad impatient... Currently, I'm having +60 commits in my local git tree. As you might imagine, I'd really like to get these off my back. That's why I'm asking myself whether the ACKing / NACKing of patches is the right model for libvirt-java, given that there is, apparently, very little interest and at the same time next to nobody with good Java expertise on the list. Additionally, there are a few glitches in the API which are a thorn in my side ever since I began using the libvirt Java wrapper. It's obvious that the wrapper was written without much thinking about the Java environment and API. Some functions have only been wrapped just because it was possible or perhaps to just have a full coverage of libvirt version x.y.z, without any real use for a Java programmer. Do we really have to live with the failures of the past? I'd really like to fix these even if that means *breaking* the API. IMO, this would not be that bad in the Java world. It's not like that you suddenly happen to have an updated dynamic library on the system that's missing some symbols or has it's ABI changed which makes your program crash. Java libraries come with the API bundled and you get an error at the earliest time possible - at compilation time. Even if you upgrade a jar without recompiling your program you'll get a nice RuntimeException instead of undefined behavior. So, I'd say just bump the major or minor version up to the next number and send out a big "SORRY, we messed up" to everyone and be done with it. Alternatively, change the package and the artifact name to libvirt2 effectively creating some sort of fork?! But, given that there's not much review on list, failures are likely to happen again and the same situation would arise anew. Thank you. Claudio -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

2 2

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1898
by Jenkins CI 23 Jan '14

23 Jan '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1898/> ------------------------------------------ Started by upstream project "libvirt-build" build number 2132 Started by upstream project "libvirt-build" build number 2133 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson9098701041827209295.sh + make syntax-check GEN bracket-spacing-check src/util/virscsi.c:206: dev->shareable= shareable; maint.mk: incorrect whitespace, see HACKING for rules make: *** [bracket-spacing-check] Error 1 Build step 'Execute shell' marked build as failure

2 2

[libvirt] [PATCH] qemu: remove memset params array to zero in qemuDomainGetPercpuStats
by Gao feng 23 Jan '14

23 Jan '14

the array params is allocated by VIR_ALLOC_N in remoteDispatchDomainGetCPUStats. it had been set to zero. No need to reset it to zero again, and this reset here is incorrect too, nparams * ncpus is the array length not the size of params array. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index df4f5b5..1e54164 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15818,7 +15818,6 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, if (virCgroupGetCpuacctPercpuUsage(priv->cgroup, &buf)) goto cleanup; pos = buf; - memset(params, 0, nparams * ncpus); /* return percpu cputime in index 0 */ param_idx = 0; -- 1.8.4.2

2 1

[libvirt] [PATCH 0/2 v2] Fixes on shareable SCSI host device
by Osier Yang 23 Jan '14

23 Jan '14

*** BLURB HERE *** Osier Yang (2): util: Add "shareable" field for virSCSIDevice struct qemu: Don't fail if the SCSI host device is shareable between domains src/libvirt_private.syms | 3 +- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_hostdev.c | 84 ++++++++++++++++++++++------------------ src/security/security_apparmor.c | 3 +- src/security/security_dac.c | 6 ++- src/security/security_selinux.c | 6 ++- src/util/virscsi.c | 59 +++++++++++++++++++++++----- src/util/virscsi.h | 11 ++++-- 8 files changed, 116 insertions(+), 59 deletions(-) -- 1.8.1.4

2 12

[libvirt] [PATCH v3] virsh nodecpustats returns incorrect stats of cpu on Linux when the number of online cpu exceed 9.
by mars＠linux.vnet.ibm.com 23 Jan '14

23 Jan '14

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function simply uses STRPREFIX() to match the cpuid with the cpuid read from /proc/stat, it will cause obvious error. For example: 'virsh nodecpustats 1' will display stats of cpu1* if the latter is online and cpu1 is offline. This patch fixes this bug. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 05bc038..cf6d29b 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -691,7 +691,7 @@ linuxNodeGetCPUStats(FILE *procstat, char line[1024]; unsigned long long usr, ni, sys, idle, iowait; unsigned long long irq, softirq, steal, guest, guest_nice; - char cpu_header[3 + INT_BUFSIZE_BOUND(cpuNum)]; + char cpu_header[4 + INT_BUFSIZE_BOUND(cpuNum)]; if ((*nparams) == 0) { /* Current number of cpu stats supported by linux */ @@ -708,9 +708,9 @@ linuxNodeGetCPUStats(FILE *procstat, } if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { - strcpy(cpu_header, "cpu"); + strcpy(cpu_header, "cpu "); } else { - snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); + snprintf(cpu_header, sizeof(cpu_header), "cpu%d ", cpuNum); } while (fgets(line, sizeof(line), procstat) != NULL) { -- 1.7.7.6

2 1

[libvirt] [PATCH] util: Correct the NUMA node range checking
by Osier Yang 23 Jan '14

23 Jan '14

There are 2 issues here: First we shouldn't add "1" to the return value of numa_max_node(), since the semanteme of the error message was changed, it's not saying about the number of total NUMA nodes anymore. Second, the value of "bit" is the position of the first bit which exceeds either numa_max_node() or NUMA_NUM_NODES, it can be any number in the range, so saying "bigger than $bit" is quite confused now. For example, assuming there is a NUMA machine which has 10 NUMA nodes, and one specifies the "nodeset" as "0,5,88", the error message will be like: Nodeset is out of range, host cannot support NUMA node bigger than 88 It sounds like all NUMA node number less than 88 is fine, but actually the maximum NUMA node number the machine supports is 9. This patch fixes the issues by removing the addition with "1" and simplifies the error message as "NUMA node $bit is out of range". --- src/util/virnuma.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index ab46591..500dca7 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -99,7 +99,6 @@ virNumaSetupMemoryPolicy(virNumaTuneDef numatune, int ret = -1; int bit = 0; size_t i; - int maxnode = 0; virBitmapPtr tmp_nodemask = NULL; if (numatune.memory.placement_mode == @@ -122,16 +121,13 @@ virNumaSetupMemoryPolicy(virNumaTuneDef numatune, return -1; } - maxnode = numa_max_node() + 1; - /* Convert nodemask to NUMA bitmask. */ nodemask_zero(&mask); bit = -1; while ((bit = virBitmapNextSetBit(tmp_nodemask, bit)) >= 0) { - if (bit > maxnode || bit > NUMA_NUM_NODES) { + if (bit > numa_max_node() || bit > NUMA_NUM_NODES) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Nodeset is out of range, host cannot support " - "NUMA node bigger than %d"), bit); + _("NUMA node %d is out of range"), bit); return -1; } nodemask_set(&mask, bit); -- 1.8.1.4

2 2

[libvirt] mingw64 + gnulib time.h / pthread.h / gmtime_r incompatibility
by Daniel P. Berrange 23 Jan '14

23 Jan '14

I'm attempting to make libvirt capable of building with mingw64 toolchain's pthread.h, instead of directly using Windows thread primitives. As a quick hack I just changed libvirt logic to force use of pthreads, since configure is already doing the neccessary pthread.h probes for us even on win32 eg diff --git a/src/util/virthread.c b/src/util/virthread.c index dd1768e..8849d7d 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -25,7 +25,7 @@ /* On mingw, we prefer native threading over the sometimes-broken * pthreads-win32 library wrapper. */ -#ifdef WIN32 +#ifdef WINx32 # include "virthreadwin32.c" #elif defined HAVE_PTHREAD_MUTEXATTR_INIT # include "virthreadpthread.c" diff --git a/src/util/virthread.h b/src/util/virthread.h index 84d3bdc..649285e 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -111,7 +111,7 @@ int virThreadLocalInit(virThreadLocalPtr l, void *virThreadLocalGet(virThreadLocalPtr l); int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK; -# ifdef WIN32 +# ifdef WINx32 # include "virthreadwin32.h" # elif defined HAVE_PTHREAD_MUTEXATTR_INIT # include "virthreadpthread.h" When attempting to build though I see failures CC util/libvirt_util_la-virerror.lo In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/sys/time.h:10:0, from ../gnulib/lib/sys/time.h:39, from ../gnulib/lib/sys/select.h:117, from util/virutil.h:31, from util/virerror.c:35: ../gnulib/lib/time.h:468:21: error: expected identifier or '(' before '{' token _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, ^ In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/sys/time.h:10:0, from ../gnulib/lib/sys/time.h:39, from ../gnulib/lib/sys/select.h:117, from util/virutil.h:31, from util/virerror.c:35: ../gnulib/lib/time.h:490:21: error: expected identifier or '(' before '{' token _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, ^ The problem appears to be that mingw64's pthread.h has the following craziness: /* Recursive API emulation. */ #undef localtime_r #define localtime_r(_Time, _Tm) ({ struct tm *___tmp_tm; \ pthread_testcancel(); \ ___tmp_tm = localtime((_Time));\ if (___tmp_tm) { \ *(_Tm) = *___tmp_tm; \ ___tmp_tm = (_Tm); \ } \ ___tmp_tm; }) #undef gmtime_r #define gmtime_r(_Time,_Tm) ({ struct tm *___tmp_tm; \ pthread_testcancel(); \ ___tmp_tm = gmtime((_Time)); \ if (___tmp_tm) { \ *(_Tm) = *___tmp_tm; \ ___tmp_tm = (_Tm); \ } \ ___tmp_tm; }) which clashes with the gnulib provided declarations for gmtime_r/localtime_r gnulib appears to be trying to workaround this problem already - the generated gnulib/lib/time.h file shows this though, which indicates its workaround hasn't been activated by 'configure': /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). Or they define it with the wrong member names or define it in <sys/time.h> (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the pthreads-win32 library defines it in <pthread.h>. */ # if ! 1 # if 0 # include <sys/time.h> # elif 0 # include <pthread.h> /* The pthreads-win32 <pthread.h> also defines a couple of broken macros. */ # undef asctime_r # undef ctime_r # undef gmtime_r # undef localtime_r # undef rand_r # undef strtok_r # else ie I would have expected that 'elif' to be 1 instead of 0. It seems the logic in gnulib/m4/time_h.m4 is incorrect. The configure check shows checking for struct timespec in <time.h>... yes and so time_h.m4 never gets as far as trying to detect the broken pthreads.h - its hidden in an unreachable else block. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH] api: require write permission for guest agent interaction
by Eric Blake 23 Jan '14

23 Jan '14

I noticed that we allow virDomainGetVcpusFlags even for read-only connections, but that with a flag, it can require guest agent interaction. It is feasible that a malicious guest could intentionally abuse the replies it sends over the guest agent connection to possibly trigger a bug in libvirt's JSON parser, or withhold an answer so as to prevent the use of the agent in a later command such as a shutdown request. Although we don't know of any such exploits now (and therefore don't mind posting this patch publicly without trying to get a CVE assigned), it is better to err on the side of caution and explicitly require full access to any domain where the API requires guest interaction to operate correctly. I audited all commands that are marked as conditionally using a guest agent. Note that at least virDomainFSTrim is documented as needing a guest agent, but that such use is unconditional depending on the hypervisor (so the existing domain:fs_trim ACL should be sufficient there, rather than also requirng domain:write). But when designing future APIs, such as the plans for obtaining a domain's IP addresses, we should copy the approach of this patch in making interaction with the guest be specified via a flag, and use that flag to also require stricter access checks. * src/libvirt.c (virDomainGetVcpusFlags): Forbid guest interaction on read-only connection. (virDomainShutdownFlags, virDomainReboot): Improve docs on agent interaction. * src/remote/remote_protocol.x (REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML) (REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS) (REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS, REMOTE_PROC_DOMAIN_REBOOT) (REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS): Require domain:write for any conditional use of a guest agent. * src/xen/xen_driver.c: Fix clients. * src/libxl/libxl_driver.c: Likewise. * src/uml/uml_driver.c: Likewise. * src/qemu/qemu_driver.c: Likewise. * src/lxc/lxc_driver.c: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/libvirt.c | 12 +++++++++--- src/libxl/libxl_driver.c | 6 +++--- src/lxc/lxc_driver.c | 4 ++-- src/qemu/qemu_driver.c | 8 ++++---- src/remote/remote_protocol.x | 5 +++++ src/uml/uml_driver.c | 2 +- src/xen/xen_driver.c | 6 +++--- 7 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 6a41fd7..c15e29a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3134,6 +3134,9 @@ error: * in which the hypervisor tries each shutdown method is undefined, * and a hypervisor is not required to support all methods. * + * To use guest agent (VIR_DOMAIN_SHUTDOWN_GUEST_AGENT) the domain XML + * must have <channel> configured. + * * Returns 0 in case of success and -1 in case of failure. */ int @@ -3180,7 +3183,7 @@ error: * * If @flags is set to zero, then the hypervisor will choose the * method of shutdown it considers best. To have greater control - * pass one or more of the virDomainShutdownFlagValues. The order + * pass one or more of the virDomainRebootFlagValues. The order * in which the hypervisor tries each shutdown method is undefined, * and a hypervisor is not required to support all methods. * @@ -9347,7 +9350,7 @@ error: * current virtual CPU count. * * If @flags includes VIR_DOMAIN_VCPU_GUEST, then the state of the processors - * is modified in the guest instead of the hypervisor. This flag is only usable + * is queried in the guest instead of the hypervisor. This flag is only usable * on live domains. Guest agent may be needed for this flag to be available. * * Returns the number of vCPUs in case of success, -1 in case of failure. @@ -9362,6 +9365,10 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) virResetLastError(); virCheckDomainReturn(domain, -1); + conn = domain->conn; + + if (flags & VIR_DOMAIN_VCPU_GUEST) + virCheckReadOnlyGoto(conn->flags, error); /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && @@ -9372,7 +9379,6 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) __FUNCTION__); goto error; } - conn = domain->conn; if (conn->driver->domainGetVcpusFlags) { int ret; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 4115fff..fc0efa2 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1409,7 +1409,7 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -1456,7 +1456,7 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; - if (virDomainRebootEnsureACL(dom->conn, vm->def) < 0) + if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -2316,7 +2316,7 @@ libxlDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; - if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; active = virDomainObjIsActive(vm); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4c2744d..4c716ef 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2721,7 +2721,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, priv = vm->privateData; - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -2798,7 +2798,7 @@ lxcDomainReboot(virDomainPtr dom, priv = vm->privateData; - if (virDomainRebootEnsureACL(dom->conn, vm->def) < 0) + if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7059f7a..8006882 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1835,7 +1835,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { if (agentRequested || (!flags && priv->agent)) useAgent = true; - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (priv->agentError) { @@ -1936,7 +1936,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) priv = vm->privateData; - if (virDomainRebootEnsureACL(dom->conn, vm->def) < 0) + if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if ((flags & VIR_DOMAIN_REBOOT_GUEST_AGENT) || @@ -4898,7 +4898,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) priv = vm->privateData; - if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!(caps = virQEMUDriverGetCapabilities(driver, false))) @@ -13070,7 +13070,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cfg = virQEMUDriverGetConfig(driver); - if (virDomainSnapshotCreateXMLEnsureACL(domain->conn, vm->def) < 0) + if (virDomainSnapshotCreateXMLEnsureACL(domain->conn, vm->def, flags) < 0) goto cleanup; if (!(caps = virQEMUDriverGetCapabilities(driver, false))) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 5a82395..8238405 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3185,6 +3185,7 @@ enum remote_procedure { /** * @generate: both * @acl: domain:init_control + * @acl: domain:write:VIR_DOMAIN_REBOOT_GUEST_AGENT */ REMOTE_PROC_DOMAIN_REBOOT = 27, @@ -4278,6 +4279,7 @@ enum remote_procedure { /** * @generate: both * @acl: domain:snapshot + * @acl: domain:write:VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE */ REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML = 185, @@ -4370,12 +4372,14 @@ enum remote_procedure { * @acl: domain:write * @acl: domain:save:!VIR_DOMAIN_AFFECT_CONFIG|VIR_DOMAIN_AFFECT_LIVE * @acl: domain:save:VIR_DOMAIN_AFFECT_CONFIG + * @acl: domain:write:VIR_DOMAIN_VCPU_GUEST */ REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS = 199, /** * @generate: both * @acl: domain:read + * @acl: domain:write:VIR_DOMAIN_VCPU_GUEST */ REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS = 200, @@ -4762,6 +4766,7 @@ enum remote_procedure { /** * @generate: both * @acl: domain:init_control + * @acl: domain:write:VIR_DOMAIN_SHUTDOWN_GUEST_AGENT */ REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS = 258, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index f286f41..89afefe 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1635,7 +1635,7 @@ static int umlDomainShutdownFlags(virDomainPtr dom, goto cleanup; } - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; #if 0 diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 65c3a5c..c45d980 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -952,7 +952,7 @@ xenUnifiedDomainShutdownFlags(virDomainPtr dom, if (!(def = xenGetDomainDefForDom(dom))) goto cleanup; - if (virDomainShutdownFlagsEnsureACL(dom->conn, def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, def, flags) < 0) goto cleanup; ret = xenDaemonDomainShutdown(dom->conn, def); @@ -979,7 +979,7 @@ xenUnifiedDomainReboot(virDomainPtr dom, unsigned int flags) if (!(def = xenGetDomainDefForDom(dom))) goto cleanup; - if (virDomainRebootEnsureACL(dom->conn, def) < 0) + if (virDomainRebootEnsureACL(dom->conn, def, flags) < 0) goto cleanup; ret = xenDaemonDomainReboot(dom->conn, def); @@ -1526,7 +1526,7 @@ xenUnifiedDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) if (!(def = xenGetDomainDefForDom(dom))) goto cleanup; - if (virDomainGetVcpusFlagsEnsureACL(dom->conn, def) < 0) + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, def, flags) < 0) goto cleanup; ret = xenUnifiedDomainGetVcpusFlagsInternal(dom, def, flags); -- 1.8.4.2

2 2

[libvirt] LSN-2013-0020: libvirtd crash when hot-plugging disks for qemu domains
by Eric Blake 23 Jan '14

23 Jan '14

Libvirt Security Notice: LSN-2013-0020 ====================================== Summary: libvirtd crash when hot-plugging disks for qemu domains Reported on: 20131220 Published on: 20131213 Fixed on: 20140107 Reported by: Alexandre M <alexandre.mclean(a)ubisoft.com> Patched by: Jiri Denemark <jdenemar(a)redhat.com> See also: CVE-2013-6458, redhat bug #1043069 Description ----------- Several methods in the qemu block driver were accessing details about disks associated with a domain outside of a job lock. If another connection is adding or removing disks, the details in use by the first connection could become stale and lead to a libvirtd crash. Among the methods impacted, it is possible to trigger the race from four APIs accessible from read-only clients: virDomainBlockStats, virDomainGetBlockInfo, virDomainGetBlockJobInfo, and virDomainGetBlockIoTune. Impact ------ Each of the four affected APIs could be used by any user that can connect through the read-only libvirtd UNIX domain socket. Also, if ACLs are active, access to the affected APIs is granted to any user with the 'read' permission on the 'domain' object, which is granted by default to all users. As a result an unprivileged user will be able to inflict a denial of service attack on other users of the libvirtd daemon with higher privilege. Workaround ---------- The impact can be mitigated by blocking access to the read-only libvirtd UNIX domain socket, with policykit or the 'auth_unix_ro' parameter in '/etc/libvirt/libvirtd.conf'. If ACLs are active, the 'read' permission should be removed from any untrusted users. This will not prevent the crash, but will stop unprivileged users from inflicting the denial of service on higher privileged users. Additionally, avoiding disk hot-plug actions is sufficient to avoid the problem. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v0.8.2 Broken in: v0.8.3 Broken in: v0.8.4 Broken in: v0.8.5 Broken in: v0.8.6 Broken in: v0.8.7 Broken in: v0.8.8 Broken in: v0.9.0 Broken in: v0.9.1 Broken in: v0.9.2 Broken in: v0.9.3 Broken in: v0.9.4 Broken in: v0.9.5 Broken in: v0.9.6 Broken in: v0.9.7 Broken in: v0.9.8 Broken in: v0.9.9 Broken in: v0.9.10 Broken in: v0.9.11 Broken in: v0.9.12 Broken in: v0.9.13 Broken in: v0.10.0 Broken in: v0.10.1 Broken in: v0.10.2 Broken in: v1.0.0 Broken in: v1.0.1 Broken in: v1.0.2 Broken in: v1.0.3 Broken in: v1.0.4 Broken in: v1.0.5 Broken in: v1.0.6 Broken in: v1.1.0 Broken in: v1.1.1 Broken in: v1.1.2 Broken in: v1.1.3 Broken in: v1.1.4 Broken in: v1.2.0 Fixed in: v1.2.1 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: db86da5ca2109e4006c286a09b6c75bfe10676ad Fixed by: b799259583bd65c0b2f5042e6c3ff19637ade881 Fixed by: f93d2caa070f6197ab50d372d286018b0ba6bbd8 Fixed by: 3b56425938e2f97208d5918263efa0d6439e4ecd Branch: v0.8.3-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Branch: v0.9.6-maint Broken in: v0.9.6.1 Broken in: v0.9.6.2 Broken in: v0.9.6.3 Broken in: v0.9.6.4 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Branch: v0.9.11-maint Broken in: v0.9.11.1 Broken in: v0.9.11.2 Broken in: v0.9.11.3 Broken in: v0.9.11.4 Broken in: v0.9.11.5 Broken in: v0.9.11.6 Broken in: v0.9.11.7 Broken in: v0.9.11.8 Broken in: v0.9.11.9 Broken in: v0.9.11.10 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Branch: v0.9.12-maint Broken in: v0.9.12.1 Broken in: v0.9.12.2 Fixed in: v0.9.12.3 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: c430c002dd8287c5d7b834993ddfbd61435248c4 Fixed by: 4dd29d3bdf4bf3a4c4b1077ddf4355bcf548ca2f Fixed by: 3e7d9e54e9ce286fe1bee5d32089cd58d63e5cee Fixed by: 2786686eb5855e0046817d47055cd784881ca8cb Branch: v0.10.2-maint Broken in: v0.10.2.1 Broken in: v0.10.2.2 Broken in: v0.10.2.3 Broken in: v0.10.2.4 Broken in: v0.10.2.5 Broken in: v0.10.2.6 Broken in: v0.10.2.7 Broken in: v0.10.2.8 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 5f5e9eb23dead857b1858da8b97a6cb0442fabed Fixed by: 7a9bcfa1ccc190e33e6fa931df8143cc9623cf24 Fixed by: 95836cb26b1d91b8e9eba0c4764bc24cccc78684 Fixed by: f59d02c487659e9d9f8e152673a0fe4d612172b2 Branch: v1.0.2-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 561b03f9165a860139edd3c03bb3e35a2c2f85ca Fixed by: 324279f2c867f404712c659adc4f399f8d343eda Fixed by: c973eb035ee0d8863d0f2ed25f0523e3e7fee433 Fixed by: d0a4e2498d7d3b1cf1683b0720b9bc6edabcd364 Branch: v1.0.3-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 59d46c6cd5cb892ce68e83c99c14023f29e073a7 Fixed by: 12ca0aaf2fc32647d3a570780a2c7467a26b0ecd Fixed by: da2d96d12521a20305d0ea3190539e1c4b367d75 Fixed by: c51986ba820dde30e48b4f1694862c3cf4d8b7ec Branch: v1.0.4-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: d003b8f294801adfc655096cfc80480e7f2e17ae Fixed by: e966f1155ccb1c4e3ddc41a02b1107af2d98f98d Fixed by: fa5c087aef266e27a0641c720bbbf95cd5ace6b1 Fixed by: 473b751d895d248f37766bab32e20ee00ac3913a Branch: v1.0.5-maint Broken in: v1.0.5.1 Broken in: v1.0.5.2 Broken in: v1.0.5.3 Broken in: v1.0.5.4 Broken in: v1.0.5.5 Broken in: v1.0.5.6 Broken in: v1.0.5.7 Broken in: v1.0.5.8 Fixed in: v1.0.5.9 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: c67b0de046b16dca352537e8f39ff935a5fded76 Fixed by: 923319189022c5806da01b963dddd8dff0d6c747 Fixed by: 6cd879829aaf02f56182feb16b4284d5b3fdcfd7 Fixed by: dee5fc756648e62062da3366583fc343413e1ba7 Branch: v1.0.6-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 938ef6e611b39630b00b368b8b8d7db7e619ed99 Fixed by: 6eae1538c1d5b7aaee34f3ca81389906d8af0626 Fixed by: 8bdc22d281105fe32c85da58faf817ab9b2da369 Fixed by: ac8feea58029fea294c3c60c220592ca7c9734c8 Branch: v1.1.0-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 5efb996317f1f8a57fea625526075be9ef84e69c Fixed by: c1f8276a81de8d31578f16cc6bfdafc5e807427d Fixed by: 1478ebf2bcadbaf3b66d9e91086bcca39a41bb65 Fixed by: 8cc2474f0645fab308090f477e98317b0dff485f Branch: v1.1.1-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 84c251faec7a0003863fe1c9b1abc7960f395faa Fixed by: 3451828a28a333e570af621eceb93245763fa044 Fixed by: 571629b2dfd2eeb8001efddac2569b12621d1db3 Fixed by: c5b379e17daa2f641363712212a18b3b31cacdea Branch: v1.1.2-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 17db7e28a1ec77382bb8fa96205ef2cf6deefa88 Fixed by: 54cb7f05ec5c822bb786833367dc80327648f2c0 Fixed by: bcb9a035a99cf8389069c401c94605aedccdc4df Fixed by: 82daa87f6a020ba2d1274b300f8e95f903fbe0f8 Branch: v1.1.3-maint Broken in: v1.1.3.1 Broken in: v1.1.3.2 Fixed in: v1.1.3.3 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 1bfc35e3f837ab7b399fe664281b7db06db96a05 Fixed by: 0e98442e3bcbf832f49a6d36f94558bb026e3f3a Fixed by: 7354aaf4607beaa9f4a6d68e3b26a28c97494e58 Fixed by: a7844b9ec2718dad9f5e5316cc0673e95098d812 Branch: v1.1.4-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: c8fa19d9e385d8bae368385aece1c3f493be4e71 Fixed by: 4ee6ed6f50a71868fbb8a5f28edbcfd7170f5bf5 Fixed by: 36c1691c6d61aa5a0d9a65d64bc3af3e15692d62 Fixed by: 8fcc0f0237f728361065caf6fac0fce1965230a0 Branch: v1.2.0-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 13051a86cb093d4c421a8669ccd7591578d004aa Fixed by: 3a0286f978c19ecc7b2ef2242b33688239428f85 Fixed by: 4d8c603ca2cb1fb70c0e0d2e0d51d1fe3261c7b9 Fixed by: c6fbbe85aa496d178d5e4188bee166a5abb97029 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] LSN-2013-0019: libvirtd crash when reading numa tunables for libxl guest in shutoff status
by Eric Blake 23 Jan '14

23 Jan '14

Libvirt Security Notice: LSN-2013-0019 ====================================== Summary: libvirtd crash when reading numa tunables for libxl guest in shutoff status Reported on: 20131220 Published on: 20131220 Fixed on: 20131220 Reported by: Dario Faggioli <dario.faggioli(a)citrix.com> Patched by: Dario Faggioli <dario.faggioli(a)citrix.com> See also: CVE-2013-6457 Description ----------- The libxlDomainGetNumaParameters method in the libxl driver did not check whether the guest being accessed was running or not. When shutoff, the code attempts to clean up an uninitialized bitmap, causing malloc corruption most commonly observed as a crash. Impact ------ A user who has permission to invoke the virDomainGetNumaParameters API against the libxl driver will be able to crash the libvirtd daemon. Access to this API is granted to any user who connects to the read-only libvirtd UNIX domain socket. If ACLs are active, access is granted to any user with the 'read' permission on the 'domain' object, which is granted by default to all users. As a result an unprivileged user will be able to inflict a denial of service attack on other users of the libvirtd daemon with higher privilege. Workaround ---------- The impact can be mitigated by blocking access to the read-only libvirtd UNIX domain socket, with policykit or the 'auth_unix_ro' parameter in '/etc/libvirt/libvirtd.conf'. If ACLs are active, the 'read' permission should be removed from any untrusted users. This will not prevent the crash, but will stop unprivileged users from inflicting the denial of service on higher privileged users. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v1.1.1 Broken in: v1.1.2 Broken in: v1.1.3 Broken in: v1.1.4 Broken in: v1.2.0 Fixed in: v1.2.1 Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: f9ee91d35510ccbc6fc42cef8864b291b2d220f4 Branch: v1.1.1-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: d5f89a6dd725baf8bca1f1e28f5b858bf0053a99 Branch: v1.1.2-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 52c40003805f1702f103095dc5c3d00cf38e7a82 Branch: v1.1.3-maint Broken in: v1.1.3.1 Broken in: v1.1.3.2 Fixed in: v1.1.3.3 Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 5904ba60159ce67826f301e78103191600a07600 Branch: v1.1.4-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 626eb91f964a032af56b448e63fde9f74e592290 Branch: v1.2.0-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 36378d1a41464517d7c31d8854fcfd8f69221409 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH v3] vbox: add support for v4.2.20+ and v4.3.4+
by Manuel VIVES 22 Jan '14

22 Jan '14

Hi, While working on adding virDomain*Stats support to the vbox driver, we found bugs in the VirtualBox API C bindings. These bugs have been fixed in versions 4.2.20 and 4.3.4. However, the changes in the C bindings are incompatible with the vbox_CAPI_v4_2.h and vbox_CAPI_v4_3.h files which are bundled in libvirt source code. This is why the following patch adds vbox_CAPI_v4_2_20.h and vbox_CAPI_v4_3_4.h. As stated by Matthias Bolte, the actual underlying problem here is that libvirt assumes that VirtualBox API can only change between release versions (4.2 -> 4.3), but we have a case here where it changed (or got fixed) between minor versions (4.2.18 -> 4.2.20). This patch makes the VBOX_API_VERSION represent the full API version number (i.e 4002 => 4002000) so there are specific version numbers for Vbox 4.2.20 (4002020) and 4.3.4 (4003004) As the patch is too big for the mailing list, it is publicly available at http://git-lab.diateam.net/cots/libvirt.git/ with the branch name 'vbox-4.2.20-4.3.4-support-v3' Regards, Manuel VIVES v3: - Changed the commit message for being more precise. - Resend after freeze.

2 1

[libvirt] [PATCH 0/6] Coverity cleanups
by John Ferlan 22 Jan '14

22 Jan '14

A recent Coverity version update discovered some existing issues (and some benign cases). This patch set cleans them all up. John Ferlan (6): VSMS: Coverity cleanups libxkutil:pool_parsing: Coverity cleanups libxkutil:device_parsing: Coverity cleanups libxkutil/xml_parse_test: Coverity cleanup RAFP: Coverity cleanup EAFP: Coverity cleanup libxkutil/device_parsing.c | 41 +++++++++++++++++-------------- libxkutil/pool_parsing.c | 39 +++++++++++++++-------------- libxkutil/xml_parse_test.c | 1 + src/Virt_ElementAllocatedFromPool.c | 6 ++++- src/Virt_ResourceAllocationFromPool.c | 7 ++++-- src/Virt_SettingsDefineCapabilities.c | 2 +- src/Virt_VirtualSystemManagementService.c | 11 ++++++--- 7 files changed, 63 insertions(+), 44 deletions(-) -- 1.8.4.2

2 10

[libvirt] [RFC PATCH 0/7] Adding 'config' driver
by Adam Walters 22 Jan '14

22 Jan '14

This patchset adds a driver named 'config' that allows access to configuration data, such as secret and storage definitions. This is a pre-requisite for my next patchset which resolves the race condition on libvirtd startup and the circular dependencies between QEMU and the storage driver. The basic rationale behind this idea is that there exist circumstances under which a driver may need to access things such as secrets during a time at which there is no active connection to a hypervisor. Without a connection, the data can't be accessed currently. I felt that this was a much simpler solution to the problem that building new APIs that do not require a connection to operate. This driver is technically what one may call a hypervisor driver, but it does not implement any domain operations. It simply exists to handle requests by drivers for access to informatino that would otherwise require a connection. The URI used for this driver is 'config:///' and has been tested working on 4 different machines of mine, running three different distributions of Linux (Archlinux, Gentoo, and CentOS). Being a very simple driver, I would expect it to work pretty much anywhere. I would love to hear any comments and suggestions you may have about this driver. At the very least this plus my next patchset resolves the startup race condition on my machine. If a more robust setup (likely a new internal API) is in the works, this driver could act as a band-aid to allow access to this type of data in the interim if a better resolution is a ways off. Adam Walters (7): config: Adding source for the config driver config: Adding header for the config driver virterror: Adding a new VIR_FROM_ define libvirtd: Add config driver hooks po: Add config_driver.c to POTFILES.in configure: Add config driver to configure script Makefile: Add config driver to src/Makefile.am configure.ac | 10 ++ daemon/libvirtd.c | 21 ++-- include/libvirt/virterror.h | 2 + po/POTFILES.in | 1 + src/Makefile.am | 25 +++++ src/config/config_driver.c | 237 ++++++++++++++++++++++++++++++++++++++++++++ src/config/config_driver.h | 44 ++++++++ src/util/virerror.c | 2 + 8 files changed, 336 insertions(+), 6 deletions(-) create mode 100644 src/config/config_driver.c create mode 100644 src/config/config_driver.h -- 1.8.5.2

4 22

[libvirt] [PATCH v2]qemu:sheepdog correct OR to AND Permit qemu to access sheepdog volume on sheepdog's pool
by joel SIMOES 22 Jan '14

22 Jan '14

From: root <joel.simoes(a)laposte.net> --- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 7a0bee2..9cf2767 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1403,7 +1403,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) || (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { + if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI ) && (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " "storage pool is of iscsi type or only direct for sheepdog ")); -- 1.8.3.2

3 2

[libvirt] [sec-notice PATCH 1/2] maint: typo fixes
by Eric Blake 22 Jan '14

22 Jan '14

Noticed this while working on some additions. * docs/schema.txt: Typo fixes. * README: Refer to the schema. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- README | 5 +++-- docs/schema.txt | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README b/README index 426d9ca..fa7f103 100644 --- a/README +++ b/README @@ -5,11 +5,12 @@ This repository records all Libvirt Security Notices that are issued. Notices must only added to this repository once any embargo is -lifted, since the GIT repository is fully public +lifted, since the GIT repository is fully public. Notices are written in XML in a file "notices/$YEAR/$NUM.xml" eg notices/2014/0001.xml. Assign numbers incrementally as -new issues are reported. +new issues are reported. More details on the XML format can +be found in "docs/schema.txt". When a new notice is published for the first time, send the text rendering of the notice to the libvirt-announce(a)redhat.com diff --git a/docs/schema.txt b/docs/schema.txt index ca8203a..189abef 100644 --- a/docs/schema.txt +++ b/docs/schema.txt @@ -2,7 +2,7 @@ ============================== The top level element of a libvirt security notice has -a name of "security-notice" and is in a XML namespace +a name of "security-notice" and is in an XML namespace of http://security.libvirt.org/xmlns/security-notice/1.0 Basic metadata @@ -45,7 +45,7 @@ resources. It will have one or more child elements which can be either "advisory" or "bug". An "advisory" element includes a "type" and "id" attribute where "type" is currently allowed to be "CVE" and "id" is the identifier -of the report. A "bug" elements incudes "tracker" and +of the report. A "bug" elements includes "tracker" and "id" attribute where "tracker" is allowed to be "redhat", "debian" or a short name for another vendors' bug tracker. @@ -74,7 +74,7 @@ Product data The "product" element provides information about the codebase of the affected products. The "name" attribute is the name of a libvirt product, typically based on the tar.gz archive name -with the suffice stripped. This contains a child "repository" +with the suffix stripped. This contains a child "repository" element which is a URL to the master GIT repository. There is then one or more "branch" elements which details the state of affected branches. -- 1.8.4.2

2 12

[libvirt] [PATCH]qemu:sheepdog Permit qemu to access sheepdog volume on sheepdog's pool
by joel SIMOES 22 Jan '14

22 Jan '14

From: Joël Simoes <jsimoes@jsimoes> --- src/qemu/qemu_conf.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4378791..2d2f428 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1185,6 +1185,56 @@ int qemuDriverAllocateID(virQEMUDriverPtr driver) return virAtomicIntInc(&driver->nextvmid); } + +static int +qemuAddSheepPoolSourceHost(virDomainDiskDefPtr def, + virStoragePoolDefPtr pooldef) +{ + int ret = -1; + char **tokens = NULL; + + /* Only support one host */ + if (pooldef->source.nhost != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Expected exactly 1 host for the storage pool")); + goto cleanup; + } + + /* iscsi pool only supports one host */ + def->nhosts = 1; + + if (VIR_ALLOC_N(def->hosts, def->nhosts) < 0) + goto cleanup; + + if (VIR_STRDUP(def->hosts[0].name, pooldef->source.hosts[0].name) < 0) + goto cleanup; + + if (virAsprintf(&def->hosts[0].port, "%d", + pooldef->source.hosts[0].port ? + pooldef->source.hosts[0].port : + 7000) < 0) + goto cleanup; + + + + + + /* Storage pool have not supported these 2 attributes yet, + * use the defaults. + */ + def->hosts[0].transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; + def->hosts[0].socket = NULL; + + + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + + ret = 0; + +cleanup: + virStringFreeList(tokens); + return ret; +} + static int qemuAddISCSIPoolSourceHost(virDomainDiskDefPtr def, virStoragePoolDefPtr pooldef) @@ -1353,10 +1403,10 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { + if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) || (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " - "storage pool is of iscsi type")); + "storage pool is of iscsi type or only direct for sheepdog ")); goto cleanup; } @@ -1439,9 +1489,17 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } break; - case VIR_STORAGE_POOL_MPATH: - case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_SHEEPDOG: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + // force direct mode + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + def->src = virStorageVolGetPath(vol); + + qemuAddSheepPoolSourceHost(def, pooldef); + break; + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

1 0

[libvirt] [PATCH]qemu:sheepdog Permit qemu to access sheepdog volume on sheepdog's pool
by joel SIMOES 22 Jan '14

22 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> --- src/qemu/qemu_conf.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4378791..2d2f428 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1185,6 +1185,56 @@ int qemuDriverAllocateID(virQEMUDriverPtr driver) return virAtomicIntInc(&driver->nextvmid); } + +static int +qemuAddSheepPoolSourceHost(virDomainDiskDefPtr def, + virStoragePoolDefPtr pooldef) +{ + int ret = -1; + char **tokens = NULL; + + /* Only support one host */ + if (pooldef->source.nhost != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Expected exactly 1 host for the storage pool")); + goto cleanup; + } + + /* iscsi pool only supports one host */ + def->nhosts = 1; + + if (VIR_ALLOC_N(def->hosts, def->nhosts) < 0) + goto cleanup; + + if (VIR_STRDUP(def->hosts[0].name, pooldef->source.hosts[0].name) < 0) + goto cleanup; + + if (virAsprintf(&def->hosts[0].port, "%d", + pooldef->source.hosts[0].port ? + pooldef->source.hosts[0].port : + 7000) < 0) + goto cleanup; + + + + + + /* Storage pool have not supported these 2 attributes yet, + * use the defaults. + */ + def->hosts[0].transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; + def->hosts[0].socket = NULL; + + + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + + ret = 0; + +cleanup: + virStringFreeList(tokens); + return ret; +} + static int qemuAddISCSIPoolSourceHost(virDomainDiskDefPtr def, virStoragePoolDefPtr pooldef) @@ -1353,10 +1403,10 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { + if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) || (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " - "storage pool is of iscsi type")); + "storage pool is of iscsi type or only direct for sheepdog ")); goto cleanup; } @@ -1439,9 +1489,17 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } break; - case VIR_STORAGE_POOL_MPATH: - case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_SHEEPDOG: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + // force direct mode + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + def->src = virStorageVolGetPath(vol); + + qemuAddSheepPoolSourceHost(def, pooldef); + break; + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

1 0

[libvirt] [PATCHv2 0/2] Add a test for linuxNodeGetCPUStats
by Ján Tomko 22 Jan '14

22 Jan '14

v1: https://www.redhat.com/archives/libvir-list/2014-January/msg00951.html v2: use ticks instead of nsecs in test data Ján Tomko (2): Add test for linuxNodeGetCPUStats Simplify linuxNodeGetCPUStats src/libvirt_linux.syms | 1 + src/nodeinfo.c | 83 +++++++-------- tests/nodeinfodata/linux-cpustat-24cpu.out | 150 ++++++++++++++++++++++++++++ tests/nodeinfodata/linux-cpustat-24cpu.stat | 25 +++++ tests/nodeinfotest.c | 131 ++++++++++++++++++++++++ 5 files changed, 342 insertions(+), 48 deletions(-) create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.out create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.stat -- 1.8.3.2

3 5

[libvirt] [PATCH] qemu: Avoid crash in qemuDiskGetActualType
by Peter Krempa 22 Jan '14

22 Jan '14

Libvirtd would crash if a domain contained an empty cdrom drive of type='volume' as the disk def->srcpool member would be dereferenced. Fix it by checking if the source pool is present before dereferencing it. Also alter tests to catch this issue in the future. Reported by: Kevin Shanahan Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1056328 --- src/qemu/qemu_conf.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args | 2 ++ tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4378791..ac53f6d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1302,7 +1302,7 @@ cleanup: int qemuDiskGetActualType(virDomainDiskDefPtr def) { - if (def->type == VIR_DOMAIN_DISK_TYPE_VOLUME) + if (def->type == VIR_DOMAIN_DISK_TYPE_VOLUME && def->srcpool) return def->srcpool->actualtype; return def->type; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args index da87ad9..6b409b7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -3,6 +3,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ file=/some/block/device/cdrom,if=none,media=cdrom,id=drive-ide0-0-1 -device \ ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -drive \ +if=none,media=cdrom,id=drive-ide0-1-0 -device \ +ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -drive \ file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 -device \ ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 -device \ virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml index 6ca5cf7..e96f76e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml @@ -24,6 +24,12 @@ <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> + <disk type='volume' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> <disk type='file' device='disk'> <source file='/tmp/idedisk.img'/> <target dev='hdc' bus='ide'/> -- 1.8.5.3

2 2

[libvirt] [PATCH 0/3] Doc fixes
by Osier Yang 22 Jan '14

22 Jan '14

*** BLURB HERE *** Osier Yang (3): virsh: Fix the string breaking style Doc: Improve the document for nodesuspend Doc: Add "note" for node-memory-tune tools/virsh-host.c | 6 +++--- tools/virsh.pod | 16 +++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) -- 1.8.1.4

2 7

[libvirt] [PATCH v2] virtlockd: make re-exec more robust
by Michael Chapman 22 Jan '14

22 Jan '14

- Use $XDG_RUNTIME_DIR for re-exec state file when running unprivileged. - argv[0] may not contain a full path to the binary, however it should contain something that can be looked up in the PATH. Use execvp() to do path lookup on re-exec. - As per list discussion [1], ignore --daemon on re-exec. [1] https://www.redhat.com/archives/libvir-list/2013-December/msg00514.html Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/locking/lock_daemon.c | 128 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 94 insertions(+), 34 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index a6be43c..b405e3a 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -925,7 +925,41 @@ error: } -#define VIR_LOCK_DAEMON_RESTART_EXEC_FILE LOCALSTATEDIR "/run/virtlockd-restart-exec.json" +static int +virLockDaemonExecRestartStatePath(bool privileged, + char **state_file) +{ + if (privileged) { + if (VIR_STRDUP(*state_file, LOCALSTATEDIR "/run/virtlockd-restart-exec.json") < 0) + goto error; + } else { + char *rundir = NULL; + mode_t old_umask; + + if (!(rundir = virGetUserRuntimeDirectory())) + goto error; + + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir) < 0) { + VIR_FREE(rundir); + goto error; + } + + VIR_FREE(rundir); + } + + return 0; + +error: + return -1; +} + static char * virLockDaemonGetExecRestartMagic(void) @@ -938,7 +972,10 @@ virLockDaemonGetExecRestartMagic(void) static int -virLockDaemonPostExecRestart(bool privileged) +virLockDaemonPostExecRestart(const char *state_file, + const char *pid_file, + int *pid_file_fd, + bool privileged) { const char *gotmagic; char *wantmagic = NULL; @@ -948,14 +985,14 @@ virLockDaemonPostExecRestart(bool privileged) VIR_DEBUG("Running post-restart exec"); - if (!virFileExists(VIR_LOCK_DAEMON_RESTART_EXEC_FILE)) { - VIR_DEBUG("No restart file %s present", - VIR_LOCK_DAEMON_RESTART_EXEC_FILE); + if (!virFileExists(state_file)) { + VIR_DEBUG("No restart state file %s present", + state_file); ret = 0; goto cleanup; } - if (virFileReadAll(VIR_LOCK_DAEMON_RESTART_EXEC_FILE, + if (virFileReadAll(state_file, 1024 * 1024 * 10, /* 10 MB */ &state) < 0) goto cleanup; @@ -982,13 +1019,18 @@ virLockDaemonPostExecRestart(bool privileged) goto cleanup; } + /* Re-claim PID file now as we will not be daemonizing */ + if (pid_file && + (*pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) + goto cleanup; + if (!(lockDaemon = virLockDaemonNewPostExecRestart(object, privileged))) goto cleanup; ret = 1; cleanup: - unlink(VIR_LOCK_DAEMON_RESTART_EXEC_FILE); + unlink(state_file); VIR_FREE(wantmagic); VIR_FREE(state); virJSONValueFree(object); @@ -997,7 +1039,8 @@ cleanup: static int -virLockDaemonPreExecRestart(virNetServerPtr srv, +virLockDaemonPreExecRestart(const char *state_file, + virNetServerPtr srv, char **argv) { virJSONValuePtr child; @@ -1065,15 +1108,15 @@ virLockDaemonPreExecRestart(virNetServerPtr srv, VIR_DEBUG("Saving state %s", state); - if (virFileWriteStr(VIR_LOCK_DAEMON_RESTART_EXEC_FILE, + if (virFileWriteStr(state_file, state, 0700) < 0) { virReportSystemError(errno, _("Unable to save state file %s"), - VIR_LOCK_DAEMON_RESTART_EXEC_FILE); + state_file); goto cleanup; } - if (execv(argv[0], argv) < 0) { + if (execvp(argv[0], argv) < 0) { virReportSystemError(errno, "%s", _("Unable to restart self")); goto cleanup; @@ -1153,6 +1196,7 @@ int main(int argc, char **argv) { char *pid_file = NULL; int pid_file_fd = -1; char *sock_file = NULL; + char *state_file = NULL; bool implicit_conf = false; mode_t old_umask; bool privileged = false; @@ -1276,21 +1320,13 @@ int main(int argc, char **argv) { VIR_DEBUG("Decided on socket paths '%s'", sock_file); - if (godaemon) { - char ebuf[1024]; - - if (chdir("/") < 0) { - VIR_ERROR(_("cannot change to root directory: %s"), - virStrerror(errno, ebuf, sizeof(ebuf))); - goto cleanup; - } - - if ((statuswrite = virLockDaemonForkIntoBackground(argv[0])) < 0) { - VIR_ERROR(_("Failed to fork as daemon: %s"), - virStrerror(errno, ebuf, sizeof(ebuf))); - goto cleanup; - } + if (virLockDaemonExecRestartStatePath(privileged, + &state_file) < 0) { + VIR_ERROR(_("Can't determine restart state file path")); + exit(EXIT_FAILURE); } + VIR_DEBUG("Decided on restart state file path '%s'", + state_file); /* Ensure the rundir exists (on tmpfs on some systems) */ if (privileged) { @@ -1317,20 +1353,41 @@ int main(int argc, char **argv) { } umask(old_umask); - /* If we have a pidfile set, claim it now, exiting if already taken */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { - ret = VIR_LOCK_DAEMON_ERR_PIDFILE; - goto cleanup; - } - - if ((rv = virLockDaemonPostExecRestart(privileged)) < 0) { + if ((rv = virLockDaemonPostExecRestart(state_file, + pid_file, + &pid_file_fd, + privileged)) < 0) { ret = VIR_LOCK_DAEMON_ERR_INIT; goto cleanup; } /* rv == 1, means we setup everything from saved state, - * so we only setup stuff from scratch if rv == 0 */ + * so only (possibly) daemonize and setup stuff from + * scratch if rv == 0 + */ if (rv == 0) { + if (godaemon) { + char ebuf[1024]; + + if (chdir("/") < 0) { + VIR_ERROR(_("cannot change to root directory: %s"), + virStrerror(errno, ebuf, sizeof(ebuf))); + goto cleanup; + } + + if ((statuswrite = virLockDaemonForkIntoBackground(argv[0])) < 0) { + VIR_ERROR(_("Failed to fork as daemon: %s"), + virStrerror(errno, ebuf, sizeof(ebuf))); + goto cleanup; + } + } + + /* If we have a pidfile set, claim it now, exiting if already taken */ + if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { + ret = VIR_LOCK_DAEMON_ERR_PIDFILE; + goto cleanup; + } + if (!(lockDaemon = virLockDaemonNew(config, privileged))) { ret = VIR_LOCK_DAEMON_ERR_INIT; goto cleanup; @@ -1388,7 +1445,9 @@ int main(int argc, char **argv) { virNetServerRun(lockDaemon->srv); if (execRestart && - virLockDaemonPreExecRestart(lockDaemon->srv, argv) < 0) + virLockDaemonPreExecRestart(state_file, + lockDaemon->srv, + argv) < 0) ret = VIR_LOCK_DAEMON_ERR_REEXEC; else ret = 0; @@ -1410,6 +1469,7 @@ cleanup: virPidFileReleasePath(pid_file, pid_file_fd); VIR_FREE(pid_file); VIR_FREE(sock_file); + VIR_FREE(state_file); VIR_FREE(run_dir); return ret; -- 1.8.4.2

2 2

[libvirt] [PATCH] docs: refer to the correct event ID for DomainEventIOErrorReasonCallback
by Claudio Bley 22 Jan '14

22 Jan '14

s/_ID_IO_ERROR/_ID_IO_ERROR_REASON/ Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Pushed under the trivial rule. include/libvirt/libvirt.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a448411..47a896b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4664,7 +4664,7 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn, * @opaque: application specified data * * The callback signature to use when registering for an event of type - * VIR_DOMAIN_EVENT_ID_IO_ERROR with virConnectDomainEventRegisterAny() + * VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON with virConnectDomainEventRegisterAny() * */ typedef void (*virConnectDomainEventIOErrorReasonCallback)(virConnectPtr conn, -- 1.7.9.5

1 0

[libvirt] [PATCH 0/2] Add a test for linuxNodeGetCPUStats
by Ján Tomko 22 Jan '14

22 Jan '14

Ján Tomko (2): Add test for linuxNodeGetCPUStats Simplify linuxNodeGetCPUStats src/libvirt_linux.syms | 1 + src/nodeinfo.c | 83 +++++++-------- tests/nodeinfodata/linux-cpustat-24cpu.out | 150 ++++++++++++++++++++++++++++ tests/nodeinfodata/linux-cpustat-24cpu.stat | 25 +++++ tests/nodeinfotest.c | 128 ++++++++++++++++++++++++ 5 files changed, 339 insertions(+), 48 deletions(-) create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.out create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.stat -- 1.8.3.2

1 3

[libvirt] [PATCH] qemu: snapshot: Forbid snapshots when backing is a scsi passthrough disk
by Peter Krempa 22 Jan '14

22 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1034993 SCSI passthrough disks (<disk .. device="lun">) can't be used as backing for snapshots. Currently with upstream qemu the vm crashes on such attempt. This patch adds a early check to catch an attempt to do such a snapshot and rejects it right away. qemu will fix the issue but this will let us control the error message. --- Notes: You need a domain with a similar disk config to test this patch: <disk type='block' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/disk/by-path/ip-192.168.122.223:3260-iscsi-iqn.2011-03.org.example.istgt:test-lun-0'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='scsi' index='0' model='virtio-scsi'> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </controller> src/qemu/qemu_driver.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b101d77..bc29714 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12206,7 +12206,7 @@ endjob: } static int -qemuDomainSnapshotPrepareDiskExternalBacking(virDomainDiskDefPtr disk) +qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) { int actualType = qemuDiskGetActualType(disk); @@ -12250,6 +12250,23 @@ qemuDomainSnapshotPrepareDiskExternalBacking(virDomainDiskDefPtr disk) static int +qemuDomainSnapshotPrepareDiskExternalBackingActive(virDomainDiskDefPtr disk) +{ + int actualType = qemuDiskGetActualType(disk); + + if (actualType == VIR_DOMAIN_DISK_TYPE_BLOCK && + disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("external active snapshots are not supported on scsi " + "passthrough devices")); + return -1; + } + + return 0; +} + + +static int qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr disk) { int actualType = qemuSnapshotDiskGetActualType(disk); @@ -12315,12 +12332,15 @@ qemuDomainSnapshotPrepareDiskExternal(virConnectPtr conn, if (qemuTranslateDiskSourcePool(conn, disk) < 0) return -1; - if (qemuDomainSnapshotPrepareDiskExternalBacking(disk) < 0) + if (qemuDomainSnapshotPrepareDiskExternalBackingInactive(disk) < 0) return -1; if (qemuDomainSnapshotPrepareDiskExternalOverlayInactive(snapdisk) < 0) return -1; } else { + if (qemuDomainSnapshotPrepareDiskExternalBackingActive(disk) < 0) + return -1; + if (qemuDomainSnapshotPrepareDiskExternalOverlayActive(snapdisk) < 0) return -1; } -- 1.8.5.3

2 2

[libvirt] [vmware] Fix VMware driver version checking on Linux
by ryan woodsmall 22 Jan '14

22 Jan '14

Recent changes to the VMware driver allow for VMware Fusion version checking on OS X. It looks like the version checking on Linux for VMware Workstation and Player could possibly be broken by the changes. The version check in vmware_conf.c bundled STDOUT and STDERR into a common buffer; when/if something is printed to STDERR, at least on Player, version checking fails. This example output causes the version check to fail on a RHEL6-based Linux install: ** [ryan@os-sl6-controller ~]$ vmplayer -v Gtk-Message: Failed to load module "canberra-gtk-module": libcanberra-gtk-module.so: cannot open shared object file: No such file or directory VMware Player 6.0.1 build-1379776 [ryan@os-sl6-controller ~]$ virsh -c vmwareplayer:///session error: failed to connect to the hypervisor error: internal error: failed to parse VMware Player version ** This patch bundles STDERR into the checked buffer only with the VMware Fusion driver, allowing the VMware Player version check to succeed on Linux even with the above warning. It looks like there's still an issue (see below) but virsh now starts at least. ** [ryan@os-sl6-controller ~]$ virsh -c vmwareplayer:///session Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # version Compiled against library: libvirt 1.2.1 Using library: libvirt 1.2.1 Using API: VMware 1.2.1 Cannot extract running VMware hypervisor version ** This is virsh running against VMware Player 6.0.1 on Linux x86_64. I have not tested on OS X since I don't have a license for VMware Fusion. Thanks everyone! -r diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index c96bd62..502d5c9 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -293,7 +293,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); - virCommandSetErrorBuffer(cmd, &outbuf); + if (driver->type == VMWARE_DRIVER_FUSION) + virCommandSetErrorBuffer(cmd, &outbuf); if (virCommandRun(cmd, NULL) < 0) goto cleanup;

2 3

Re: [libvirt] [Users] libvirt migration port configuration and virPortAllocator
by Dan Kenigsberg 21 Jan '14

21 Jan '14

On Wed, Jan 08, 2014 at 01:26:23AM +0100, Gianluca Cecchi wrote: > Hello, > following the bugzilla here: > https://bugzilla.redhat.com/show_bug.cgi?id=1019053 > > we have > " > This is now fixed by v1.1.3-188-g0196845 and v1.1.3-189-ge3ef20d > " > > Does this mean that f19 that has > libvirt-1.0.5.8-1.fc19.x86_64 > is out? > Any time soon to update it? > I see at > http://libvirt.org/sources/ > files such as > libvirt-1.1.4-1.fc19.x86_64.rpm > since beginning of November... > any particular reason for no packages neither in updates-testing repo? > > Also, Fedora 20 has libvirt-1.1.3.2-1.fc20.x86_64.rpm > Did it receive the patch update? I see nothing particular in its changelog... I suspect that you'd see this bugfix only on libvirt>=1.2, but the best place for such questions is the libvirt mailing list (CCed). Unfortunately, that version is not even on virt-preview http://fedorapeople.org/groups/virt/virt-preview/fedora-19 (but it is on http://fedorapeople.org/groups/virt/virt-preview/fedora-20 !) Dan.

5 5

[libvirt] [[PATCH v2]] virsh nodecpustats returns incorrect stats of cpu on Linux when the number of online cpu exceed 9.
by mars＠linux.vnet.ibm.com 21 Jan '14

21 Jan '14

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function simply uses STRPREFIX() to match the cpuid with the cpuid read from /proc/stat, it will cause obvious error. For example: 'virsh nodecpustats 1' will display stats of cpu1* if the latter is online and cpu1 is offline. This patch fixes this bug. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 05bc038..cba2fc1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -708,9 +708,9 @@ linuxNodeGetCPUStats(FILE *procstat, } if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { - strcpy(cpu_header, "cpu"); + strcpy(cpu_header, "cpu "); } else { - snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); + snprintf(cpu_header, sizeof(cpu_header), "cpu%d ", cpuNum); } while (fgets(line, sizeof(line), procstat) != NULL) { -- 1.7.7.6

2 1

[libvirt] [PATCH] Honour prefix in wireshark install dir
by Daniel P. Berrange 21 Jan '14

21 Jan '14

Trying to run $ ./configure --prefix=$HOME/usr/libvirt-git $ make install results in libvirt trying to install in /usr/lib/wireshark/plugins/.... with predictable amounts of fail. The configure script should not be hardcoding /usr/lib by default but rather honour $libdir Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b9375f1..3a70375 100644 --- a/configure.ac +++ b/configure.ac @@ -2566,7 +2566,7 @@ AC_ARG_WITH([ws-plugindir], if test "$with_wireshark_dissector" != "no" && test -z "$ws_plugindir"; then ws_version=`$WIRESHARK -v | head -1 | cut -f 2 -d' '` - ws_plugindir=`dirname $WIRESHARK`/../lib/wireshark/plugins/$ws_version + ws_plugindir="$libdir/wireshark/plugins/$ws_version" fi AC_SUBST([ws_plugindir]) -- 1.8.4.2

2 1

Re: [libvirt] [PATCH] Be more clever and verbose about localization-initialization.
by andreas.fuchs＠sit.fraunhofer.de 21 Jan '14

21 Jan '14

I should have been more specific. If e.g. an LC_MESSAGE is set that cannot be found it returns "initialization failed" and nothing more... See the bug report.Spent >1h this morning trying to get some demonstrator running... So I thought rather share it... ----- Reply message ----- Von: "Daniel P. Berrange" <berrange(a)redhat.com> An: "Fuchs, Andreas" <andreas.fuchs(a)sit.fraunhofer.de> Cc: "libvir-list(a)redhat.com" <libvir-list(a)redhat.com> Betreff: [libvirt] [PATCH] Be more clever and verbose about localization-initialization. Datum: Mo., Okt 7, 2013 17:52 On Mon, Oct 07, 2013 at 03:47:48PM +0000, Fuchs, Andreas wrote: > Currently libvirt fails with an uninformative error message > if no translations are found. I don't see any failure if I delete all the libvirt.mo files. What are you actually doing to trigger an error, and what is the exact error you get. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

5 9

[libvirt] RFC: Move tests into same directory as the sources
by Daniel P. Berrange 21 Jan '14

21 Jan '14

Currently we have a split with all the "source" code under various subdirectories of src/, while the test cases are (mostly) all under the tests/ directory. I think there could be some benefits to moving the test files to be alongside the source files being tested. eg instead of tests/virhashtest.c have src/util/virhashtest.c The tests/ directory is getting reasonably large, and is likely to grow even more as we push for greater unit tests. We could split it up into various sub-directories mirroring the split of dirs under src/, but it seems easier to put have them directory under src/ and remove the arbitrary split of source and tests. Having the test files alongside the source files makes it obvious to anyone looking in a directory that tests exist for a file. This might encourage people to think about adding tests when changing a source file. It also makes it more slightly obvious which files lack proper tests. In essence I'm suggesting that our code file naming should be thus virfoo.h - exports of module foo for general internal usage virfoo.c - implementation of module foo virfoopriv.h - exports of module foo for test suite usage only virfootest.c - implementation of tests for module foo virfoomock.c - implementation of LD_PRELOAD hack for module foo tests Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 3

[libvirt] [PATCHv2 0/2] Avoid libvirtd crash when qemu crashes while snapshotting
by Peter Krempa 21 Jan '14

21 Jan '14

Peter Krempa (2): DO NOT APPLY UPSTREAM: Reproducer for disk snapshot crash qemu: snapshot: Avoid libvirtd crash when qemu crashes while snapshotting src/qemu/qemu_driver.c | 56 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 12 deletions(-) -- 1.8.5.3

4 6

[libvirt] [PATCH 0/2] v6: spice: expose the disable file transfer option
by Francesco Romani 21 Jan '14

21 Jan '14

Changes v6: amended commit message for patch #2 as suggested by Doug. Francesco Romani (2): spice: detect if qemu can disable file transfer spice: expose the QEMU disable file transfer option docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 31 ++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 9 +++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 9 +++++ ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 40 ++++++++++++++++++++++ .../qemuxml2argv-graphics-spice.args | 5 +-- .../qemuxml2argv-graphics-spice.xml | 1 + tests/qemuxml2argvtest.c | 9 ++++- 15 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml -- 1.8.4.2

2 4

[libvirt] [PATCH] patch to correct bug to refresh volume on sheepdog from a sheep pool Reload correctly pool and get vols.
by joel.simoes＠laposte.net 21 Jan '14

21 Jan '14

From: Joël Simoes <jsimoes@jsimoes> --- src/storage/storage_backend_sheepdog.c | 91 ++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index a6981ce..fbed11a 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,71 @@ 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; + + 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); + + + + +cleanup: + virCommandFree(cmd); + VIR_FREE(lines); + VIR_FREE(cells); + return ret; +} static int virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -122,15 +188,16 @@ 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); + virStorageBackendSheepdogRefreshAllVol(conn, pool); +cleanup: virCommandFree(cmd); - VIR_FREE(output); return ret; } - static int virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -143,12 +210,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 +243,6 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } - static int virStorageBackendSheepdogBuildVol(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -195,12 +263,12 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, goto cleanup; ret = 0; + cleanup: virCommandFree(cmd); return ret; } - int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output) @@ -257,7 +325,8 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, return -1; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -295,7 +364,6 @@ cleanup: return ret; } - static int virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -310,7 +378,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

1 0

[libvirt] [PATCH glib] Switch over to using standard gobject introspection macros
by Daniel P. Berrange 21 Jan '14

21 Jan '14

Remove hand crafted configure.ac and Makefile.am rules in favour of the standard macros. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 25 +--------------- libvirt-gconfig/Makefile.am | 71 ++++++++++++++++++++------------------------- libvirt-glib/Makefile.am | 51 ++++++++++++++------------------ libvirt-gobject/Makefile.am | 71 ++++++++++++++++++--------------------------- 4 files changed, 83 insertions(+), 135 deletions(-) diff --git a/configure.ac b/configure.ac index 9b5d09c..8b0b63b 100644 --- a/configure.ac +++ b/configure.ac @@ -232,30 +232,7 @@ AC_SUBST([PYTHON_VERSION]) AC_SUBST([PYTHON_INCLUDES]) AC_SUBST([PYTHON_SITE_PACKAGES]) -AC_ARG_ENABLE([introspection], - AS_HELP_STRING([--enable-introspection], [enable GObject introspection]), - [], [enable_introspection=check]) - -if test "x$enable_introspection" != "xno" ; then - PKG_CHECK_MODULES([GOBJECT_INTROSPECTION], - [gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED], - [enable_introspection=yes], - [ - if test "x$enable_introspection" = "xcheck"; then - enable_introspection=no - else - AC_MSG_ERROR([gobject-introspection is not available]) - fi - ]) - if test "x$enable_introspection" = "xyes" ; then - AC_DEFINE([WITH_GOBJECT_INTROSPECTION], [1], [enable GObject introspection support]) - AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS) - AC_SUBST(GOBJECT_INTROSPECTION_LIBS) - AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)]) - AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)]) - fi -fi -AM_CONDITIONAL([WITH_GOBJECT_INTROSPECTION], [test "x$enable_introspection" = "xyes"]) +GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_REQUIRED]) AC_ARG_ENABLE([vala], AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 0793da1..03e4036 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -168,6 +168,10 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-storage-vol-target.c \ libvirt-gconfig-xml-doc.c +GCONFIG_GENERATED_FILES = \ + libvirt-gconfig-enum-types.c \ + libvirt-gconfig-enum-types.h + libvirt_gconfig_1_0_ladir = $(includedir)/libvirt-gconfig-1.0/libvirt-gconfig libvirt_gconfig_1_0_la_HEADERS = \ $(GCONFIG_HEADER_FILES) @@ -177,7 +181,7 @@ libvirt_gconfig_1_0_la_SOURCES = \ $(libvirt_gconfig_1_0_la_HEADERS) \ $(GCONFIG_SOURCE_FILES) nodist_libvirt_gconfig_1_0_la_SOURCES = \ - $(builddir)/libvirt-gconfig-enum-types.c + $(GCONFIG_GENERATED_FILES) libvirt_gconfig_1_0_la_CFLAGS = \ -DG_LOG_DOMAIN="\"Libvirt.GConfig\"" \ -DDATADIR="\"$(datadir)\"" \ @@ -199,9 +203,7 @@ libvirt_gconfig_1_0_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/libvirt-gconfig.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) -BUILT_SOURCES = \ - libvirt-gconfig-enum-types.c \ - libvirt-gconfig-enum-types.h +BUILT_SOURCES = $(GCONFIG_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) @@ -213,44 +215,33 @@ libvirt-gconfig-enum-types.c: $(GCONFIG_HEADER_FILES) libvirt-gconfig-enum-types $(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/libvirt-gconfig-enum-types.c.template $(GCONFIG_HEADER_FILES:%=$(srcdir)/%) ) | \ sed -e "s/G_TYPE_VIR_CONFIG/GVIR_CONFIG_TYPE/" -e "s/g_vir/gvir/" > libvirt-gconfig-enum-types.c -if WITH_GOBJECT_INTROSPECTION - -LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)$(G_IR_SCANNER) \ - --quiet \ - --warn-all \ - --namespace LibvirtGConfig \ - --nsversion 1.0 \ - --include GObject-2.0 \ - --identifier-prefix=GVirConfig \ - --symbol-prefix=gvir_config \ - --library=$(builddir)/libvirt-gconfig-1.0.la \ - --output $@ \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - --verbose \ - --c-include="libvirt-gconfig/libvirt-gconfig.h" \ - --pkg=libxml-2.0 \ - --pkg-export=libvirt-gconfig-1.0 \ - $(srcdir)/libvirt-gconfig.h \ - $(GCONFIG_SOURCE_FILES:%=$(srcdir)/%) \ - $(GCONFIG_HEADER_FILES:%=$(srcdir)/%) \ - $(builddir)/libvirt-gconfig-enum-types.c \ - $(builddir)/libvirt-gconfig-enum-types.h - +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = + +if HAVE_INTROSPECTION +LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la +LibvirtGConfig_1_0_gir_INCLUDES = GObject-2.0 +LibvirtGConfig_1_0_gir_PACKAGES = gobject-2.0 +LibvirtGConfig_1_0_gir_EXPORT_PACKAGES = libvirt-gconfig-1.0 +LibvirtGConfig_1_0_gir_LIBS = libvirt-gconfig-1.0.la +LibvirtGConfig_1_0_gir_FILES = \ + $(GCONFIG_SOURCE_FILES) \ + $(GCONFIG_HEADER_FILES) \ + $(GCONFIG_GENERATED_FILES) \ + $(NULL) +LibvirtGConfig_1_0_gir_CFLAGS = $(libvirt_gconfig_1_0_la_CFLAGS) +LibvirtGConfig_1_0_gir_SCANNERFLAGS = \ + --identifier-prefix=GVirConfig \ + --symbol-prefix=gvir_config \ + --c-include="libvirt-gconfig/libvirt-gconfig.h" \ + $(NULL) +INTROSPECTION_GIRS += LibvirtGConfig-1.0.gir girdir = $(datadir)/gir-1.0 gir_DATA = LibvirtGConfig-1.0.gir -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = LibvirtGConfig-1.0.typelib - -%.typelib: %.gir - $(AM_V_GEN)$(G_IR_COMPILER) \ - --includedir=$(builddir) \ - --includedir=$(girdir) \ - -o $@ $< - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = LibvirtGConfig-1.0.typelib -endif # WITH_GOBJECT_INTROSPECTION +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif # HAVE_INTROSPECTION diff --git a/libvirt-glib/Makefile.am b/libvirt-glib/Makefile.am index 1370ebc..36404f1 100644 --- a/libvirt-glib/Makefile.am +++ b/libvirt-glib/Makefile.am @@ -37,38 +37,31 @@ libvirt_glib_1_0_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/libvirt-glib.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) -if WITH_GOBJECT_INTROSPECTION -LibvirtGLib-1.0.gir: libvirt-glib-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)$(G_IR_SCANNER) \ - --quiet \ - --warn-all \ - --namespace LibvirtGLib \ - --nsversion 1.0 \ - --include GLib-2.0 \ - --identifier-prefix=GVir \ - --symbol-prefix=gvir \ - --library=$(builddir)/libvirt-glib-1.0.la \ - --output $@ \ - -I$(top_srcdir) \ - --verbose \ - --pkg=gthread-2.0 \ - --c-include="libvirt-glib/libvirt-glib.h" \ - --pkg-export=libvirt-glib-1.0 \ - $(libvirt_glib_1_0_la_SOURCES:%=$(srcdir)/%) +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +CLEANFILES= + +if HAVE_INTROSPECTION +LibvirtGLib-1.0.gir: libvirt-glib-1.0.la +LibvirtGLib_1_0_gir_INCLUDES = GLib-2.0 +LibvirtGLib_1_0_gir_PACKAGES = glib-2.0 +LibvirtGLib_1_0_gir_EXPORT_PACKAGES = libvirt-glib-1.0 +LibvirtGLib_1_0_gir_LIBS = libvirt-glib-1.0.la +LibvirtGLib_1_0_gir_FILES = $(libvirt_glib_1_0_la_SOURCES) +LibvirtGLib_1_0_gir_CFLAGS = $(libvirt_glib_1_0_la_CFLAGS) +LibvirtGLib_1_0_gir_SCANNERFLAGS = \ + --identifier-prefix=GVir \ + --symbol-prefix=gvir \ + --c-include="libvirt-glib/libvirt-glib.h" \ + $(NULL) +INTROSPECTION_GIRS += LibvirtGLib-1.0.gir girdir = $(datadir)/gir-1.0 gir_DATA = LibvirtGLib-1.0.gir -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = LibvirtGLib-1.0.typelib - -%.typelib: %.gir - $(AM_V_GEN)$(G_IR_COMPILER) \ - --includedir=$(builddir) \ - --includedir=$(girdir) \ - -o $@ $< - -CLEANFILES = $(gir_DATA) $(typelibs_DATA) +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = LibvirtGLib-1.0.typelib -endif # WITH_GOBJECT_INTROSPECTION +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif # HAVE_INTROSPECTION diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 3284b2c..9c05cb5 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -119,50 +119,37 @@ BUILT_SOURCES = $(GOBJECT_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) -if WITH_GOBJECT_INTROSPECTION - -LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)$(G_IR_SCANNER) \ - --quiet \ - --warn-all \ - --namespace LibvirtGObject \ - --nsversion 1.0 \ - --include GObject-2.0 \ - --include Gio-2.0 \ - --include-uninstalled $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir \ - --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ - --identifier-prefix=GVir \ - --symbol-prefix=gvir \ - --library=$(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \ - --library=$(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \ - --library=$(builddir)/libvirt-gobject-1.0.la \ - --output $@ \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - --verbose \ - --c-include="libvirt-gobject/libvirt-gobject.h" \ - --pkg=gthread-2.0 \ - --pkg=libxml-2.0 \ - --pkg-export=libvirt-gobject-1.0 \ - $(srcdir)/libvirt-gobject.h \ - $(GOBJECT_SOURCE_FILES:%=$(srcdir)/%) \ - $(GOBJECT_HEADER_FILES:%=$(srcdir)/%) \ - $(GOBJECT_GENERATED_FILES:%=$(builddir)/%) +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = + +if HAVE_INTROSPECTION +LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la +LibvirtGObject_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 +LibvirtGObject_1_0_gir_PACKAGES = gobject-2.0 +LibvirtGObject_1_0_gir_EXPORT_PACKAGES = libvirt-gobject-1.0 +LibvirtGObject_1_0_gir_LIBS = \ + $(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \ + $(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \ + libvirt-gobject-1.0.la +LibvirtGObject_1_0_gir_FILES = \ + $(GOBJECT_SOURCE_FILES) \ + $(GOBJECT_HEADER_FILES) \ + $(GOBJECT_GENERATED_FILES) \ + $(NULL) +LibvirtGObject_1_0_gir_CFLAGS = $(libvirt_gobject_1_0_la_CFLAGS) +LibvirtGObject_1_0_gir_SCANNERFLAGS = \ + --identifier-prefix=GVir --symbol-prefix=gvir \ + --c-include="libvirt-gobject/libvirt-gobject.h" \ + --include-uninstalled $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir \ + --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ + $(NULL) +INTROSPECTION_GIRS += LibvirtGObject-1.0.gir girdir = $(datadir)/gir-1.0 gir_DATA = LibvirtGObject-1.0.gir -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = LibvirtGObject-1.0.typelib - -%.typelib: %.gir - $(AM_V_GEN)$(G_IR_COMPILER) \ - --includedir=$(top_builddir)/libvirt-glib \ - --includedir=$(top_builddir)/libvirt-gconfig \ - --includedir=$(builddir) \ - --includedir=$(girdir) \ - -o $@ $< - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = LibvirtGObject-1.0.typelib -endif # WITH_GOBJECT_INTROSPECTION +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif # HAVE_INTROSPECTION -- 1.8.4.2

2 3

[libvirt] [PATCH RESEND v4 0/2] Libvirt Wireshark Dissector
by Yuto KAWAMURA(kawamuray) 21 Jan '14

21 Jan '14

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Changes from version 3: * Merge tools/wireshark/.gitignore into ROOT/.gitignore * Fix dissect_xdr_pointer() bug which pointed by Michal * Added -module option to libvirt_la_LDFLAGS respecting official build process Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. 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. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (2): Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector .gitignore | 2 + Makefile.am | 3 +- cfg.mk | 8 +- configure.ac | 72 +- tools/wireshark/Makefile.am | 22 + tools/wireshark/README.md | 31 + tools/wireshark/samples/libvirt-sample.pdml | 206 ++++++ tools/wireshark/src/Makefile.am | 42 ++ tools/wireshark/src/packet-libvirt.c | 512 ++++++++++++++ tools/wireshark/src/packet-libvirt.h | 128 ++++ tools/wireshark/util/genxdrstub.pl | 1011 +++++++++++++++++++++++++++ tools/wireshark/util/make-dissector-reg | 198 ++++++ 12 files changed, 2229 insertions(+), 6 deletions(-) create mode 100644 tools/wireshark/Makefile.am create mode 100644 tools/wireshark/README.md create mode 100644 tools/wireshark/samples/libvirt-sample.pdml create mode 100644 tools/wireshark/src/Makefile.am create mode 100644 tools/wireshark/src/packet-libvirt.c create mode 100644 tools/wireshark/src/packet-libvirt.h create mode 100755 tools/wireshark/util/genxdrstub.pl create mode 100755 tools/wireshark/util/make-dissector-reg -- 1.8.3.2

4 8