January 2015 - Devel - libvirt List Archives

[libvirt] [PATCH v2 1/2] lxc: Move setting ifname_guest_actual to virLXCSetupInterfaces
by Guido Günther 12 Jan '15

12 Jan '15

so it applies to interfaces of type 'direct' too. Reported and patch provided by Bastian Blank at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769600 --- src/lxc/lxc_process.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d7eb8bc..af08de9 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -260,8 +260,6 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn, if (virNetDevSetMAC(containerVeth, &net->mac) < 0) goto cleanup; - if (VIR_STRDUP(net->ifname_guest_actual, containerVeth) < 0) - goto cleanup; if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, @@ -432,6 +430,9 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, (*veths)[(*nveths)-1] = veth; + if (VIR_STRDUP(def->nets[i]->ifname_guest_actual, veth) < 0) + goto cleanup; + /* Make sure all net definitions will have a name in the container */ if (!net->ifname_guest) { if (virAsprintf(&net->ifname_guest, "eth%zu", niface) < 0) -- 2.1.4

2 2

[libvirt] [PATCH V4 0/5] support sending sysrq key
by Chunyan Liu 12 Jan '15

12 Jan '15

xend/libxl support sending sysrq key to guest kernel but not support sending any key sequence as virDomainSendKey is expected to do. To add equivalant sysrq functionality in libvirt for xen/libxl, add a new virDomainSendSysrq API and add related codes to virsh, remote driver, xen/libxl driver. Changes to V3: * fix some memory leak Not change: virDomainSendSysrq parameter still keeps "char key" rather than "enum key", main reason to keep it because: sysrq key is different to different kinds of guests, xen hypervisor doesn't know the correct enum <-> letter mapping towards different guests, it just sends the key blindly to guests. See: http://www.redhat.com/archives/libvir-list/2015-January/msg00132.html V3 is here: http://www.redhat.com/archives/libvir-list/2014-December/msg00882.html Chunyan Liu (5): Add public API virDomainSendSysrq implement remote protocol for domainSendSysrq virsh: add 'sysrq' command libxl: implement .domainSendSysrq method xen: add .domainSendSysrq method include/libvirt/libvirt-domain.h | 3 +++ src/driver-hypervisor.h | 4 +++ src/libvirt-domain.c | 39 +++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++++ src/libxl/libxl_driver.c | 25 ++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++++++++- src/remote_protocol-structs | 6 +++++ src/rpc/gendispatch.pl | 12 +++++++++ src/xen/xen_driver.c | 21 +++++++++++++++ src/xen/xend_internal.c | 30 +++++++++++++++++++++ src/xen/xend_internal.h | 1 + tools/virsh-domain.c | 57 ++++++++++++++++++++++++++++++++++++++++ 13 files changed, 217 insertions(+), 1 deletion(-) -- 1.8.4.5

1 5

[libvirt] [PATCH V3 0/4] Xen-xl parser
by Jim Fehlig 10 Jan '15

10 Jan '15

This is V3 of David's series to add support for parsing and formating Xen's xl config format https://www.redhat.com/archives/libvir-list/2014-September/msg00587.html Patch 1 has been rebased, but otherwise unchanged. In patch 2, I was able to get automake and flex play together using LEX_OUTPUT_ROOT and AM_LFLAGS. Files generated from flex are placed in a separate convenience lib to avoid compilation with WARN_FLAGS. The generated files are also excluded from syntax-check. I switched the order of patches 3 and 4 since config parsing/ formating tests should come right after the implementation. I also added more diskspecs to the test configs. Kiarie Kahurani (4): src/xenconfig: Export helper functions src/xenconfig: Xen-xl parser tests: Tests for the xen-xl parser libxl: Add support for parsing/formating Xen XL config .gitignore | 1 + cfg.mk | 3 +- configure.ac | 1 + po/POTFILES.in | 1 + src/Makefile.am | 25 +- src/libvirt_xenconfig.syms | 4 + src/libxl/libxl_driver.c | 32 ++- src/xenconfig/xen_common.c | 149 +++++------ src/xenconfig/xen_common.h | 24 +- src/xenconfig/xen_xl.c | 499 +++++++++++++++++++++++++++++++++++ src/xenconfig/xen_xl.h | 33 +++ src/xenconfig/xen_xl_disk.l | 256 ++++++++++++++++++ src/xenconfig/xen_xl_disk_i.h | 39 +++ tests/Makefile.am | 9 +- tests/testutilsxen.c | 50 ++++ tests/testutilsxen.h | 9 +- tests/xlconfigdata/test-new-disk.cfg | 26 ++ tests/xlconfigdata/test-new-disk.xml | 51 ++++ tests/xlconfigdata/test-spice.cfg | 32 +++ tests/xlconfigdata/test-spice.xml | 45 ++++ tests/xlconfigtest.c | 224 ++++++++++++++++ 21 files changed, 1421 insertions(+), 92 deletions(-) create mode 100644 src/xenconfig/xen_xl.c create mode 100644 src/xenconfig/xen_xl.h create mode 100644 src/xenconfig/xen_xl_disk.l create mode 100644 src/xenconfig/xen_xl_disk_i.h create mode 100644 tests/xlconfigdata/test-new-disk.cfg create mode 100644 tests/xlconfigdata/test-new-disk.xml create mode 100644 tests/xlconfigdata/test-spice.cfg create mode 100644 tests/xlconfigdata/test-spice.xml create mode 100644 tests/xlconfigtest.c -- 1.8.4.5

4 12

[libvirt] [PATCH v4 0/2] fix parallel build broken by the new xen_xl_disk parser
by Pavel Hrdina 10 Jan '15

10 Jan '15

Pavel Hrdina (2): src/Makefile: move the new xen_xl_disk parser code at the correct place src/Makefile: Fix parallel build after xen_xl_disk parser introduction src/Makefile.am | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) -- 2.0.5

5 11

[libvirt] [PATCH] Fix few memory leaks found by Coverity
by Pavel Hrdina 10 Jan '15

10 Jan '15

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 10 ++++++++-- src/openvz/openvz_driver.c | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d1a483a..eacd687 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17264,17 +17264,20 @@ virDomainNetIpsFormat(virBufferPtr buf, virDomainNetIpDefPtr *ips, size_t nips) virSocketAddrPtr address = &ips[i]->address; char *ipStr = virSocketAddrFormat(address); const char *familyStr = NULL; + if (VIR_SOCKET_ADDR_IS_FAMILY(address, AF_INET6)) familyStr = "ipv6"; else if (VIR_SOCKET_ADDR_IS_FAMILY(address, AF_INET)) familyStr = "ipv4"; - virBufferAsprintf(buf, "<ip address='%s'", - ipStr); + + virBufferAsprintf(buf, "<ip address='%s'", ipStr); if (familyStr) virBufferAsprintf(buf, " family='%s'", familyStr); if (ips[i]->prefix != 0) virBufferAsprintf(buf, " prefix='%u'", ips[i]->prefix); virBufferAddLit(buf, "/>\n"); + + VIR_FREE(ipStr); } } @@ -17306,6 +17309,9 @@ virDomainNetRoutesFormat(virBufferPtr buf, virBufferAsprintf(buf, " prefix='%d'", route->prefix); virBufferAddLit(buf, "/>\n"); + + VIR_FREE(via); + VIR_FREE(to); } } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index c144eca..64f5219 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -911,6 +911,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, for (i = 0; i < net->nips; i++) { char *ipStr = virSocketAddrFormat(&net->ips[i]->address); virCommandAddArgList(cmd, "--ipadd", ipStr, NULL); + VIR_FREE(ipStr); } } -- 2.0.5

4 3

[libvirt] [PATCHv2] conf: fix cannot get mutli value settings when parse controllers XML
by Luyao Huang 10 Jan '15

10 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1179684 We generate the scsi controller XML like this before (actualy this is wrong, we shouldn't set mutli-drivers in different line): <controller type='scsi' index='0' model='virtio-scsi'> <driver queues='12'/> <driver cmd_per_lun='123'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> But this will cause a issue when we parse controllers XML in virDomainControllerDefParseXML, we will try to get queues, cmd_per_lun,max_sectors settings from XML, we will try to get this three values in multi-loop(depend on the number of value we set here), then the old value will be covered by new value in new loop. The result is we only can get one value settings after these loop even we set 3. The loop is here: while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (xmlStrEqual(cur->name, BAD_CAST "driver")) { queues = virXMLPropString(cur, "queues"); cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); max_sectors = virXMLPropString(cur, "max_sectors"); } } cur = cur->next; } this patch will change the XML to this: <controller type='scsi' index='0' model='virtio-scsi'> <driver queues='12' cmd_per_lun='123'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b9858cd..b3e9448 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17120,14 +17120,19 @@ virDomainControllerDefFormat(virBufferPtr buf, virDomainDeviceInfoIsSet(&def->info, flags) || pcihole64) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - if (def->queues) - virBufferAsprintf(buf, "<driver queues='%u'/>\n", def->queues); - if (def->cmd_per_lun) - virBufferAsprintf(buf, "<driver cmd_per_lun='%u'/>\n", def->cmd_per_lun); + if (def->queues || def->cmd_per_lun || def->max_sectors) { + virBufferAddLit(buf, "<driver"); + if (def->queues) + virBufferAsprintf(buf, " queues='%u'", def->queues); - if (def->max_sectors) - virBufferAsprintf(buf, "<driver max_sectors='%u'/>\n", def->max_sectors); + if (def->cmd_per_lun) + virBufferAsprintf(buf, " cmd_per_lun='%u'", def->cmd_per_lun); + + if (def->max_sectors) + virBufferAsprintf(buf, " max_sectors='%u'", def->max_sectors); + virBufferAddLit(buf, "/>\n"); + } if (virDomainDeviceInfoIsSet(&def->info, flags) && virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/2] Fix migration to older libvirt
by Pavel Hrdina 09 Jan '15

09 Jan '15

Recently I've implemented new feature that we can set "vgamem_mb" for QXL device and also I've fixed libvirt to honor the 'vram' attribute and pass that value to QEMU process. But with this change the migration to older libvirt stopped working because QEMU silently updates the video memory size if the value is too low or there are some dependencies (for example QXL device has to have 'ram' size twice as 'vgamem'). To fix the migration we need to load the updated values from QEMU and store them into the status XML. v1: - removed unnecessary movement of qemuMonitorJSONObjectProperty - completely rewritten the second patch Pavel Hrdina (2): qemu_monitor: introduce new function to get QOM path qemu_process: detect updated video ram size values from QEMU src/qemu/qemu_monitor.c | 210 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 69 ++++++++++++++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 71 +++++++++++++++ 5 files changed, 287 insertions(+), 70 deletions(-) -- 2.0.5

2 6

[libvirt] [PATCH] safezero: fall back to writing zeroes even when resizing
by Ján Tomko 09 Jan '15

09 Jan '15

Remove the resize flag and use the same code path for all callers. This flag was added by commit 18f0316 to allow virStorageFileResize use 'safezero' while preserving the behavior. Explicitly return -2 when a fallback to a different method should be done, to make the code path more obvious. Fail immediately when ftruncate fails in the mmap method, as we did before commit 18f0316. --- src/locking/lock_driver_sanlock.c | 4 ++-- src/storage/storage_backend.c | 2 +- src/util/virfile.c | 34 ++++++++++++---------------------- src/util/virfile.h | 2 +- src/util/virstoragefile.c | 13 ++++--------- 5 files changed, 20 insertions(+), 35 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 9fc97db..60f305c 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -281,7 +281,7 @@ static int virLockManagerSanlockSetupLockspace(void) /* * Pre allocate enough data for 1 block of leases at preferred alignment */ - if (safezero(fd, 0, rv, false) < 0) { + if (safezero(fd, 0, rv) < 0) { virReportSystemError(errno, _("Unable to allocate lockspace %s"), path); @@ -690,7 +690,7 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res) /* * Pre allocate enough data for 1 block of leases at preferred alignment */ - if (safezero(fd, 0, rv, false) < 0) { + if (safezero(fd, 0, rv) < 0) { virReportSystemError(errno, _("Unable to allocate lease %s"), res->disks[0].path); diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 472cec6..b990a82 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -399,7 +399,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, } if (remain && need_alloc) { - if (safezero(fd, vol->target.allocation - remain, remain, false) < 0) { + if (safezero(fd, vol->target.allocation - remain, remain) < 0) { ret = -errno; virReportSystemError(errno, _("cannot fill file '%s'"), vol->target.path); diff --git a/src/util/virfile.c b/src/util/virfile.c index a2bf008..5f56005 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1053,7 +1053,7 @@ safezero_posix_fallocate(int fd ATTRIBUTE_UNUSED, off_t offset ATTRIBUTE_UNUSED, off_t len ATTRIBUTE_UNUSED) { - return -1; + return -2; } #endif /* !HAVE_POSIX_FALLOCATE */ @@ -1063,9 +1063,7 @@ safezero_sys_fallocate(int fd, off_t offset, off_t len) { - int rc = -1; - rc = syscall(SYS_fallocate, fd, 0, offset, len); - return rc; + return syscall(SYS_fallocate, fd, 0, offset, len); } #else /* !HAVE_SYS_SYSCALL_H || !defined(SYS_fallocate) */ static int @@ -1073,9 +1071,7 @@ safezero_sys_fallocate(int fd ATTRIBUTE_UNUSED, off_t offset ATTRIBUTE_UNUSED, off_t len ATTRIBUTE_UNUSED) { - int rc = -1; - errno = ENOSYS; - return rc; + return -2; } #endif /* !HAVE_SYS_SYSCALL_H || !defined(SYS_fallocate) */ @@ -1111,7 +1107,7 @@ safezero_mmap(int fd, off_t offset, off_t len) /* fall back to writing zeroes using safewrite if mmap fails (for * example because of virtual memory limits) */ - return -1; + return -2; } #else /* !HAVE_MMAP */ static int @@ -1119,7 +1115,7 @@ safezero_mmap(int fd ATTRIBUTE_UNUSED, off_t offset ATTRIBUTE_UNUSED, off_t len ATTRIBUTE_UNUSED) { - return -1; + return -2; } #endif /* !HAVE_MMAP */ @@ -1160,26 +1156,20 @@ safezero_slow(int fd, off_t offset, off_t len) return 0; } -int safezero(int fd, off_t offset, off_t len, bool resize) +int safezero(int fd, off_t offset, off_t len) { int ret; - /* posix_fallocate returns 0 on success or error number on failure, - * but errno is not set so use that to our advantage since we set - * errno to the returned value if we make the call. If we don't make - * the call because it doesn't exist, then errno won't change and - * we can try other methods. - */ - errno = 0; ret = safezero_posix_fallocate(fd, offset, len); - if (ret == 0 || errno != 0) + if (ret != -2) return ret; - if (resize) - return safezero_sys_fallocate(fd, offset, len); - - if (safezero_mmap(fd, offset, len) == 0) + if (safezero_sys_fallocate(fd, offset, len) == 0) return 0; + + ret = safezero_mmap(fd, offset, len); + if (ret != -2) + return ret; return safezero_slow(fd, offset, len); } diff --git a/src/util/virfile.h b/src/util/virfile.h index b8e30c3..403d0ba 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -41,7 +41,7 @@ typedef enum { ssize_t saferead(int fd, void *buf, size_t count) ATTRIBUTE_RETURN_CHECK; ssize_t safewrite(int fd, const void *buf, size_t count) ATTRIBUTE_RETURN_CHECK; -int safezero(int fd, off_t offset, off_t len, bool resize) +int safezero(int fd, off_t offset, off_t len) ATTRIBUTE_RETURN_CHECK; /* Don't call these directly - use the macros below */ diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2be6c34..7a4f9a0 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1117,15 +1117,10 @@ virStorageFileResize(const char *path, } if (pre_allocate) { - if (safezero(fd, offset, len, true) != 0) { - if (errno == ENOSYS) - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("preallocate is not supported on this " - "platform")); - else - virReportSystemError(errno, - _("Failed to pre-allocate space for " - "file '%s'"), path); + if (safezero(fd, offset, len) != 0) { + virReportSystemError(errno, + _("Failed to pre-allocate space for " + "file '%s'"), path); goto cleanup; } } else { -- 2.0.4

2 1

[libvirt] [PATCH] virsh.pod: Update description
by John Ferlan 09 Jan '15

09 Jan '15

The 'pool-build' command description for --overwrite and --no-overwrite indicated usage for only 'filesystem' pools; however, the 'disk' pool also supports the flags as of commit id 'afa1029a'. So add a description for that usage. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh.pod | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 63b6035..56fe896 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2953,13 +2953,20 @@ Configure whether I<pool> should automatically start at boot. Build a given pool. Options I<--overwrite> and I<--no-overwrite> can only be used for -B<pool-build> a filesystem pool. If neither of them is specified, -B<pool-build> on a filesystem pool only makes the directory; If +B<pool-build> a filesystem or disk pool. For a file system pool if +neither of them is specified, B<pool-build> makes the directory. If I<--no-overwrite> is specified, it probes to determine if a filesystem already exists on the target device, returning an error -if exists, or using mkfs to format the target device if not; If -I<--overwrite> is specified, mkfs is always executed, any existed -data on the target device is overwritten unconditionally. +if exists, or using mkfs to format the target device if not. If +I<--overwrite> is specified, mkfs is always executed and any existing +data on the target device is overwritten unconditionally. For a disk +pool, if neither of them is specified or I<--no-overwrite> is specified, +B<pool-build> will use 'parted --print' in order to determine if the +disk already has a label before attempting to create one. Only if a disk +does not already have one will a label be created. If I<--overwrite> is +specified or it's been determined that the disk doesn't already have one, +'parted mklabel' will be used to create a label of the format specified +by the pool source format type or "dos" if not specified for the pool. =item B<pool-create> I<file> @@ -3939,7 +3946,7 @@ Alternatively report bugs to your software distributor / vendor. =head1 COPYRIGHT -Copyright (C) 2005, 2007-2014 Red Hat, Inc., and the authors listed in the +Copyright (C) 2005, 2007-2015 Red Hat, Inc., and the authors listed in the libvirt AUTHORS file. =head1 LICENSE -- 2.1.0

2 1

[libvirt] [PATCH] Firewall : let libvirtd proceed after verifying locking args
by Prerna Saxena 09 Jan '15

09 Jan '15

I recently encountered a situation where an unclean ebtables shutdown caused /var/lib/ebtables/lock to be left behind. When libvirtd was started on such a system, it caused libvirtd to "hang". Reason: While probing to check if locking was supported, libvirt runs this command synchronously : # /usr/sbin/ebtables --concurrent -L And this seemed to go on with msgs like : Trying to obtain lock /var/lib/ebtables/lock Trying to obtain lock /var/lib/ebtables/lock Trying to obtain lock /var/lib/ebtables/lock Result: Libvirtd never recovered from this scenario, and the system was essentially unable to start any VMs. The following patch fixes this scenario: ----------------------------------------------------------- >From ec245eccc03e8a69dc2c2e6edbf30a7b34eb74d0 Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Fri, 26 Dec 2014 15:24:45 -0500 Subject: [PATCH] Firewall : let libvirtd proceed after verifying valid locking args. Commit dc33e6e4a5a5d42 introduces locking args to be run with [eb/ip]tables to determine whether locking is supported. However, this command needs to be run asynchronously ( as against its present synchronous run), and needs to be gracefully terminated once the job is done. Else it can potentially stall libvirtd with messages like : "Trying to acquire lock ..." Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- src/util/virfirewall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index b536912..c120717 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -121,12 +121,16 @@ virFirewallCheckUpdateLock(bool *lockflag, { int status; /* Ignore failed commands without logging them */ virCommandPtr cmd = virCommandNewArgs(args); - if (virCommandRun(cmd, &status) < 0 || status) { + status = virCommandRunAsync(cmd, NULL); + if (status < 0) { VIR_INFO("locking not supported by %s", args[0]); + goto cleanup; } else { VIR_INFO("using locking for %s", args[0]); *lockflag = true; } +cleanup: + virCommandAbort(cmd); virCommandFree(cmd); } -- 1.8.4.2 Regards, ---------- Prerna Saxena, IBM Systems & technology Labs, Bangalore

2 2