- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/5] virsh: Further improve handling of integer options
by Andrea Bolognani 02 Jun '15

02 Jun '15

As suggested by Michal: now that we have a generic error message for failures related to the parsing of integer options, it makes sense to perform the corresponding check in a single spot instead of replicating it every time vshCommandOpt*() is used. Andrea Bolognani (5): virsh: Use standard error message in vshCommandOptTimeoutToMs(). virsh: Improve vshCommandOptTimeoutToMs(). virsh: Make vshCommandOptScaledInt() use vshCommandOpt(). virsh: Pass vshControl to all vshCommandOpt*() calls. virsh: Move error messages inside vshCommandOpt*() functions. tests/vcpupin | 4 +- tools/virsh-domain-monitor.c | 17 +-- tools/virsh-domain.c | 226 ++++++++++++--------------------------- tools/virsh-host.c | 67 +++--------- tools/virsh-interface.c | 6 +- tools/virsh-network.c | 10 +- tools/virsh-nodedev.c | 4 +- tools/virsh-snapshot.c | 2 +- tools/virsh-volume.c | 26 +---- tools/virsh.c | 248 +++++++++++++++++++++++++------------------ tools/virsh.h | 66 ++++++------ 11 files changed, 278 insertions(+), 398 deletions(-) -- 2.1.0

2 11

[libvirt] [PATCH] nwfilter: Fix sscanf off-by-one error in virNWFilterSnoopLeaseFileLoad
by Erik Skultety 02 Jun '15

02 Jun '15

We allocate 16 bytes for IPv4 address and 55 bytes for interface key, therefore we should read up to 15/54 bytes and let the last byte reserved for terminating null byte in sscanf. https://bugzilla.redhat.com/show_bug.cgi?id=1226400 --- src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 6da8983..f331e22 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1958,8 +1958,8 @@ virNWFilterSnoopLeaseFileLoad(void) break; } ln++; - /* key len 55 = "VMUUID"+'-'+"MAC" */ - if (sscanf(line, "%u %55s %16s %16s", &ipl.timeout, + /* key len 54 = "VMUUID"+'-'+"MAC" */ + if (sscanf(line, "%u %54s %15s %15s", &ipl.timeout, ifkey, ipstr, srvstr) < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("virNWFilterSnoopLeaseFileLoad lease file " -- 1.9.3

2 3

[libvirt] [PATCH] qemu: fix unsuitable error report when get memory stats
by Wang Yufei 02 Jun '15

02 Jun '15

From: Zhang Bo <oscar.zhangbo(a)huawei.com> when we run the command 'virsh dommemstat xxx', althrough memballoon's model is set 'none' in vm's XML, it still reports an error in libvirtd.log. error : qemuMonitorFindBalloonObjectPath:1042 : internal error: Cannot determine balloon device path Apparently, if we don't set memballoon, we don't need to set balloon device path. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- .gnulib | 2 +- src/qemu/qemu_monitor.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 875ec93..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 875ec93e1501d2d2a8bab1b64fa66b8ceb51dc67 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f959b74..c72702d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1711,7 +1711,9 @@ qemuMonitorGetMemoryStats(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); if (mon->json) { - ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); + if (mon->vm->def->memballoon && + mon->vm->def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) + ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); mon->ballooninit = true; return qemuMonitorJSONGetMemoryStats(mon, mon->balloonpath, stats, nr_stats); -- 1.7.12.4

2 4

[libvirt] [PATCH] util: process: @pid in virProcessSetAffinity's BSD impl is not unused
by Peter Krempa 02 Jun '15

02 Jun '15

--- Pushed as trivial. src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 7a79970..501569f 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -537,7 +537,7 @@ int virProcessGetAffinity(pid_t pid, #elif defined(HAVE_BSD_CPU_AFFINITY) -int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, +int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; -- 2.4.1

1 0

[libvirt] [libvirt-test-api][PATCH] fix imperfect cleanup cause the case will always fail
by Luyao Huang 02 Jun '15

02 Jun '15

Remove call undefined function. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- repos/virconn/connection_getMemoryParameters.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/repos/virconn/connection_getMemoryParameters.py b/repos/virconn/connection_getMemoryParameters.py index 9b88fc3..d110b35 100644 --- a/repos/virconn/connection_getMemoryParameters.py +++ b/repos/virconn/connection_getMemoryParameters.py @@ -16,7 +16,6 @@ node_memory = ['full_scans', 'sleep_millisecs'] SYSFS_MEMORY_SHARED_PATH = '/sys/kernel/mm/ksm/' -LIBVIRT_API_PATH = '/usr/share/libvirt/api/libvirt-api.xml' flags=0 def check_memory_parameter(libvirt_dict, parameter_name): @@ -47,9 +46,6 @@ def connection_getMemoryParameters(params): logger.info("get connection to libvirtd") - if utils.check_flags('getMemoryParameters', LIBVIRT_API_PATH) == 1: - return 1 - param_dict=conn.getMemoryParameters() for n in node_memory: -- 1.8.3.1

2 1

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 02 Jun '15

02 Jun '15

Incorporates fixes for cross-compiling to mingw on rawhide, where gcc 5.1 changes detection of how to properly determine PRIdMAX. * .gnulib: Update to latest, for mingw. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I've missed the freeze for rc1, but confirmed that this update is rather minimal and should only affect mingw (in particular, it will fix cross-compilation failure under rawhide with gcc 5.1). As such, I won't push without review, but I also argue that the changeset is small enough that it should be safe if we agree to take it before rc2. * .gnulib 875ec93...c26527c (5): > stdio: limit __gnu_printf__ witness to gcc 4.4+ > error: use correct printf attributes on mingw > update from texinfo > inttypes: force correct mingw PRIdMAX even without <stdio.h> > stdio: fix probe on mingw under gcc 5.1 .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 875ec93..c26527c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 875ec93e1501d2d2a8bab1b64fa66b8ceb51dc67 +Subproject commit c26527cebbbf42ed1dbc50df0074861e0ebe33dc -- 2.1.0

1 1

[libvirt] [PATCH] test: fix IP address range failure test
by Laine Stump 01 Jun '15

01 Jun '15

This was revealed when I made a cut-paste mistake in an upgrade to virSocketAddrGetRange(), leading to failure to check for the end address being outside of the defined network, but a negative test case that should have caught the error instead returned success. The problem was that testRange in sockettest.c was written so that when it expected a failure, even an "unexpected success" would be considered as an "expected failure" because of the way the check in testRange was done. testRange had this: if (gotsize < 0 || gotsize != size) { return pass ? -1 : 0; } else { return pass ? 0 : -1; } but all the tests that expected a failure give "-1" as the expected size. So in a case where we expect a failure, we would have pass == false and size == -1. If virSocketAddrGetRange() was incorrectly *successful* (returned some positive number), then "gotsize != size" would be, e.g. "276 != -1", so we would take the if clause and, since pass == false, we would return 0 (success i.e. expected failure). The solution is that in the case where we expect failure, we should just ignore size - virSocketAddrGetRange() must return -1 in order for us to report "expected failure == success". --- Here's the email where jferlan points out the typo and asks about the apparent lack of a proper negative test case: https://www.redhat.com/archives/libvir-list/2015-May/msg01166.html tests/sockettest.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/sockettest.c b/tests/sockettest.c index 84170d5..292edb6 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -103,10 +103,12 @@ testRange(const char *saddrstr, const char *eaddrstr, int gotsize = virSocketAddrGetRange(&saddr, &eaddr, &netaddr, prefix); VIR_DEBUG("Size want %d vs got %d", size, gotsize); - if (gotsize < 0 || gotsize != size) { - return pass ? -1 : 0; + if (pass) { + /* fail if virSocketAddrGetRange returns failure, or unexpected size */ + return (gotsize < 0 || gotsize != size) ? -1 : 0; } else { - return pass ? 0 : -1; + /* succeed if virSocketAddrGetRange fails, otherwise fail. */ + return gotsize < 0 ? 0 : -1; } } -- 2.1.0

2 1

[libvirt] [PATCH] spec: fixes for recently introduced libxl conf files
by Jim Fehlig 01 Jun '15

01 Jun '15

Commit 198cc1d3 introduced libxl-lockd and libxl-sanlock config files but forgot to add them to the spec file. Follow-up commit 62b18d98 added the files to daemon-driver-libxl, but missed adding them to the daemon package when configuring libvirt --without-driver-modules. In addition, commit 62b18d98 added libxl-sanlock to daemon-driver-libxl, but it should be included in lock-sanlock when libvirt is configured --with-sanlock. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Given the problems I've caused with the original commit 198cc1d3, I'm reluctant to push this as a build-breaker without another set of eyes reviewing it. libvirt.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f95e31f..0c343d6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2007,6 +2007,7 @@ exit 0 %endif %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ @@ -2130,7 +2131,6 @@ exit 0 %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf -%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %{_datadir}/augeas/lenses/libvirtd_libxl.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ @@ -2183,6 +2183,9 @@ exit 0 %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf %endif + %if %{with_libxl} +%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf + %endif %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug -- 1.8.4.5

3 6

[libvirt] virt-manager - applicability
by poma 01 Jun '15

01 Jun '15

Applicability of the changes in configuration is broken, at least to some extent. e.g. Controller USB - USB2 to USB3 and vice versa, etc. $ rpm -q virt-manager virt-manager-1.2.0-1.fc22.noarch $ rpm -q virt-manager virt-manager-1.2.0-1.fc23.noarch However it is resolved upstream. Tested with commit: $ git log -1 commit b02cb7ffa04cf40d66b69cfb4c52b755b90470ed Author: Cole Robinson <crobinso(a)redhat.com> Date: Wed May 20 17:42:45 2015 -0400 delete: Improve dialog sizing and scrolling Drop horizontal scrolling, since with gtk3 hidden scrollbars it might mean users don't realize there's info that is scrolled off. Adjust the default sizing to match that pattern The new release will follow soon?

2 2

[libvirt] [PATCH v2] libxl: load on FreeBSD
by Roman Bogorodskiy 01 Jun '15

01 Jun '15

The libxl tries to check if it's running in dom0 by parsing /proc/xen/capabilities and if that fails it doesn't load. There's no procfs interface in Xen on FreeBSD, so this check always fails. In addition to checking procfs, check if /dev/xen/xenstored, that's enough to check if we're running in dom0 in FreeBSD case. --- src/libxl/libxl_driver.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 12be816..fddafa1 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -74,6 +74,7 @@ VIR_LOG_INIT("libxl.libxl_driver"); #define LIBXL_CONFIG_FORMAT_SEXPR "xen-sxpr" #define HYPERVISOR_CAPABILITIES "/proc/xen/capabilities" +#define HYPERVISOR_XENSTORED "/dev/xen/xenstored" /* Number of Xen scheduler parameters */ #define XEN_SCHED_CREDIT_NPARAM 2 @@ -427,8 +428,6 @@ static bool libxlDriverShouldLoad(bool privileged) { bool ret = false; - int status; - char *output = NULL; /* Don't load if non-root */ if (!privileged) { @@ -436,24 +435,27 @@ libxlDriverShouldLoad(bool privileged) return ret; } - if (!virFileExists(HYPERVISOR_CAPABILITIES)) { - VIR_INFO("Disabling driver as " HYPERVISOR_CAPABILITIES - " does not exist"); - return ret; - } - /* - * Don't load if not running on a Xen control domain (dom0). It is not - * sufficient to check for the file to exist as any guest can mount - * xenfs to /proc/xen. - */ - status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output); - if (status >= 0) - status = strncmp(output, "control_d", 9); - VIR_FREE(output); - if (status) { - VIR_INFO("No Xen capabilities detected, probably not running " - "in a Xen Dom0. Disabling libxenlight driver"); - + if (virFileExists(HYPERVISOR_CAPABILITIES)) { + int status; + char *output = NULL; + /* + * Don't load if not running on a Xen control domain (dom0). It is not + * sufficient to check for the file to exist as any guest can mount + * xenfs to /proc/xen. + */ + status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output); + if (status >= 0) + status = strncmp(output, "control_d", 9); + VIR_FREE(output); + if (status) { + VIR_INFO("No Xen capabilities detected, probably not running " + "in a Xen Dom0. Disabling libxenlight driver"); + + return ret; + } + } else if (!virFileExists(HYPERVISOR_XENSTORED)) { + VIR_INFO("Disabling driver as neither " HYPERVISOR_CAPABILITIES + " nor " HYPERVISOR_CAPABILITIES " exist"); return ret; } -- 2.3.7

3 6