- Devel - libvirt List Archives

[libvirt] [libvirt-glib PATCHv3 1/7] gobject: Simplify gvir_connection_list*() implementations
by Zeeshan Ali (Khattak) 01 Jul '15

01 Jul '15

Make use of virConnectListAll* functions to avoid making 4 calls and hence avoid race conditions and complicated code. --- libvirt-gobject/libvirt-gobject-connection.c | 203 ++++----------------------- 1 file changed, 28 insertions(+), 175 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index cf073a5..1576906 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -680,48 +680,6 @@ void gvir_connection_close(GVirConnection *conn) g_signal_emit(conn, signals[VIR_CONNECTION_CLOSED], 0); } -typedef gint (* CountFunction) (virConnectPtr vconn); -typedef gint (* ListFunction) (virConnectPtr vconn, gchar **lst, gint max); - -static gchar ** fetch_list(virConnectPtr vconn, - const char *name, - CountFunction count_func, - ListFunction list_func, - GCancellable *cancellable, - gint *length, - GError **err) -{ - gchar **lst = NULL; - gint n = 0; - - if ((n = count_func(vconn)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count %s"), name); - goto error; - } - - if (n) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto error; - - lst = g_new0(gchar *, n); - if ((n = list_func(vconn, lst, n)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list %s %d"), name, n); - goto error; - } - } - - *length = n; - return lst; - -error: - g_free(lst); - return NULL; -} - /** * gvir_connection_fetch_domains: * @conn: a #GVirConnection @@ -733,14 +691,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *doms; - gchar **inactive = NULL; - gint ninactive = 0; - gint *active = NULL; - gint nactive = 0; + virDomainPtr *domains = NULL; + gint ndomains = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -761,81 +716,28 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, virConnectRef(vconn); g_mutex_unlock(priv->lock); - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - if ((nactive = virConnectNumOfDomains(vconn)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count domains")); + ndomains = virConnectListAllDomains(vconn, &domains, 0); + if (ndomains < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of domains")); goto cleanup; } - if (nactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - active = g_new(gint, nactive); - if ((nactive = virConnectListDomains(vconn, active, nactive)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list domains")); - goto cleanup; - } - } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Domains", - virConnectNumOfDefinedDomains, - virConnectListDefinedDomains, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - doms = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByID(vconn, active[i]); + for (i = 0 ; i < ndomains; i++) { GVirDomain *dom; - if (!vdom) - continue; dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, + "handle", domains[i], NULL)); - virDomainFree(vdom); - - g_hash_table_insert(doms, - (gpointer)gvir_domain_get_uuid(dom), - dom); - } - - for (i = 0 ; i < ninactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByName(vconn, inactive[i]); - GVirDomain *dom; - if (!vdom) - continue; - - dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, - NULL)); - virDomainFree(vdom); g_hash_table_insert(doms, (gpointer)gvir_domain_get_uuid(dom), @@ -852,10 +754,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, ret = TRUE; cleanup: - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (ndomains > 0) { + for (i = 0 ; i < ndomains; i++) + virDomainFree(domains[i]); + free(domains); + } return ret; } @@ -870,14 +773,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *pools; - gchar **inactive = NULL; - gint ninactive = 0; - gchar **active = NULL; - gint nactive = 0; + virStoragePoolPtr *vpools = NULL; + gint npools = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -901,77 +801,31 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - active = fetch_list(vconn, - "Storage Pools", - virConnectNumOfStoragePools, - virConnectListStoragePools, - cancellable, - &nactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; + npools = virConnectListAllStoragePools(vconn, &vpools, 0); + if (npools < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of pools")); goto cleanup; } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Storage Pools", - virConnectNumOfDefinedStoragePools, - virConnectListDefinedStoragePools, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - pools = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { + for (i = 0 ; i < npools; i++) { if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - virStoragePoolPtr vpool; GVirStoragePool *pool; - vpool = virStoragePoolLookupByName(vconn, active[i]); - if (!vpool) - continue; - - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, - NULL)); - virStoragePoolFree(vpool); - - g_hash_table_insert(pools, - (gpointer)gvir_storage_pool_get_uuid(pool), - pool); - } - - for (i = 0 ; i < ninactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virStoragePoolPtr vpool; - GVirStoragePool *pool; - - vpool = virStoragePoolLookupByName(vconn, inactive[i]); - if (!vpool) - continue; - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, + "handle", vpools[i], NULL)); - virStoragePoolFree(vpool); - g_hash_table_insert(pools, (gpointer)gvir_storage_pool_get_uuid(pool), pool); @@ -987,12 +841,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, ret = TRUE; cleanup: - for (i = 0 ; i < nactive ; i++) - g_free(active[i]); - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (npools > 0) { + for (i = 0 ; i < npools; i++) + virStoragePoolFree(vpools[i]); + free(vpools); + } return ret; } -- 2.4.3

1 6

[libvirt] ANNOUNCE: libvirt-sandbox "Dashti Margo" release 0.6.0
by Daniel P. Berrange 01 Jul '15

01 Jul '15

I pleased to announce the a new public release of libvirt-sandbox, version 0.6.0, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. This release contains a mixture of new features and bug fixes - API/ABI in-compatible change, soname increased - Prevent use of virt-sandbox-service as non-root upfront - Fix misc memory leaks - Block SIGHUP from the dhclient binary to prevent accidental death if the controlling terminal is closed & reopened - Add support for re-creating libvirt XML from sandbox config to facilitate upgrades - Switch to standard gobject introspection autoconf macros - Add ability to set filters on network interfaces - Search /usr/lib instead of /lib for systemd unit files, as the former is the canonical location even when / and /usr are merged - Only set SELinux labels on hosts that support SELinux - Explicitly link to selinux, instead of relying on indirect linkage - Update compiler warning flags - Fix misc docs comments - Don't assume use of SELinux in virt-sandbox-service - Fix path checks for SUSUE in virt-sandbox-service - Add support for AppArmour profiles - Mount /var after other FS to ensure host image is available - Ensure state/config dirs can be accessed when QEMU is running non-root for qemu:///system - Fix mounting of host images in QEMU sandboxes - Mount images as ext4 instead of ext3 - Allow use of non-raw disk images as filesystem mounts - Check if required static libs are available at configure time to prevent silent fallback to shared linking - Require libvirt-glib >= 0.2.1 - Add support for loading lzma and gzip compressed kmods - Check for support libvirt URIs when starting guests to ensure clear error message upfront - Add LIBVIRT_SANDBOX_INIT_DEBUG env variable to allow debugging of kernel boot messages and sandbox init process setup - Add support for exposing block devices to sandboxes with a predictable name under /dev/disk/by-tag/TAGNAME - Use devtmpfs instead of tmpfs for auto-populating /dev in QEMU sandboxes - Allow setup of sandbox with custom root filesystem instead of inheriting from host's root. - Allow execution of apps from non-matched ld-linux.so / libc.so, eg executing F19 binaries on F22 host - Use passthrough mode for all QEMU filesystems Thanks to everyone who contributed to this release 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 :|

1 0

[libvirt] [PATCH v2 1/2] Fix nodeinfo output on PPC64 KVM hosts
by Shivaprasad G Bhat 01 Jul '15

01 Jul '15

The nodeinfo is reporting incorrect number of cpus and incorrect host topology on PPC64 KVM hosts. The KVM hypervisor on PPC64 needs only the primary thread in a core to be online, and the secondaries offlined. While scheduling a guest in, the kvm scheduler wakes up the secondaries to run in guest context. The host scheduling of the guests happen at the core level(as only primary thread is online). The kvm scheduler exploits as many threads of the core as needed by guest. Further, starting POWER8, the processor allows splitting a physical core into multiple subcores with 2 or 4 threads each. Again, only the primary thread in a subcore is online in the host. The KVM-PPC scheduler allows guests to exploit all the offline threads in the subcore, by bringing them online when needed. (Kernel patches on split-core http://www.spinics.net/lists/kvm-ppc/msg09121.html) Recently with dynamic micro-threading changes in ppc-kvm, makes sure to utilize all the offline cpus across guests, and across guests with different cpu topologies. (https://www.mail-archive.com/kvm@vger.kernel.org/msg115978.html) Since the offline cpus are brought online in the guest context, it is safe to count them as online. Nodeinfo today discounts these offline cpus from cpu count/topology calclulation, and the nodeinfo output is not of any help and the host appears overcommited when it is actually not. The patch carefully counts those offline threads whose primary threads are online. The host topology displayed by the nodeinfo is also fixed when the host is in valid kvm state. Test results with and without fix: http://ur1.ca/mx25y Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + src/nodeinfo.c | 87 ++++++++++++++++++++++++++++++++++++++++------ src/util/virarch.c | 35 +++++++++++++++++++ src/util/virarch.h | 2 + 4 files changed, 114 insertions(+), 11 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1566d11..071fe6e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1075,6 +1075,7 @@ virArchFromHost; virArchFromString; virArchGetEndian; virArchGetWordSize; +virArchPPCGetKvmHostCoreMode; virArchToString; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 2fafe2d..9d1dc84 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -428,25 +428,77 @@ virNodeParseNode(const char *node, unsigned int cpu; int online; int direrr; + int lastonline; + virBitmapPtr nodecpus = NULL; + int threads_per_subcore = 1; + bool valid_ppc64_kvmhost_mode = false; *threads = 0; *cores = 0; *sockets = 0; + if (ARCH_IS_PPC64(arch)) { + /* PPC-KVM needs the secondary threads of a core to be offline on the + * host. The kvm scheduler brings the secondary threads online in the + * guest context. Moreover, P8 processor has split-core capability + * where, there can be 1,2 or 4 subcores per core. The primaries of the + * subcores alone will be online on the host for a subcore in the + * host. Even though the actual threads per core for P8 processor is 8, + * depending on the subcores_per_core = 1, 2 or 4, the threads per + * subcore will vary accordingly to 8, 4 and 2 repectively. + * So, On host threads_per_core what is arrived at from sysfs in the + * current logic is actually the subcores_per_core. Threads per subcore + * can only be obtained from the kvm device. For example, on P8 wih 1 + * core having 8 threads, sub_cores_percore=4, the threads 0,2,4 & 6 + * will be online. The sysfs reflects this and in the current logic + * variable 'threads' will be 4 which is nothing but subcores_per_core. + * If the user tampers the cpu online/offline states using chcpu or other + * means, then it is an unsupported configuration for kvm. + * The code below tries to keep in mind + * - when the libvirtd is run inside a KVM guest or Phyp based guest. + * - Or on the kvm host where user manually tampers the cpu states to + * offline/online randomly. + */ + valid_ppc64_kvmhost_mode = virArchPPCGetKvmHostCoreMode(&threads_per_subcore); + } + + nodecpus = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN); + if (!(cpudir = opendir(node))) { virReportSystemError(errno, _("cannot opendir %s"), node); goto cleanup; } - /* enumerate sockets in the node */ - CPU_ZERO(&sock_map); while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + if (virBitmapSetBit(nodecpus, cpu)) + goto cleanup; + } + + if (direrr < 0) + goto cleanup; + + /* enumerate sockets in the node */ + CPU_ZERO(&sock_map); + lastonline = -1; + for (cpu = 0; cpu < virBitmapSize(nodecpus); cpu++) { + if (!virBitmapIsBitSet(nodecpus, cpu)) + continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; + if (online && valid_ppc64_kvmhost_mode) { + if (lastonline != -1 && + (cpu - lastonline) < threads_per_subcore) { + /* if any of secondaries online */ + valid_ppc64_kvmhost_mode = false; + } + lastonline = cpu; + } + if (!online) continue; @@ -459,9 +511,6 @@ virNodeParseNode(const char *node, sock_max = sock; } - if (direrr < 0) - goto cleanup; - sock_max++; /* allocate cpu maps for each socket */ @@ -472,14 +521,25 @@ virNodeParseNode(const char *node, CPU_ZERO(&core_maps[i]); /* iterate over all CPU's in the node */ - rewinddir(cpudir); - while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) { - if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) + lastonline = -1; + for (cpu = 0; cpu < virBitmapSize(nodecpus); cpu++) { + if (!virBitmapIsBitSet(nodecpus, cpu)) continue; if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; + if (valid_ppc64_kvmhost_mode) { + if (online) { + lastonline = cpu; + } else if (lastonline != -1 && + (cpu-lastonline) < threads_per_subcore) { + processors++; /* Count only those secondaries whose primary + subcore is online */ + continue; + } + } + if (!online) { (*offline)++; continue; @@ -513,9 +573,6 @@ virNodeParseNode(const char *node, *threads = siblings; } - if (direrr < 0) - goto cleanup; - /* finalize the returned data */ *sockets = CPU_COUNT(&sock_map); @@ -528,6 +585,13 @@ virNodeParseNode(const char *node, *cores = core; } + if (valid_ppc64_kvmhost_mode) { + /* The actual host threads per core is + * multiple of the subcores_per_core(i.e variable *threads in this case) + * and threads_per_subcore. + */ + *threads = *threads * threads_per_subcore; + } ret = processors; cleanup: @@ -537,6 +601,7 @@ virNodeParseNode(const char *node, ret = -1; } VIR_FREE(core_maps); + virBitmapFree(nodecpus); return ret; } diff --git a/src/util/virarch.c b/src/util/virarch.c index be48bcf..3717de0 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -25,8 +25,16 @@ #include "virlog.h" #include "virarch.h" +#include "virfile.h" #include "verify.h" +#include <fcntl.h> +#include <sys/ioctl.h> + +#if HAVE_LINUX_KVM_H +# include <linux/kvm.h> +#endif + VIR_LOG_INIT("util.arch"); /* The canonical names are used in XML documents. ie ABI sensitive */ @@ -182,3 +190,30 @@ virArch virArchFromHost(void) return arch; } + +bool virArchPPCGetKvmHostCoreMode(int *threads_per_subcore) +{ + int kvmfd; + bool valid_ppc64_kvmhost_mode = false; + +#if HAVE_LINUX_KVM_H + kvmfd = open("/dev/kvm", O_RDONLY); + if (kvmfd >= 0) { +# ifdef KVM_CAP_PPC_SMT + + valid_ppc64_kvmhost_mode = true; + /* For Phyp and KVM based guests the ioctl for KVM_CAP_PPC_SMT + * returns zero and both primary and secondary threads will be + * online. + */ + *threads_per_subcore = ioctl(kvmfd, KVM_CHECK_EXTENSION, KVM_CAP_PPC_SMT); + if (*threads_per_subcore == 0) + valid_ppc64_kvmhost_mode = false; + +# endif + } + VIR_FORCE_CLOSE(kvmfd); +#endif + + return valid_ppc64_kvmhost_mode; +} diff --git a/src/util/virarch.h b/src/util/virarch.h index 3206ce2..6e196ff 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -102,4 +102,6 @@ virArch virArchFromString(const char *name); virArch virArchFromHost(void); +bool virArchPPCGetKvmHostCoreMode(int *threads_per_subcore); + #endif /* __VIR_ARCH_H__ */

1 1

[libvirt] [sandbox] Get gvir_sandbox_util_guess_image_format search for the last '.'
by Cédric Bosdonnat 01 Jul '15

01 Jul '15

gvir_sandbox_util_guess_image_format is failing to find the extension in paths like /tmp/tmp.mg0tQ1JLFl/mine.img --- libvirt-sandbox/libvirt-sandbox-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/libvirt-sandbox-util.c b/libvirt-sandbox/libvirt-sandbox-util.c index 6385291..d73fc8b 100644 --- a/libvirt-sandbox/libvirt-sandbox-util.c +++ b/libvirt-sandbox/libvirt-sandbox-util.c @@ -40,7 +40,7 @@ gint gvir_sandbox_util_guess_image_format(const gchar *path, { gchar *tmp; - if ((tmp = strchr(path, '.')) == NULL) { + if ((tmp = g_strrstr(path, ".")) == NULL) { g_set_error(error, GVIR_SANDBOX_UTIL_ERROR, 0, _("Cannot identify file extension in '%s'"), path); return -1; -- 2.1.4

2 1

[libvirt] [PATCH] storage: add RBD support to disk source pool translation
by Thibault VINCENT 01 Jul '15

01 Jul '15

Hello, We needed this to avoid redundancies when defining domains with RBD backends, because monitor list and authentication secret could not be pulled from the storage pool. I didn't find any bit of documentation to update, actually it already implies that disks with source type 'volume' would work with all kinds of backing pools. But mpath, sheepdog, and gluster would still require an implementation if it's possible. Using RBD volumes this way still has a limitation, we cannot list snapshots in libvirt pools. Whereas they could be accessed read-only if the domain is using a network source explicitely with a 'snapshot' attribute. How could we implement this so that snapshots are seen as pool volumes? There are real use-cases for this like attaching to a VM a backup from it's own disks. Also it would work the same way with ZFS snapshots, but AFAIK not for LVM pools. Cheers Thibault VINCENT (1): storage: add RBD support to generic disk source pool translation src/storage/storage_driver.c | 49 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) -- 2.1.4

3 9

[libvirt] [PATCH] qemu: Resolve Coverity DEADCODE
by John Ferlan 01 Jul '15

01 Jul '15

Commit id 'f967e7a6' didn't place the closing parentheses quite right causing DEADCODE errors since the rc setting/comparison was wrong. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 391190d..79338cf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1586,7 +1586,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0) goto cleanup; - if ((rc = qemuDomainAttachChrDeviceAssignAddr(priv, chr) < 0)) + if ((rc = qemuDomainAttachChrDeviceAssignAddr(priv, chr)) < 0) goto cleanup; if (rc == 1) need_release = true; -- 2.1.0

2 1

[libvirt] [PATCH 0/2][1.2.17] qemu: fix address allocation on chardev hotplug
by Ján Tomko 01 Jul '15

01 Jul '15

For bug https://bugzilla.redhat.com/show_bug.cgi?id=1230039 Patch 1/2 fixes a regression in channel device hotplug which was introduced in the last release and I would like to get it fixed before the next one. Patch 2/2 is not that important, but still a bugfix. Luyao Huang (1): qemu: fix address allocation on chardev attach Ján Tomko (1): qemu: properly free addresses on non-serial chardev unplug src/qemu/qemu_command.c | 4 +++ src/qemu/qemu_hotplug.c | 78 +++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 35 deletions(-) -- 2.3.6

3 4

[libvirt] [PATCH] conf: qemu: Taint VMs using custom device tree blob
by Peter Krempa 01 Jul '15

01 Jul '15

Using a custom device tree image may cause unexpected behavior in architectures that use this approach to detect platform devices. Since usually the device tree is generated by qemu and thus it's not normally used let's taint VMs using it to make it obvious as a possible source of problems. --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_domain.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2c3b96b..9280a76 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -102,7 +102,8 @@ VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, "external-launch", "host-cpu", "hook-script", - "cdrom-passthrough"); + "cdrom-passthrough", + "custom-dtb"); VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "qemu", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index aeba5a5..2bdbff1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2305,6 +2305,7 @@ typedef enum { VIR_DOMAIN_TAINT_HOST_CPU, /* Host CPU passthrough in use */ VIR_DOMAIN_TAINT_HOOK, /* Domain (possibly) changed via hook script */ VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH,/* CDROM passthrough */ + VIR_DOMAIN_TAINT_CUSTOM_DTB, /* Custom device tree blob was specifed */ VIR_DOMAIN_TAINT_LAST } virDomainTaintFlags; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6213fd9..22ffa83 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2105,6 +2105,9 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, for (i = 0; i < obj->def->nnets; i++) qemuDomainObjCheckNetTaint(driver, obj, obj->def->nets[i], logFD); + if (obj->def->os.dtb) + qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_DTB, logFD); + virObjectUnref(cfg); } -- 2.4.1

2 2

[libvirt] add optional redundancy element to storage
by Vasiliy Tolstov 01 Jul '15

01 Jul '15

some storages have ability to provide redundancy, for example sheepdog via full copies or erasure Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- docs/schemas/storagevol.rng | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 7450547..bd3b698 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -105,6 +105,9 @@ </choice> </element> </optional> + <optional> + <ref name='redundancy'/> + </optional> <ref name='format'/> <ref name='permissions'/> <ref name='timestamps'/> @@ -138,6 +141,27 @@ </element> </define> + <define name='redundancy'> + <optional> + <element name='replica'> + <element name='copies'> + <ref name='scaledInteger'/> + </element> + </element> + </optional> + <optional> + <element name='erasure'> + <element name='strips'> + <attribute name='data'> + <ref name='scaledInteger'/> + </attribute> + <attribute name='parity'> + <ref name='scaledInteger'/> + </attribute> + </element> + </element> + </optional> + </define> <define name='source'> <element name='source'> -- 2.3.3

1 1

[libvirt] [sandbox] Cleanup the disks.cfg file
by Cédric Bosdonnat 01 Jul '15

01 Jul '15

The newly introduced disks.cfg file is still remaining in the configuration folder after the sandbox is stopped. Let's remove it like the other things there. --- libvirt-sandbox/libvirt-sandbox-builder.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/libvirt-sandbox-builder.c index e615606..ea7d064 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -22,6 +22,7 @@ #include <config.h> #include <string.h> +#include <errno.h> #include "libvirt-sandbox/libvirt-sandbox.h" #include "libvirt-sandbox/libvirt-sandbox-builder-private.h" @@ -717,10 +718,15 @@ gboolean gvir_sandbox_builder_clean_post_stop(GVirSandboxBuilder *builder, GFileEnumerator *enumerator = NULL; GFileInfo *info = NULL; GFile *child = NULL; + gchar *dskfile = g_build_filename(statedir, "config", "disks.cfg", NULL); gboolean ret = TRUE; ret = klass->clean_post_stop(builder, config, statedir, error); + if (unlink(dskfile) < 0 && + errno != ENOENT) + ret = FALSE; + if (!(enumerator = g_file_enumerate_children(libsFile, "*", G_FILE_QUERY_INFO_NONE, NULL, error)) && (*error)->code != G_IO_ERROR_NOT_FOUND) { -- 2.1.4

2 1