- Devel - libvirt List Archives

[libvirt] [PATCH] conf: error out on missing dhcp host attributes
by Ján Tomko 26 Feb '15

26 Feb '15

In virNetworkDHCPHostDefParseXML an error is reported when partialOkay == true, and none of ip, mac, name were supplied. Add the missing goto and error out in this case. --- src/conf/network_conf.c | 1 + 1 file changed, 1 insertion(+) Pushed as trivial. diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 52fcf3d..0f4fc1e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -746,6 +746,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, "must be specified for static host definition " "in network '%s' "), networkName); + goto cleanup; } } else { /* normal usage - you need at least name (IPv6) or one of MAC -- 2.0.5

1 0

[libvirt] [PATCH] conf: fix not jump to cleanup when parse a host id is invalid
by Luyao Huang 26 Feb '15

26 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1196503 We already check whether the host id is valid or not, add a jump to forbid invalid host id. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/network_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 3d8bf05..52fcf3d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -717,6 +717,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("Invalid character '%c' in id '%s' of network '%s'"), *cp, id, networkName); + goto cleanup; } } -- 1.8.3.1

3 2

[libvirt] [PATCH 0/2] check for null ifname when setting/clearing bandwidth
by Laine Stump 26 Feb '15

26 Feb '15

When John Ferlan ran the Coverity static checker on my patches to fix the problem with nicindexes, it began complaining about calling the virNetDevBandwidth* functions with a null ifname. Investigation pointed out some real problems with this that are fixed by these two patches (which will be pushed *before* the nicindex fix patch). Laine Stump (2): network: only clear bandwidth if it has been set util: check for null ifname inside virNetDevBandwidthSet() src/conf/netdev_bandwidth_conf.c | 6 ++++-- src/lxc/lxc_driver.c | 7 ++++++- src/network/bridge_driver.c | 6 ++++-- src/qemu/qemu_hotplug.c | 4 +++- src/util/virnetdevbandwidth.c | 9 ++++++++- src/util/virnetdevbandwidth.h | 4 ++-- 6 files changed, 27 insertions(+), 9 deletions(-) -- 2.1.0

4 10

[libvirt] Entering freeze for libvirt-1.2.13
by Daniel Veillard 26 Feb '15

26 Feb '15

As suggested yesterday, and hearing no opposition, I have just tagged Redlease Candidate 1 for libvirt-1.2.13 in git and signed tarballs and rpms for it available at the usual place: ftp://libvirt.org/libvirt/ Based on my own but minimal testing this seems to work, but obviously please give it a try so we can squash bugs and portability issues in time. A candidate release 2 on Thursday and a final 1.2.13 release next Monday is the schedule assumeing no major issue is found, so please give it a test ! Thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH 1/3] utils: Implement virCommandPassFDGetFDIndex
by Stefan Berger 26 Feb '15

26 Feb '15

Implement virCommandPassFDGetFDIndex to determine the index a given file descriptor will have when passed to the child process. When this function is called, a flag is set to prevent the reordering of the file descriptors. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + src/util/vircommand.c | 33 +++++++++++++++++++++++++++++++++ src/util/vircommand.h | 3 +++ 3 files changed, 37 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c156b40..aadb833 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1213,6 +1213,7 @@ virCommandNewArgList; virCommandNewArgs; virCommandNonblockingFDs; virCommandPassFD; +virCommandPassFDGetFDIndex; virCommandPassListenFDs; virCommandRawStatus; virCommandRequireHandshake; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6527d85..2616446 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -67,6 +67,7 @@ enum { VIR_EXEC_RUN_SYNC = (1 << 3), VIR_EXEC_ASYNC_IO = (1 << 4), VIR_EXEC_LISTEN_FDS = (1 << 5), + VIR_EXEC_FIXED_FDS = (1 << 6), }; typedef struct _virCommandFD virCommandFD; @@ -214,6 +215,12 @@ virCommandReorderFDs(virCommandPtr cmd) if (!cmd || cmd->has_error || !cmd->npassfd) return; + if ((cmd->flags & VIR_EXEC_FIXED_FDS)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The fds are fixed and cannot be reordered")); + goto error; + } + for (i = 0; i < cmd->npassfd; i++) maxfd = MAX(cmd->passfd[i].fd, maxfd); @@ -1019,6 +1026,32 @@ virCommandPassListenFDs(virCommandPtr cmd) cmd->flags |= VIR_EXEC_LISTEN_FDS; } +/* + * virCommandPassFDGetFDIndex: + * @cmd: pointer to virCommand + * @fd: FD to get index of + * + * Determine the index of the FD in the transfer set. + * + * Returns index >= 0 if @set contains @fd, + * -1 otherwise. + */ +int +virCommandPassFDGetFDIndex(virCommandPtr cmd, int fd) +{ + size_t i = 0; + + while (i < cmd->npassfd) { + if (cmd->passfd[i].fd == fd) { + cmd->flags |= VIR_EXEC_FIXED_FDS; + return i; + } + i++; + } + + return -1; +} + /** * virCommandSetPidFile: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index bf65de4..198da2f 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -62,6 +62,9 @@ void virCommandPassFD(virCommandPtr cmd, void virCommandPassListenFDs(virCommandPtr cmd); +int virCommandPassFDGetFDIndex(virCommandPtr cmd, + int fd); + void virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) ATTRIBUTE_NONNULL(2); -- 1.9.3

3 12

[libvirt] [PATCHv2 0/2] Boot options cleanup
by Ján Tomko 25 Feb '15

25 Feb '15

Depends on the first two (ACKed) patches from: https://www.redhat.com/archives/libvir-list/2015-February/msg00662.html Patch 4/5 Rename boot_buf to boot_opts was dropped. In this version, only one virBuffer is used and just the strings are separate. Ján Tomko (2): Make -boot arg generation more readable Use virBufferTrim when generating boot options src/qemu/qemu_command.c | 59 ++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) -- 2.0.5

4 7

[libvirt] [PATCH 0/2] schema: Improve schema for the <os> element
by Peter Krempa 25 Feb '15

25 Feb '15

Peter Krempa (2): schema: Visually separate <define> blocks in RNG schema: Allow interleaving the /domain/os/type element docs/schemas/domaincommon.rng | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 2.2.2

2 4

[libvirt] [PATCH] spec: Yet another permission fix for qemu dirs
by Martin Kletzander 25 Feb '15

25 Feb '15

Since we autogenerate path for QEMU guest agent into LOCALSTATEDIR /lib/libvirt/qemu/channel/target/, the process should be able to access that socket no matter under what user/group it is running co you can set the user/group in qemu.conf. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1146886 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7f8be38..f300423 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1960,9 +1960,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0711, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug -- 2.3.0

3 5

[libvirt] [PATCH] Fix typos in messages
by Yuri Chornoivan 25 Feb '15

25 Feb '15

--- src/parallels/parallels_sdk.c | 2 +- src/qemu/qemu_monitor_json.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index bbc26ef..36c6c5f 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -2307,7 +2307,7 @@ static int prlsdkCheckDiskUnsupportedParams(virDomainDiskDefPtr disk) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only hard disks and cdroms are supported " - "supported by parallels driver.")); + "by parallels driver.")); return -1; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index da5c14d..832f589 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1320,7 +1320,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, case VIR_DOMAIN_VIDEO_TYPE_VGA: if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vgamem_mb'"), + _("QOM Object '%s' has no property 'vgamem_mb'"), path); return -1; } @@ -1329,21 +1329,21 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, case VIR_DOMAIN_VIDEO_TYPE_QXL: if (qemuMonitorJSONGetObjectProperty(mon, path, "vram_size", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vram_size'"), + _("QOM Object '%s' has no property 'vram_size'"), path); return -1; } video->vram = prop.val.ul / 1024; if (qemuMonitorJSONGetObjectProperty(mon, path, "ram_size", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'ram_size'"), + _("QOM Object '%s' has no property 'ram_size'"), path); return -1; } video->ram = prop.val.ul / 1024; if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vgamem_mb'"), + _("QOM Object '%s' has no property 'vgamem_mb'"), path); return -1; } @@ -1352,7 +1352,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, case VIR_DOMAIN_VIDEO_TYPE_VMVGA: if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Objext '%s' has no property 'vgamem_mb'"), + _("QOM Object '%s' has no property 'vgamem_mb'"), path); return -1; } -- 1.8.5.6

3 2

[libvirt] Reopening file descriptors
by Christopher Pereira 25 Feb '15

25 Feb '15

Hi, I'm chasing a bug related with libvirt not being able to resume a VM paused because of an IO Error for images stored on a gluster volume. The bug was reported in oVirt here: https://bugzilla.redhat.com/show_bug.cgi?id=1058300#c39 To reproduce: 1) Run a VM on a gluster volume 2) Stop the gluser volume (VM will be paused) 3) Start the gluster volume 4) virsh resume VM (will fail) QEMU logs will say: block I/O error in device 'drive-virtio-disk0': Transport endpoint is not connected (107) And VM will not be resumed. My guess is that libvirt is not telling QEMU to reopen its file descriptors. Can someone please confirm or fix?

2 1