- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/2] Python bindings for IOThreads
by John Ferlan 23 Feb '15

23 Feb '15

v1 here: http://www.redhat.com/archives/libvir-list/2015-February/msg00684.html Changes in v2: * Return an empty list when there are no IOThreads found * Fix alloc/cleanup logic to match review comments * Used "PyObject *error = NULL" like the GetCPUStats code in order to return either NULL for Py*_New() and PyTuple_SetItem() method errors or VIR_PY_NONE for other exceptions * Only make the Py_XDECREF calls on objects which don't get consumed by PyTuple_SetItem * Change name of method from "getIOThreadsInfo" to "ioThreadsInfo" John Ferlan (2): Support virDomainGetIOThreadsInfo and virDomainIOThreadsInfoFree Support virDomainSetIOThreads generator.py | 6 ++ libvirt-override-api.xml | 14 ++++ libvirt-override.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 5 ++ 4 files changed, 205 insertions(+) -- 2.1.0

1 2

[libvirt] Plan for next release
by Daniel Veillard 23 Feb '15

23 Feb '15

Oops, Feb is really short and I got caught, I think if we want a release by beginning of March, i.e. next week we need to enter freeze ASAP. So I'm suggesting to start the freeze tomorrow, for a release on Monday if everything goes well ! Hope this suits everybody, 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 0

[libvirt] [PATCH] qemu: Fix AAVMF/OVMF #define names
by Cole Robinson 22 Feb '15

22 Feb '15

The AAVMF and OVMF names were swapped. Reorder the one usage where it matters so behavior doesn't change. --- src/qemu/qemu_conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c6b083c..2cf3905 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -149,10 +149,10 @@ virQEMUDriverConfigLoaderNVRAMParse(virQEMUDriverConfigPtr cfg, } -#define VIR_QEMU_OVMF_LOADER_PATH "/usr/share/AAVMF/AAVMF_CODE.fd" -#define VIR_QEMU_OVMF_NVRAM_PATH "/usr/share/AAVMF/AAVMF_VARS.fd" -#define VIR_QEMU_AAVMF_LOADER_PATH "/usr/share/OVMF/OVMF_CODE.fd" -#define VIR_QEMU_AAVMF_NVRAM_PATH "/usr/share/OVMF/OVMF_VARS.fd" +#define VIR_QEMU_OVMF_LOADER_PATH "/usr/share/OVMF/OVMF_CODE.fd" +#define VIR_QEMU_OVMF_NVRAM_PATH "/usr/share/OVMF/OVMF_VARS.fd" +#define VIR_QEMU_AAVMF_LOADER_PATH "/usr/share/AAVMF/AAVMF_CODE.fd" +#define VIR_QEMU_AAVMF_NVRAM_PATH "/usr/share/AAVMF/AAVMF_VARS.fd" virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { @@ -313,10 +313,10 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) goto error; cfg->nloader = 2; - if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_OVMF_LOADER_PATH) < 0 || - VIR_STRDUP(cfg->nvram[0], VIR_QEMU_OVMF_NVRAM_PATH) < 0 || - VIR_STRDUP(cfg->loader[1], VIR_QEMU_AAVMF_LOADER_PATH) < 0 || - VIR_STRDUP(cfg->nvram[1], VIR_QEMU_AAVMF_NVRAM_PATH) < 0) + if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_AAVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[0], VIR_QEMU_AAVMF_NVRAM_PATH) < 0 || + VIR_STRDUP(cfg->loader[1], VIR_QEMU_OVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[1], VIR_QEMU_OVMF_NVRAM_PATH) < 0) goto error; #endif -- 2.1.0

2 2

[libvirt] [PATCH 0/3] Fix memory ABI stability check issues
by Peter Krempa 21 Feb '15

21 Feb '15

Note that this series applies only on top of the NUMA config unification series: http://www.redhat.com/archives/libvir-list/2015-February/msg00532.html Please see individual patches for explanation Peter Krempa (3): conf: ABI: Hugepage backing definition is not guest ABI conf: ABI: Memballoon setting is not guest ABI conf: numa: Check ABI stability of NUMA configuration src/conf/domain_conf.c | 31 ++----------------------------- src/conf/numa_conf.c | 37 +++++++++++++++++++++++++++++++++++++ src/conf/numa_conf.h | 3 +++ src/libvirt_private.syms | 1 + 4 files changed, 43 insertions(+), 29 deletions(-) -- 2.2.2

3 9

[libvirt] [PATCH v2] qemu: Check for negative port values in network drive configuration
by Erik Skultety 21 Feb '15

21 Feb '15

We interpret port values as signed int (convert them from char *), so if anegative value is provided in network disk's configuration, we accept it as valid, however there's an 'unknown cause' error raised later. This error is only accidental because we return the port value in the return code. This patch adds just a minor tweak to the already existing check so we reject negative values the same way as we reject non-numerical strings. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1163553 --- src/qemu/qemu_command.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 743d6f0..6941b5a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2951,10 +2951,10 @@ static int qemuNetworkDriveGetPort(int protocol, const char *port) { - int ret = 0; - + unsigned ret = 0; if (port) { - if (virStrToLong_i(port, NULL, 10, &ret) < 0) { + if (virStrToLong_uip(port, NULL, 10, &ret) < 0 || + (int) ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse port number '%s'"), port); -- 1.9.3

2 1

[libvirt] [PATCH 00/24] Move all NUMA related configuration into one structure
by Peter Krempa 21 Feb '15

21 Feb '15

Due to historical madne^Wreasons the NUMA configuration is split between /domain/cpu and /domain/numatune. Internally the data was also split into two places. We can't do anything about the external representation but we certainly can store all the definitions in one place internally. This series does that. Peter Krempa (24): conf: Move numatune_conf to numa_conf conf: Move NUMA cell parsing code from cpu conf to numa conf conf: Refactor virDomainNumaDefCPUParseXML conf: numa: Don't duplicate NUMA cell cpumask conf: Move NUMA cell formatter to numa_conf conf: numa: Rename virDomainNumatune to virDomainNuma conf: Move enum virMemAccess to the NUMA code and rename it conf: numa: Recalculate rather than remember total NUMA cpu count conf: numa: Improve error message in case a numa node doesn't have cpus conf: numa: Reformat virDomainNumatuneParseXML conf: numa: Refactor logic in virDomainNumatuneParseXML conf: numa: Format <numatune> XML only if necessary conf: Separate helper for creating domain objects conf: Allocate domain definition with the new helper conf: numa: Always allocate the NUMA config conf: numa: Avoid re-allocation of the NUMA conf numa: conf: Tweak parameters of virDomainNumatuneSet conf: numa: Don't pass double pointer to virDomainNumatuneParseXML qemu: command: Unify retrieval of NUMA cell count in qemuBuildNumaArgStr conf: numa: Add helper to get guest NUMA node count and refactor users conf: numa: Add accesor for the NUMA node cpu mask conf: numa: Add accessor to NUMA node's memory access mode conf: numa: Add setter/getter for NUMA node memory size conf: Move all NUMA configuration to virDomainNuma po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/conf/cpu_conf.c | 151 +------- src/conf/cpu_conf.h | 25 +- src/conf/domain_conf.c | 59 ++- src/conf/domain_conf.h | 11 +- src/conf/{numatune_conf.c => numa_conf.c} | 429 +++++++++++++++------ src/conf/{numatune_conf.h => numa_conf.h} | 77 ++-- src/cpu/cpu.c | 2 +- src/libvirt_private.syms | 13 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_controller.c | 6 +- src/lxc/lxc_native.c | 4 +- src/openvz/openvz_conf.c | 2 +- src/parallels/parallels_sdk.c | 4 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_cgroup.c | 12 +- src/qemu/qemu_command.c | 52 +-- src/qemu/qemu_driver.c | 20 +- src/qemu/qemu_process.c | 4 +- src/vbox/vbox_common.c | 8 +- src/vmx/vmx.c | 2 +- src/xen/xen_hypervisor.c | 8 +- src/xen/xend_internal.c | 4 +- src/xen/xm_internal.c | 4 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xm.c | 2 +- tests/cputest.c | 2 +- tests/openvzutilstest.c | 2 +- .../qemuxml2argv-numatune-memnode.xml | 2 +- .../qemuxml2xmlout-numatune-memnode.xml | 2 +- tests/securityselinuxtest.c | 2 +- tests/testutilsqemu.c | 4 - 34 files changed, 503 insertions(+), 424 deletions(-) rename src/conf/{numatune_conf.c => numa_conf.c} (60%) rename src/conf/{numatune_conf.h => numa_conf.h} (50%) -- 2.2.2

2 58

[libvirt] [PATCH v2] libvirt-guests: Allow time sync on guests resume
by Michal Privoznik 20 Feb '15

20 Feb '15

Well, imagine domains were running, and as the host went down, they were managesaved. Later, after some time, the host went up again and domains got restored. But without correct time. And depending on how long was the host shut off, it may take some time for ntp to sync the time too. But hey, wait a minute. We have an API just for that! So: 1) Introduce SYNC_TIME variable in libvirt-guests.sysconf to allow users control over the new functionality 2) Call 'virsh domtime --sync $dom' in the libvirt-guests script. Unfortunately, this is all-or-nothing approach (just like anything else with the script). Domains are required to have configured and running qemu-ga inside. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -ignore the return value of domtime command tools/libvirt-guests.sh.in | 5 +++++ tools/libvirt-guests.sysconf | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 1b17bbe..9aa06fa 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -171,7 +171,9 @@ start() { isfirst=true bypass= + sync_time=false test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache + test "x$SYNC_TIME" = x0 || sync_time=true while read uri list; do configured=false set -f @@ -206,6 +208,9 @@ start() { retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ gettext "done"; echo + if "$sync_time"; then + run_virsh "$uri" domtime --sync "$name" >/dev/null + fi fi fi done diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf index d1f2051..03e732f 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -39,3 +39,10 @@ # restoring guests, even though this may give slower operation for # some file systems. #BYPASS_CACHE=0 + +# If non-zero, try to sync guest time on a domain resume. Be aware, that +# this requires guest agent, which, moreover, has to run under supported +# system. For instance, qemu-ga doesn't support guest time synchronization +# on Windows guests, but Linux ones. By default, this piece of +# functionality is turned off. +#SYNC_TIME=1 -- 2.0.5

2 1

[libvirt] [PATCH 0/3] Introduce machine type based capabilities filtering
by Michal Privoznik 20 Feb '15

20 Feb '15

Well, here's an alternative approach to my question here [1]. 1: https://www.redhat.com/archives/libvir-list/2015-February/msg00369.html Michal Privoznik (3): virQEMUCapsCacheLookupCopy: Pass machine type virQEMUCapsCacheLookupCopy: Filter qemuCaps based on machineType qemuCaps: Disable memdev for rhel6.5.0 machine type src/qemu/qemu_capabilities.c | 45 +++++++++++++++++++++- src/qemu/qemu_capabilities.h | 5 ++- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_process.c | 9 +++-- .../qemuxml2argv-numatune-memnode-rhel650.args | 7 ++++ .../qemuxml2argv-numatune-memnode-rhel650.xml | 31 +++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 7 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-rhel650.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-rhel650.xml -- 2.0.5

3 10

[libvirt] [PATCH] virsh: fix vcpupin info
by Pavel Hrdina 20 Feb '15

20 Feb '15

The "virDomainGetInfo" will get for running domain only live info and for offline domain only config info. There was no way how to get config info for running domain. We will use "vshCPUCountCollect" instead to get the correct cpu count that we need to pass to "virDomainGetVcpuPinInfo". Also cleanup some unnecessary variables and checks that are done by drivers. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1160559 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tests/vcpupin | 2 +- tools/virsh-domain.c | 75 ++++++++++++++++++++++++---------------------------- 2 files changed, 35 insertions(+), 42 deletions(-) diff --git a/tests/vcpupin b/tests/vcpupin index 9f34ec0..cd09145 100755 --- a/tests/vcpupin +++ b/tests/vcpupin @@ -43,7 +43,7 @@ compare exp out || fail=1 $abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 0,1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 -error: vcpupin: vCPU index out of range. +error: invalid argument: requested vcpu is higher than allocated vcpus EOF compare exp out || fail=1 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2506b89..61a3385 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6450,20 +6450,17 @@ vshParseCPUList(vshControl *ctl, const char *cpulist, static bool cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) { - virDomainInfo info; virDomainPtr dom; unsigned int vcpu = 0; const char *cpulist = NULL; bool ret = false; unsigned char *cpumap = NULL; - unsigned char *cpumaps = NULL; size_t cpumaplen; int maxcpu, ncpus; size_t i; bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - bool query = false; /* Query mode if no cpulist */ int got_vcpu; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; @@ -6481,48 +6478,47 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0) return false; - if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) - return false; - - query = !cpulist; + if (!cpulist) + VSH_EXCLUSIVE_OPTIONS_VAR(live, config); if ((got_vcpu = vshCommandOptUInt(cmd, "vcpu", &vcpu)) < 0) { vshError(ctl, "%s", _("vcpupin: Invalid vCPU number.")); - goto cleanup; + return false; } /* In pin mode, "vcpu" is necessary */ - if (!query && got_vcpu == 0) { + if (cpulist && got_vcpu == 0) { vshError(ctl, "%s", _("vcpupin: Missing vCPU number in pin mode.")); - goto cleanup; - } - - if (virDomainGetInfo(dom, &info) != 0) { - vshError(ctl, "%s", _("vcpupin: failed to get domain information.")); - goto cleanup; - } - - if (vcpu >= info.nrVirtCpu) { - vshError(ctl, "%s", _("vcpupin: vCPU index out of range.")); - goto cleanup; + return false; } if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) - goto cleanup; - + return false; cpumaplen = VIR_CPU_MAPLEN(maxcpu); + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + /* Query mode: show CPU affinity information then exit.*/ - if (query) { + if (!cpulist) { /* When query mode and neither "live", "config" nor "current" * is specified, set VIR_DOMAIN_AFFECT_CURRENT as flags */ if (flags == -1) flags = VIR_DOMAIN_AFFECT_CURRENT; - cpumaps = vshMalloc(ctl, info.nrVirtCpu * cpumaplen); - if ((ncpus = virDomainGetVcpuPinInfo(dom, info.nrVirtCpu, - cpumaps, cpumaplen, flags)) >= 0) { + if ((ncpus = vshCPUCountCollect(ctl, dom, flags, true)) < 0) { + if (ncpus == -1) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) + vshError(ctl, "%s", _("cannot get vcpupin for offline domain")); + else + vshError(ctl, "%s", _("cannot get vcpupin for transient domain")); + } + goto cleanup; + } + cpumap = vshMalloc(ctl, ncpus * cpumaplen); + if ((ncpus = virDomainGetVcpuPinInfo(dom, ncpus, cpumap, + cpumaplen, flags)) >= 0) { vshPrintExtra(ctl, "%s %s\n", _("VCPU:"), _("CPU Affinity")); vshPrintExtra(ctl, "----------------------------------\n"); for (i = 0; i < ncpus; i++) { @@ -6530,30 +6526,27 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) continue; vshPrint(ctl, "%4zu: ", i); - ret = vshPrintPinInfo(cpumaps, cpumaplen, maxcpu, i); + ret = vshPrintPinInfo(cpumap, cpumaplen, maxcpu, i); vshPrint(ctl, "\n"); if (!ret) break; } } - - VIR_FREE(cpumaps); - goto cleanup; - } - - /* Pin mode: pinning specified vcpu to specified physical cpus*/ - if (!(cpumap = vshParseCPUList(ctl, cpulist, maxcpu, cpumaplen))) - goto cleanup; - - if (flags == -1) { - if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) - goto cleanup; } else { - if (virDomainPinVcpuFlags(dom, vcpu, cpumap, cpumaplen, flags) != 0) + /* Pin mode: pinning specified vcpu to specified physical cpus*/ + if (!(cpumap = vshParseCPUList(ctl, cpulist, maxcpu, cpumaplen))) goto cleanup; + + if (flags == -1) { + if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) + goto cleanup; + } else { + if (virDomainPinVcpuFlags(dom, vcpu, cpumap, cpumaplen, flags) != 0) + goto cleanup; + } + ret = true; } - ret = true; cleanup: VIR_FREE(cpumap); virDomainFree(dom); -- 2.0.5

2 1

[libvirt] [PATCH v3] virsh-edit: Make force editing usable
by Martin Kletzander 20 Feb '15

20 Feb '15

When editing a domain with 'virsh edit' and failing validation, the usual message pops up: Failed. Try again? [y,n,f,?]: Turning off validation can be useful, mainly for testing (but other purposes too), so this patch adds support for relaxing definition in virsh-edit and makes 'virsh edit <domain>' more usable. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: - turn 'v' into an 'i' (as in "Ignore validation") - fix translation v2: - make a special case 'v' for turning off validation tools/virsh-domain.c | 6 ++++++ tools/virsh-edit.c | 21 +++++++++++++++++++-- tools/virsh.c | 28 ++++++++++++++++++++-------- tools/virsh.h | 4 ++-- 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2506b89..1b8d473 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11265,7 +11265,13 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) } while (0) #define EDIT_DEFINE \ (dom_edited = vshDomainDefine(ctl->conn, doc_edited, define_flags)) +#define EDIT_RELAX \ + do { \ + define_flags &= ~VIR_DOMAIN_DEFINE_VALIDATE; \ + } while (0); + #include "virsh-edit.c" +#undef EDIT_RELAX vshPrint(ctl, _("Domain %s XML configuration edited.\n"), virDomainGetName(dom_edited)); diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index 41a6d53..1b39cb7 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -1,7 +1,7 @@ /* * virsh-edit.c: Implementation of generic virsh *-edit intelligence * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012, 2015 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 @@ -62,6 +62,7 @@ do { char *doc_reread = NULL; const char *msg = NULL; bool edit_success = false; + bool relax_avail = false; /* Get the XML configuration of the object. */ doc = (EDIT_GET_XML); @@ -74,6 +75,11 @@ do { goto edit_cleanup; reedit: + +#ifdef EDIT_RELAX + relax_avail = true; +#endif + /* Start the editor. */ if (vshEditFile(ctl, tmp) == -1) goto edit_cleanup; @@ -112,7 +118,7 @@ do { msg = _("Failed."); if (msg) { - int c = vshAskReedit(ctl, msg); + int c = vshAskReedit(ctl, msg, relax_avail); switch (c) { case 'y': goto reedit; @@ -126,6 +132,17 @@ do { goto edit_cleanup; break; +#ifdef EDIT_RELAX + case 'i': + if (relax_avail) { + EDIT_RELAX; + relax_avail = false; + goto redefine; + break; + } + /* fall-through */ +#endif + default: vshError(ctl, "%s", msg); break; diff --git a/tools/virsh.c b/tools/virsh.c index aba34ce..9ecddf3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1,7 +1,7 @@ /* * virsh.c: a shell to exercise the libvirt API * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 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 @@ -512,13 +512,14 @@ vshPrintRaw(vshControl *ctl, ...) * edited file. * * Returns 'y' if he wants to - * 'f' if he forcibly wants to * 'n' if he doesn't want to + * 'i' if he wants to try defining it again while ignoring validation + * 'f' if he forcibly wants to * -1 on error * 0 otherwise */ int -vshAskReedit(vshControl *ctl, const char *msg) +vshAskReedit(vshControl *ctl, const char *msg, bool relax_avail) { int c = -1; @@ -531,9 +532,8 @@ vshAskReedit(vshControl *ctl, const char *msg) return -1; while (true) { - /* TRANSLATORS: For now, we aren't using LC_MESSAGES, and the user - * choices really are limited to just 'y', 'n', 'f' and '?' */ - vshPrint(ctl, "\r%s %s", msg, _("Try again? [y,n,f,?]:")); + vshPrint(ctl, "\r%s %s %s: ", msg, _("Try again?"), + relax_avail ? "[y,n,i,f,?]" : "[y,n,f,?]"); c = c_tolower(getchar()); if (c == '?') { @@ -541,11 +541,21 @@ vshAskReedit(vshControl *ctl, const char *msg) "", _("y - yes, start editor again"), _("n - no, throw away my changes"), + NULL); + + if (relax_avail) { + vshPrintRaw(ctl, + _("i - turn off validation and try to redefine again"), + NULL); + } + + vshPrintRaw(ctl, _("f - force, try to redefine again"), _("? - print this help"), NULL); continue; - } else if (c == 'y' || c == 'n' || c == 'f') { + } else if (c == 'y' || c == 'n' || c == 'f' || + (relax_avail && c == 'i')) { break; } } @@ -557,7 +567,9 @@ vshAskReedit(vshControl *ctl, const char *msg) } #else /* WIN32 */ int -vshAskReedit(vshControl *ctl, const char *msg ATTRIBUTE_UNUSED) +vshAskReedit(vshControl *ctl, + const char *msg ATTRIBUTE_UNUSED, + bool relax_avail ATTRIBUTE_UNUSED) { vshDebug(ctl, VSH_ERR_WARNING, "%s", _("This function is not " "supported on WIN32 platform")); diff --git a/tools/virsh.h b/tools/virsh.h index 7d5d8a2..df2ea7f 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -1,7 +1,7 @@ /* * virsh.h: a shell to exercise the libvirt API * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 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 @@ -359,7 +359,7 @@ char *vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) char *vshEditWriteToTempFile(vshControl *ctl, const char *doc); int vshEditFile(vshControl *ctl, const char *filename); char *vshEditReadBackFile(vshControl *ctl, const char *filename); -int vshAskReedit(vshControl *ctl, const char *msg); +int vshAskReedit(vshControl *ctl, const char *msg, bool relax_avail); int vshStreamSink(virStreamPtr st, const char *bytes, size_t nbytes, void *opaque); double vshPrettyCapacity(unsigned long long val, const char **unit); -- 2.3.0

2 1

[libvirt] [PATCH v2] virsh-edit: Make force editing usable
by Martin Kletzander 20 Feb '15

20 Feb '15

When editing a domain with 'virsh edit' and failing validation, the usual message pops up: Failed. Try again? [y,n,f,?]: Turning of validation can be ussable, mainly for testing (but other purposes too), so this patch adds support for relaxing definition in virsh-edit and makes 'virsh edit <domain>' more usable. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - make a special case 'v' for turning off validation tools/virsh-domain.c | 6 ++++++ tools/virsh-edit.c | 21 +++++++++++++++++++-- tools/virsh.c | 28 +++++++++++++++++++++------- tools/virsh.h | 4 ++-- 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2506b89..b4761c6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11265,7 +11265,13 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) } while (0) #define EDIT_DEFINE \ (dom_edited = vshDomainDefine(ctl->conn, doc_edited, define_flags)) +#define EDIT_RELAX \ + do { \ + define_flags &= ~VIR_DOMAIN_DEFINE_VALIDATE; \ + } while (0); + #include "virsh-edit.c" +#undefine EDIT_RELAX vshPrint(ctl, _("Domain %s XML configuration edited.\n"), virDomainGetName(dom_edited)); diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index 41a6d53..2a13a04 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -1,7 +1,7 @@ /* * virsh-edit.c: Implementation of generic virsh *-edit intelligence * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012, 2015 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 @@ -62,6 +62,7 @@ do { char *doc_reread = NULL; const char *msg = NULL; bool edit_success = false; + bool relax_avail = false; /* Get the XML configuration of the object. */ doc = (EDIT_GET_XML); @@ -74,6 +75,11 @@ do { goto edit_cleanup; reedit: + +#ifdef EDIT_RELAX + relax_avail = true; +#endif + /* Start the editor. */ if (vshEditFile(ctl, tmp) == -1) goto edit_cleanup; @@ -112,7 +118,7 @@ do { msg = _("Failed."); if (msg) { - int c = vshAskReedit(ctl, msg); + int c = vshAskReedit(ctl, msg, relax_avail); switch (c) { case 'y': goto reedit; @@ -126,6 +132,17 @@ do { goto edit_cleanup; break; +#ifdef EDIT_RELAX + case 'v': + if (relax_avail) { + EDIT_RELAX; + relax_avail = false; + goto redefine; + break; + } + /* fall-through */ +#endif + default: vshError(ctl, "%s", msg); break; diff --git a/tools/virsh.c b/tools/virsh.c index aba34ce..464af3d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1,7 +1,7 @@ /* * virsh.c: a shell to exercise the libvirt API * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 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 @@ -512,13 +512,14 @@ vshPrintRaw(vshControl *ctl, ...) * edited file. * * Returns 'y' if he wants to - * 'f' if he forcibly wants to * 'n' if he doesn't want to + * 'v' if he wants to try defining it again with validation turned off + * 'f' if he forcibly wants to * -1 on error * 0 otherwise */ int -vshAskReedit(vshControl *ctl, const char *msg) +vshAskReedit(vshControl *ctl, const char *msg, bool relax_avail) { int c = -1; @@ -532,8 +533,9 @@ vshAskReedit(vshControl *ctl, const char *msg) while (true) { /* TRANSLATORS: For now, we aren't using LC_MESSAGES, and the user - * choices really are limited to just 'y', 'n', 'f' and '?' */ - vshPrint(ctl, "\r%s %s", msg, _("Try again? [y,n,f,?]:")); + * choices really are limited to just 'y', 'n', 'v', 'f' and '?' */ + vshPrint(ctl, _("\r%s Try again? %s: "), msg, + relax_avail ? "[y,n,v,f,?]" : "[y,n,f,?]"); c = c_tolower(getchar()); if (c == '?') { @@ -541,11 +543,21 @@ vshAskReedit(vshControl *ctl, const char *msg) "", _("y - yes, start editor again"), _("n - no, throw away my changes"), + NULL); + + if (relax_avail) { + vshPrintRaw(ctl, + _("v - turn off validation and try to redefine again"), + NULL); + } + + vshPrintRaw(ctl, _("f - force, try to redefine again"), _("? - print this help"), NULL); continue; - } else if (c == 'y' || c == 'n' || c == 'f') { + } else if (c == 'y' || c == 'n' || c == 'f' || + (relax_avail && c == 'v')) { break; } } @@ -557,7 +569,9 @@ vshAskReedit(vshControl *ctl, const char *msg) } #else /* WIN32 */ int -vshAskReedit(vshControl *ctl, const char *msg ATTRIBUTE_UNUSED) +vshAskReedit(vshControl *ctl, + const char *msg ATTRIBUTE_UNUSED, + bool relax_avail ATTRIBUTE_UNUSED) { vshDebug(ctl, VSH_ERR_WARNING, "%s", _("This function is not " "supported on WIN32 platform")); diff --git a/tools/virsh.h b/tools/virsh.h index 7d5d8a2..df2ea7f 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -1,7 +1,7 @@ /* * virsh.h: a shell to exercise the libvirt API * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 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 @@ -359,7 +359,7 @@ char *vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) char *vshEditWriteToTempFile(vshControl *ctl, const char *doc); int vshEditFile(vshControl *ctl, const char *filename); char *vshEditReadBackFile(vshControl *ctl, const char *filename); -int vshAskReedit(vshControl *ctl, const char *msg); +int vshAskReedit(vshControl *ctl, const char *msg, bool relax_avail); int vshStreamSink(virStreamPtr st, const char *bytes, size_t nbytes, void *opaque); double vshPrettyCapacity(unsigned long long val, const char **unit); -- 2.3.0

4 5

[libvirt] [PATCH] network: allow <pf> together with <interface>/<address> in network status
by Laine Stump 20 Feb '15

20 Feb '15

The function that parses the <forward> subelement of a network used to fail/log an error if the network definition contained both a <pf> element as well as at least one <interface> or <address> element. That check was present because the configuration of a network should have either one <pf>, one or more <interface>, or one or more <address>, but never combinations of multiple kinds. This caused a problem when libvirtd was restarted with a network already active - when a network with a <pf> element is started, the referenced PF (Physical Function of an SRIOV-capable network card) is checked for VFs (Virtual Functions), and the <forward> is filled in with a list of all VFs for that PF either in the form of their PCI addresses (a list of <address>) or their netdev names (a list of <interface>); the <pf> element is not removed though. When libvirtd is restarted, it parses the network status and finds both the original <pf> from the config, as well as the list of either <address> or <interface>, fails the parse, and the network is not added to the active list. This failure is often obscured because the network is marked as autostart so libvirt immediately restarts it. It seems odd to me that <interface> and <address> are stored in the same array rather than keeping two separate arrays, and having separate arrays would have made the check much simpler. However, changing to use two separate arrays would have required changes in more places, potentially creating more conflicts and (more importantly) more possible regressions in the event of a backport, so I chose to keep the existing data structure in order to localize the change. It appears that this problem has been in the code ever since support for <pf> was added (0.9.10), but until commit 34cc3b2f106e296df5e64309620c79d16fd76c85 (first in libvirt 1.2.4) networks with interface pools were not properly marked as active on restart anyway, so there is no point in backporting this patch any further than that. --- src/conf/network_conf.c | 10 +--------- src/network/bridge_driver.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f947d89..dce3360 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1,7 +1,7 @@ /* * network_conf.c: network XML handling * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1638,14 +1638,6 @@ virNetworkForwardDefParseXML(const char *networkName, goto cleanup; } - if (((nForwardIfs > 0) + (nForwardAddrs > 0) + (nForwardPfs > 0)) > 1) { - virReportError(VIR_ERR_XML_ERROR, - _("<address>, <interface>, and <pf> elements in <forward> " - "of network %s are mutually exclusive"), - networkName); - goto cleanup; - } - forwardDev = virXPathString("string(./@dev)", ctxt); if (forwardDev && (nForwardAddrs > 0 || nForwardPfs > 0)) { virReportError(VIR_ERR_XML_ERROR, "%s", diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 2798010..af16c25 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2734,6 +2734,7 @@ networkValidate(virNetworkDefPtr def, virNetworkIpDefPtr ipdef; bool ipv4def = false, ipv6def = false; bool bandwidthAllowed = true; + bool usesInterface = false, usesAddress = false; /* check for duplicate networks */ if (virNetworkObjIsDuplicate(&driver->networks, def, check_active) < 0) @@ -2798,6 +2799,40 @@ networkValidate(virNetworkDefPtr def, bandwidthAllowed = false; } + /* we support configs with a single PF defined: + * <pf dev='eth0'/> + * or with a list of netdev names: + * <interface dev='eth9'/> + * OR a list of PCI addresses + * <address type='pci' domain='0' bus='4' slot='0' function='1'/> + * but not any combination of those. + * + * Since <interface> and <address> are for some strange reason + * stored in the same array, we need to cycle through it and check + * the type of each. + */ + for (i = 0; i < def->forward.nifs; i++) { + switch ((virNetworkForwardHostdevDeviceType) + def->forward.ifs[i].type) { + case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV: + usesInterface = true; + break; + case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI: + usesAddress = true; + break; + case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NONE: + case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_LAST: + break; + } + } + if ((def->forward.npfs > 0) + usesInterface + usesAddress > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<address>, <interface>, and <pf> elements of " + "<forward> in network %s are mutually exclusive"), + def->name); + return -1; + } + /* We only support dhcp on one IPv4 address and * on one IPv6 address per defined network */ -- 2.1.0

2 1

[libvirt] dmidecode dependency
by Jason Helfman 20 Feb '15

20 Feb '15

Hello All, I was wondering if it may be possible to call sysctl, instead of requiring dmidecode to be installed for getting the uuid of a system? According to the user that filed the bug below, dmidecode needs to be installed to get the uuid, or errors will be printed in logs to get the uuid. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196733 I was wondering if sysctl can be called to get this information for FreeBSD? I am not sure if Linux would give similar information, but would think it might. Beyond this, I am not sure if dmidecode is used for other aspects beyond uuid where it is required where sysctl doesn't give the information needed. $ sudo dmidecode |grep -i uuid UUID: 42355DE8-C55C-E487-8E16-509A78EB5EE1 $ sysctl kern.hostuuid kern.hostuuid: 42355de8-c55c-e487-8e16-509a78eb5ee1 Thanks, Jason -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

2 2

[libvirt] [RFC PATCH] Use PAUSED state for domains that are starting up
by Jiri Denemark 20 Feb '15

20 Feb '15

When libvirt is starting a domain, it reports the state as SHUTOFF until it's RUNNING. This is not ideal because domain startup may take a long time (usually because of some configuration issues, firewalls blocking access to network disks, etc.) and domain lists provided by libvirt look awkward. One can see weird shutoff domains with IDs in a list of active domains or even shutoff transient domains. In any case, it looks more like a bug in libvirt than a normal state a domain goes through. I'm not quite sure what the best way to fix this is. In this patch, I tried to use PAUSED state with STARTING_UP reason. Alternatively, we could keep using SHUTOFF state and just set STARTING_UP reason instead of UNKNOWN but it just feels wrong and wouldn't really solve the confusion when looking at virsh list. I made the change to qemu driver only in this RFC patch, I will update all drivers once we agree on the best approach. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 3 ++- src/qemu/qemu_process.c | 22 ++++++++++++++-------- tools/virsh-domain-monitor.c | 3 ++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4dbd7f5..90150f6 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -116,6 +116,7 @@ typedef enum { VIR_DOMAIN_PAUSED_SHUTTING_DOWN = 8, /* paused during shutdown process */ VIR_DOMAIN_PAUSED_SNAPSHOT = 9, /* paused while creating a snapshot */ VIR_DOMAIN_PAUSED_CRASHED = 10, /* paused due to a guest crash */ + VIR_DOMAIN_PAUSED_STARTING_UP = 11, /* the domain is being started */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_PAUSED_LAST diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b3d63f8..2b7c5bf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -661,7 +661,8 @@ VIR_ENUM_IMPL(virDomainPausedReason, VIR_DOMAIN_PAUSED_LAST, "from snapshot", "shutdown", "snapshot", - "panicked") + "panicked", + "starting up") VIR_ENUM_IMPL(virDomainShutdownReason, VIR_DOMAIN_SHUTDOWN_LAST, "unknown", diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1d4e957..d317b19 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3412,6 +3412,7 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) virDomainState state; virDomainPausedReason reason; virDomainState newState = VIR_DOMAIN_NOSTATE; + int oldReason; int newReason; bool running; char *msg = NULL; @@ -3425,9 +3426,16 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) if (ret < 0) return -1; - state = virDomainObjGetState(vm, NULL); + state = virDomainObjGetState(vm, &oldReason); - if (state == VIR_DOMAIN_PAUSED && running) { + if (running && + (state == VIR_DOMAIN_SHUTOFF || + (state == VIR_DOMAIN_PAUSED && + oldReason == VIR_DOMAIN_PAUSED_STARTING_UP))) { + newState = VIR_DOMAIN_RUNNING; + newReason = VIR_DOMAIN_RUNNING_BOOTED; + ignore_value(VIR_STRDUP_QUIET(msg, "finished booting")); + } else if (state == VIR_DOMAIN_PAUSED && running) { newState = VIR_DOMAIN_RUNNING; newReason = VIR_DOMAIN_RUNNING_UNPAUSED; ignore_value(VIR_STRDUP_QUIET(msg, "was unpaused")); @@ -3446,10 +3454,6 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) ignore_value(virAsprintf(&msg, "was paused (%s)", virDomainPausedReasonTypeToString(reason))); } - } else if (state == VIR_DOMAIN_SHUTOFF && running) { - newState = VIR_DOMAIN_RUNNING; - newReason = VIR_DOMAIN_RUNNING_BOOTED; - ignore_value(VIR_STRDUP_QUIET(msg, "finished booting")); } if (newState != VIR_DOMAIN_NOSTATE) { @@ -3817,7 +3821,9 @@ qemuProcessReconnect(void *opaque) goto error; state = virDomainObjGetState(obj, &reason); - if (state == VIR_DOMAIN_SHUTOFF) { + if (state == VIR_DOMAIN_SHUTOFF || + (state == VIR_DOMAIN_PAUSED && + reason == VIR_DOMAIN_PAUSED_STARTING_UP)) { VIR_DEBUG("Domain '%s' wasn't fully started yet, killing it", obj->def->name); goto error; @@ -4435,7 +4441,7 @@ int qemuProcessStart(virConnectPtr conn, vm->def->id = qemuDriverAllocateID(driver); qemuDomainSetFakeReboot(driver, vm, false); - virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STARTING_UP); if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 925eb1b..da23ace 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -184,7 +184,8 @@ VIR_ENUM_IMPL(vshDomainPausedReason, N_("from snapshot"), N_("shutting down"), N_("creating snapshot"), - N_("crashed")) + N_("crashed"), + N_("starting up")) VIR_ENUM_DECL(vshDomainShutdownReason) VIR_ENUM_IMPL(vshDomainShutdownReason, -- 2.3.0

2 7

[libvirt] [PATCH] virsh-edit: Make force editing usable
by Martin Kletzander 19 Feb '15

19 Feb '15

When editing a domain with 'virsh edit' and failing validation, the usual message pops up: Failed. Try again? [y,n,f,?]: The option 'f' (force) is pretty unusable. It tries to step into the same puddle again and again when it can at least try to force the definition. This patch adds support for relaxing definition in virsh-edit and makes 'virsh edit <domain>' more usable, mainly for testing. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh-domain.c | 5 +++++ tools/virsh-edit.c | 5 ++++- tools/virsh.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2506b89..3dd676c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11265,6 +11265,11 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) } while (0) #define EDIT_DEFINE \ (dom_edited = vshDomainDefine(ctl->conn, doc_edited, define_flags)) +#define EDIT_RELAX \ + do { \ + define_flags &= ~VIR_DOMAIN_DEFINE_VALIDATE; \ + } while (0); + #include "virsh-edit.c" vshPrint(ctl, _("Domain %s XML configuration edited.\n"), diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index 41a6d53..3186998 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -1,7 +1,7 @@ /* * virsh-edit.c: Implementation of generic virsh *-edit intelligence * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012, 2015 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 @@ -119,6 +119,9 @@ do { break; case 'f': +#ifdef EDIT_RELAX + EDIT_RELAX; +#endif goto redefine; break; diff --git a/tools/virsh.c b/tools/virsh.c index aba34ce..5b154e1 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1,7 +1,7 @@ /* * virsh.c: a shell to exercise the libvirt API * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 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 @@ -541,7 +541,7 @@ vshAskReedit(vshControl *ctl, const char *msg) "", _("y - yes, start editor again"), _("n - no, throw away my changes"), - _("f - force, try to redefine again"), + _("f - force, try to redefine again (without validation)"), _("? - print this help"), NULL); continue; -- 2.3.0

3 5

[libvirt] [PATCH 1/3] parallels: code aligment
by Mikhail Feoktistov 19 Feb '15

19 Feb '15

--- src/parallels/parallels_sdk.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index d0d2ce2..3bb2ce8 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -2804,23 +2804,23 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom, goto error; for (i = 0; i < def->nserials; i++) { - if (prlsdkAddSerial(sdkdom, def->serials[i]) < 0) - goto error; + if (prlsdkAddSerial(sdkdom, def->serials[i]) < 0) + goto error; } for (i = 0; i < def->nnets; i++) { - if (prlsdkAddNet(sdkdom, def->nets[i]) < 0) - goto error; + if (prlsdkAddNet(sdkdom, def->nets[i]) < 0) + goto error; } for (i = 0; i < def->ndisks; i++) { - if (prlsdkAddDisk(sdkdom, def->disks[i]) < 0) - goto error; + if (prlsdkAddDisk(sdkdom, def->disks[i]) < 0) + goto error; } for (i = 0; i < def->nfss; i++) { - if (prlsdkAddFS(sdkdom, def->fss[i]) < 0) - goto error; + if (prlsdkAddFS(sdkdom, def->fss[i]) < 0) + goto error; } return 0; -- 1.7.1

3 5

[libvirt] [PATCH v2] Search for schemas and cpu_map.xml in source tree
by Jiri Denemark 19 Feb '15

19 Feb '15

Not all files we want to find using virFileFindResource{,Full} are generated when libvirt is built, some of them (such as RNG schemas) are distributed with sources. The current API was not able to find source files if libvirt was built in VPATH. Both RNG schemas and cpu_map.xml are distributed in source tarball. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/Makefile.am | 2 ++ src/conf/domain_conf.c | 2 +- src/cpu/cpu_map.c | 2 +- src/driver.c | 2 +- src/fdstream.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_manager.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/network/bridge_driver.c | 2 +- src/remote/remote_driver.c | 2 +- src/storage/storage_backend_disk.c | 4 ++-- src/util/virfile.c | 30 ++++++++++++++++-------------- 12 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b41c6d4..a938d7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,7 @@ abs_builddir = $(shell pwd) abs_topbuilddir = $(shell cd .. && pwd) abs_srcdir = $(shell cd $(srcdir) && pwd) +abs_topsrcdir = $(shell cd $(srcdir)/.. && pwd) # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets @@ -32,6 +33,7 @@ INCLUDES = -I../gnulib/lib \ -I$(srcdir)/util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ + -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ $(GETTEXT_CPPFLAGS) AM_CFLAGS = $(LIBXML_CFLAGS) \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b13cae8..2e35293 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12887,7 +12887,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE) { char *schema = virFileFindResource("domain.rng", - "docs/schemas", + abs_topsrcdir "/docs/schemas", PKGDATADIR "/schemas"); if (!schema) return NULL; diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index b77f688..6130f8a 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -87,7 +87,7 @@ int cpuMapLoad(const char *arch, char *mapfile; if (!(mapfile = virFileFindResource("cpu_map.xml", - "src/cpu", + abs_topsrcdir "/src/cpu", PKGDATADIR))) return -1; diff --git a/src/driver.c b/src/driver.c index 1be32ef..db03438 100644 --- a/src/driver.c +++ b/src/driver.c @@ -56,7 +56,7 @@ virDriverLoadModule(const char *name) if (!(modfile = virFileFindResourceFull(name, "libvirt_driver_", ".so", - "src/.libs", + abs_topbuilddir "/src/.libs", LIBDIR "/libvirt/connection-driver", "LIBVIRT_DRIVER_DIR"))) return NULL; diff --git a/src/fdstream.c b/src/fdstream.c index 18bd359..5d80fc2 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -641,7 +641,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, } if (!(iohelper_path = virFileFindResource("libvirt_iohelper", - "src", + abs_topbuilddir "/src", LIBEXECDIR))) goto error; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 2af3f22..8d184fe 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -253,7 +253,7 @@ static virNetClientPtr virLockManagerLockDaemonConnectionNew(bool privileged, if (!privileged && !(daemonPath = virFileFindResourceFull("virtlockd", NULL, NULL, - "src", + abs_topbuilddir "/src", SBINDIR, "VIRTLOCKD_PATH"))) goto error; diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index ec90d04..f277f22 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -142,7 +142,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, if (!(modfile = virFileFindResourceFull(name, NULL, ".so", - "src/.libs", + abs_topbuilddir "/src/.libs", LIBDIR "/libvirt/lock-driver", "LIBVIRT_LOCK_MANAGER_PLUGIN_DIR"))) goto cleanup; diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index b6d1797..d1a3be5 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -94,7 +94,7 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver) } if (!(lxc_path = virFileFindResource("libvirt_lxc", - "src", + abs_topbuilddir "/src", LIBEXECDIR))) goto error; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 2798010..404e90b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1289,7 +1289,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, /* This helper is used to create custom leases file for libvirt */ if (!(leaseshelper_path = virFileFindResource("libvirt_leaseshelper", - "src", + abs_topbuilddir "/src", LIBEXECDIR))) goto cleanup; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d4fd658..76c1d0c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -887,7 +887,7 @@ doRemoteOpen(virConnectPtr conn, if ((flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) && !(daemonPath = virFileFindResourceFull("libvirtd", NULL, NULL, - "daemon", + abs_topbuilddir "/daemon", SBINDIR, "LIBVIRTD_PATH"))) goto failed; diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 9f4d76a..39082cc 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -301,7 +301,7 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPtr pool, int ret; if (!(parthelper_path = virFileFindResource("libvirt_parthelper", - "src", + abs_topbuilddir "/src", LIBEXECDIR))) return -1; @@ -346,7 +346,7 @@ virStorageBackendDiskReadGeometry(virStoragePoolObjPtr pool) int ret; if (!(parthelper_path = virFileFindResource("libvirt_parthelper", - "src", + abs_topbuilddir "/src", LIBEXECDIR))) return -1; diff --git a/src/util/virfile.c b/src/util/virfile.c index 1b004d6..91dd0b8 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -248,7 +248,7 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) } if (!(iohelper_path = virFileFindResource("libvirt_iohelper", - "src", + abs_topbuilddir "/src", LIBEXECDIR))) goto error; @@ -1618,7 +1618,8 @@ static bool useDirOverride; * @filename: libvirt distributed filename without any path * @prefix: optional string to prepend to filename * @suffix: optional string to append to filename - * @builddir: location of the binary in the source tree build tree + * @builddir: location of the filename in the build tree including + * abs_topsrcdir or abs_topbuilddir prefix * @installdir: location of the installed binary * @envname: environment variable used to override all dirs * @@ -1628,7 +1629,7 @@ static bool useDirOverride; * path in the installed location. * * If @envname is non-NULL it will override all other - * directory lookup + * directory lookup. * * Only use this with @filename files that are part of * the libvirt tree, not 3rd party binaries/files. @@ -1645,22 +1646,22 @@ virFileFindResourceFull(const char *filename, { char *ret = NULL; const char *envval = envname ? virGetEnvBlockSUID(envname) : NULL; + const char *path; if (!prefix) prefix = ""; if (!suffix) suffix = ""; - if (envval) { - if (virAsprintf(&ret, "%s/%s%s%s", envval, prefix, filename, suffix) < 0) - return NULL; - } else if (useDirOverride) { - if (virAsprintf(&ret, "%s/%s/%s%s%s", abs_topbuilddir, builddir, prefix, filename, suffix) < 0) - return NULL; - } else { - if (virAsprintf(&ret, "%s/%s%s%s", installdir, prefix, filename, suffix) < 0) - return NULL; - } + if (envval) + path = envval; + else if (useDirOverride) + path = builddir; + else + path = installdir; + + if (virAsprintf(&ret, "%s/%s%s%s", path, prefix, filename, suffix) < 0) + return NULL; VIR_DEBUG("Resolved '%s' to '%s'", filename, ret); return ret; @@ -1671,7 +1672,8 @@ virFileFindResource(const char *filename, const char *builddir, const char *installdir) { - return virFileFindResourceFull(filename, NULL, NULL, builddir, installdir, NULL); + return virFileFindResourceFull(filename, NULL, NULL, builddir, + installdir, NULL); } -- 2.3.0

2 1

[libvirt] [PATCH v3 0/6] Propagate storage errors on migration
by Michal Privoznik 19 Feb '15

19 Feb '15

diff to v3: - Took a step further and introduced a condition to wait on Michal Privoznik (6): qemuProcessHandleBlockJob: Set disk->mirrorState more often qemuProcessHandleBlockJob: Take status into account qemuMigrationDriveMirror: Listen to events qemuDomainObjPrivate: Introduce blockJob condition qemuMigrationDriveMirror: utilize blockJob condition qemuDomainBlockJobImpl: utilize blockJob condition src/qemu/qemu_domain.c | 4 +++- src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 15 ++++++-------- src/qemu/qemu_migration.c | 50 ++++++++++++++++++++--------------------------- src/qemu/qemu_process.c | 40 +++++++++++++++++++++++-------------- 5 files changed, 57 insertions(+), 54 deletions(-) -- 2.0.5

2 12

[libvirt] [PATCH 0/2] qemu: Improve virDomainGetControlInfo
by Peter Krempa 19 Feb '15

19 Feb '15

Peter Krempa (2): qemu: Properly report error state in qemuDomainGetControlInfo() qemu: Allow inactive domains in qemuDomainGetControlInfo() include/libvirt/libvirt-domain.h | 27 +++++++++++++++++++++++++-- src/qemu/qemu_driver.c | 21 +++++++++++++-------- tools/virsh-domain-monitor.c | 19 +++++++++++++++++++ 3 files changed, 57 insertions(+), 10 deletions(-) -- 2.2.2

2 5

[libvirt] starting LXC container with user namespace with root FS in image (with loop device)
by Dmitry Guryanov 19 Feb '15

19 Feb '15

Hello, I have a container with root fs: <filesystem type='file' accessmode='passthrough'> <driver type='loop' format='raw'/> <source file='/opt/stack/data/nova/instances/x/disk'/> <target dir='/'/> </filesystem> And it seems libvirt tries to mount this FS from a user namespace, which is not possible: [root@localhost ~]# virsh -c lxc:/// start instance-0000000aXX error: Failed to start domain instance-0000000aXX error: internal error: guest failed to start: Failed to mount device /dev/loop3 to /var/run/libvirt/lxc/instance-0000000aXX.root: Operation not permitted Do you have any ideas, how it's supposed to work? Here is domain config: <domain type='lxc'> <name>instance-0000000aXX</name> <uuid>c68df696-1499-4cb3-b1fa-e2a370c11382</uuid> <memory unit='KiB'>524288</memory> <currentMemory unit='KiB'>524288</currentMemory> <vcpu placement='static'>1</vcpu> <cputune> <shares>1024</shares> </cputune> <resource> <partition>/machine</partition> </resource> <os> <type arch='x86_64'>exe</type> <init>/sbin/init</init> <cmdline>console=tty0 console=ttyS0</cmdline> </os> <idmap> <uid start='0' target='10000' count='1000'/> <gid start='0' target='10000' count='1000'/> </idmap> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='file' accessmode='passthrough'> <driver type='loop' format='raw'/> <source file='/opt/stack/data/nova/instances/x/disk'/> <target dir='/'/> </filesystem> <console type='pty'> <target type='lxc' port='0'/> </console> </devices> </domain> -- Dmitry Guryanov

1 0

[libvirt] [PATCH] qemu: Exit job on error path of qemuDomainSetVcpusFlags()
by Peter Krempa 19 Feb '15

19 Feb '15

Commit e105dc981438bc33fa771bd67cece6234dbf6c8d moved some code but didn't adjust the jump labels so that the job would be terminated. --- Notes: I'm already wearing my pink fluffy bunny ears of shame as I've acked that patch. src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1bbbe9b..8f0cf2b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4716,13 +4716,13 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if (flags & VIR_DOMAIN_AFFECT_LIVE && !(flags & VIR_DOMAIN_VCPU_GUEST)) { if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_temp) < 0) - goto cleanup; + goto endjob; if (!(all_nodes = virNumaGetHostNodeset())) - goto cleanup; + goto endjob; if (!(all_nodes_str = virBitmapFormat(all_nodes))) - goto cleanup; + goto endjob; if (virCgroupGetCpusetMems(cgroup_temp, &mem_mask) < 0 || virCgroupSetCpusetMems(cgroup_temp, all_nodes_str) < 0) -- 2.2.2

3 3

[libvirt] [PATCH 1/2] daemon: Fix segfault by reloading daemon right after start
by Pavel Hrdina 19 Feb '15

19 Feb '15

Libvirt could crash with segfault if user issue "service reload" right after "service start". One possible way to crash libvirt is to run reload during initialization of QEMU driver. It could happen when qemu driver will initialize qemu_driver_lock but don't have a time to set it's "config" and the SIGHUP arrives. The reload handler tries to get qemu_drv->config during "virStorageAutostart" and dereference it which ends with segfault. Let's ignore all reload requests until all drivers are initialized. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1179981 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- daemon/libvirtd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 86accaa..835e7dc 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -785,6 +785,11 @@ static void daemonReloadHandler(virNetServerPtr srv ATTRIBUTE_UNUSED, siginfo_t *sig ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { + if (!driversInitialized) { + VIR_WARN("Drivers are not initialized, reload ignored"); + return; + } + VIR_INFO("Reloading configuration on SIGHUP"); virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); -- 2.0.5

2 8

[libvirt] [PATCH] docs: clarify nat range behavior
by Ján Tomko 19 Feb '15

19 Feb '15

All the addresses from the range are used, not just those that are in use on the host. https://bugzilla.redhat.com/show_bug.cgi?id=1079917 --- docs/formatnetwork.html.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 7cf3f69..6abed8f 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -200,6 +200,8 @@ <p><span class="since">Since 1.0.3</span> it is possible to specify a public IPv4 address and port range to be used for the NAT by using the <code><nat></code> subelement. + Note that all addresses from the range are used, not just those + that are in use on the host. The address range is set with the <code><address></code> subelements and <code>start</code> and <code>stop</code> attributes: -- 2.0.5

3 2

[libvirt] [PATCH] libvirt-guests: Allow time sync on guests resume
by Michal Privoznik 18 Feb '15

18 Feb '15

Well, imagine domains were running, and as the host went down, they were managesaved. Later, after some time, the host went up again and domains got restored. But without correct time. And depending on how long was the host shut off, it may take some time for ntp to sync the time too. But hey, wait a minute. We have an API just for that! So: 1) Introduce SYNC_TIME variable in libvirt-guests.sysconf to allow users control over the new functionality 2) Call 'virsh domtime --sync $dom' in the libvirt-guests script. Unfortunately, this is all-or-nothing approach (just like anything else with the script). Domains are required to have configured and running qemu-ga inside. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/libvirt-guests.sh.in | 6 ++++++ tools/libvirt-guests.sysconf | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 1b17bbe..21e39b0 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -171,7 +171,9 @@ start() { isfirst=true bypass= + sync_time=false test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache + test "x$SYNC_TIME" = x0 || sync_time=true while read uri list; do configured=false set -f @@ -206,6 +208,10 @@ start() { retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ gettext "done"; echo + if "$sync_time"; then + retval run_virsh "$uri" domtime --sync "$name" \ + >/dev/null + fi fi fi done diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf index d1f2051..03e732f 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -39,3 +39,10 @@ # restoring guests, even though this may give slower operation for # some file systems. #BYPASS_CACHE=0 + +# If non-zero, try to sync guest time on a domain resume. Be aware, that +# this requires guest agent, which, moreover, has to run under supported +# system. For instance, qemu-ga doesn't support guest time synchronization +# on Windows guests, but Linux ones. By default, this piece of +# functionality is turned off. +#SYNC_TIME=1 -- 2.0.5

3 2

[libvirt] [PATCH] Fix reporting of i/o errors by iohelper process
by Jason J. Herne 18 Feb '15

18 Feb '15

From: "Jason J. Herne" <jjherne(a)us.ibm.com> libvirt_iohelper is a helper process that is exec'ed and used to handle I/O during a Qemu managed save operation. Due to a missing call to virFileWrapperFdClose, all I/O error messages reported by iohelper are lost. This patch adds a call to virFileWrapperFdClose to the cleanup phase of qemuDomainSaveMemory. This patch also modifies virFileWrapperFdClose such that errors are only reported when the length of the err_msg buffer is > 0. Before now, the existence of the buffer would trigger error reporting in virFileWrapperFdClose. Signed-off-by: Jason J. Herne <jjherne(a)us.ibm.com> --- src/qemu/qemu_driver.c | 1 + src/util/virfile.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ecccf6c..8d78805 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3015,6 +3015,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, cleanup: VIR_FORCE_CLOSE(fd); + virFileWrapperFdClose(wrapperFd); virFileWrapperFdFree(wrapperFd); VIR_FREE(xml); diff --git a/src/util/virfile.c b/src/util/virfile.c index 463064c..813b4f5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -322,7 +322,7 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd) return 0; ret = virCommandWait(wfd->cmd, NULL); - if (wfd->err_msg) + if (wfd->err_msg && strlen(wfd->err_msg)) VIR_WARN("iohelper reports: %s", wfd->err_msg); return ret; -- 1.8.3.2

4 8

[libvirt] libxl and non-absolute paths
by Stefan Bader 18 Feb '15

18 Feb '15

Just recently we moved to libvirt 1.2.12 for the next release. Which brought up a few problems when working with configs which we and Debian used to have. A mild complaint towards the xml validation: it would be really nice of that would be a bit more specific about what exactly it complains. It took me a while to realize that "Extra element os in interleave" was trying to tell me that the string of the loader element within the os section was not an absolute path. The issue here is that with libxl, I think the goal was to rather allow the library to select the path prefix (like for pygrub where the full path got removed recently). But now the xml validation disagrees. This would go for bootloader for xenpv and loader (within os) for xenfv. And for emulator in the device section. Though for that things are a bit more complicated. The libxl driver now calls that with the help option and decides from the output whether this is the "traditional" xen forked qemu or the upstream qemu binary. Then it selects the device model depending on that outcome. Not sure whether the libxl driver could query libxl for the path prefix. Right now the most straight forward way seems to move back to a full path for the emulator. At least now, by using the standard qemu binary for everything, we got a predictable path that does not change with Xen versions. So its possible to force migrate over to put /usr/bin/qemu-system-i386 there. But for loader and bootloader, do you think it reasonable to change the templates from absFilePath to filePath? -Stefan --- libvirt-1.2.12.orig/docs/schemas/domaincommon.rng 2015-01-23 12:46:24.0000 +++ libvirt-1.2.12/docs/schemas/domaincommon.rng 2015-02-13 10:00:43.1616 @@ -258,7 +258,7 @@ </choice> </attribute> </optional> - <ref name="absFilePath"/> + <ref name="filePath"/> </element> </optional> <optional> @@ -1060,7 +1060,7 @@ <optional> <element name="bootloader"> <choice> - <ref name="absFilePath"/> + <ref name="filePath"/> <empty/> </choice> </element>

4 6

[libvirt] [Patch 0/4] PowerPC fixes for libvirt
by Prerna Saxena 18 Feb '15

18 Feb '15

This patch set addresses some miscellaneous fixes for libvirt on PowerPC. Details: Patch 1/4 : This adds 'qemu-system-ppc64' as the default emulator for ppc64 & ppc64le guests. Patch 2/4 : Fixes a small error where not specifying a CPU model leads to a NULL compat specification. Patch 3/4 : This introduces 'ppc64le' and newer pseries machine types to domain schema. Patch 4/4 : Forbids floppy devices in domain XML. Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 10

[libvirt] [PATCH 0/2] libxl: fix handling of fd and timer registrations
by Jim Fehlig 18 Feb '15

18 Feb '15

This small series fixes some assertions we occasionally see in the libxl driver when running libvirt-TCK. The assertions were due to races between destroying per-domain libxl_ctx and receiving fd and timer callbacks associated with them. The races are masked by setting DEBUG loglevel in libvirtd.conf, so often missed by automated test setups that want DEBUG loglevel. Patch 1 actually fixes the assertions. Patch2 fixes a stupid mistake. See the commit messages for details. Jim Fehlig (2): libxl: fix fd and timer event handling libxl: Move setup of child processing code to driver initialization src/libxl/libxl_domain.c | 244 +---------------------------------------------- src/libxl/libxl_driver.c | 212 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 212 insertions(+), 244 deletions(-) -- 1.8.4.5

2 5

[libvirt] [PATCH 0/3] Prevent removing a in-used static bridge and destroying a in-used virtual network
by Lin Ma 18 Feb '15

18 Feb '15

* Get the live state info of a virtual network through netcf in networkGetXMLDesc. * Add --system flag for net-dumpxml to show the live state info. * Check the live state info in net-destroy. * Add --force flag for net-destroy to forcibly destroy the virtual network. * Check the transient interfaces info in iface-unbridge. --- Lin Ma (3): bridge_driver: Return the live state info of a given virtual network virsh: prevent destroying a in-used network for net-destroy virsh: prevent removing a in-used bridge for iface-unbridge include/libvirt/libvirt-network.h | 1 + src/Makefile.am | 3 + src/network/bridge_driver.c | 141 ++++++++++++++++++++++++++++++++++- src/network/bridge_driver_platform.h | 7 ++ tests/Makefile.am | 4 + tools/virsh-interface.c | 25 ++++++- tools/virsh-network.c | 62 ++++++++++++++- tools/virsh.pod | 8 +- 8 files changed, 241 insertions(+), 10 deletions(-) -- 1.8.4

5 25

[libvirt] [PATCH v2 0/4] Introduce display of IOThreads Information
by John Ferlan 17 Feb '15

17 Feb '15

v1: http://www.redhat.com/archives/libvir-list/2015-February/msg00402.html Changes since v1: * Remove 'thread_id' from public display * Add --live, --config, --current flags * Adjust patch 1 to accept/check the flags, modify comments * Adjust patch 3 to handle 'Live' or 'Config' options. Moved most of v1 patch code into the *Live function and add the *Config function to generate the IOThread config data * Adjust patch 4 to allow/check live/config options and set flags John Ferlan (4): Implement public API for virDomainGetIOThreadsInfo remote: Implement the remote plumbing for virDomainGetIOThreads qemu: Implement the qemu driver fetch for IOThreads virsh: Add 'iothreads' command daemon/remote.c | 74 ++++++++++++- include/libvirt/libvirt-domain.h | 21 +++- src/driver-hypervisor.h | 8 +- src/libvirt-domain.c | 75 +++++++++++++- src/libvirt_public.syms | 6 ++ src/qemu/qemu_driver.c | 217 +++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 81 ++++++++++++++- src/remote/remote_protocol.x | 28 ++++- src/remote_protocol-structs | 19 ++++ src/rpc/gendispatch.pl | 1 + tools/virsh-domain.c | 94 +++++++++++++++++ tools/virsh.pod | 12 +++ 12 files changed, 629 insertions(+), 7 deletions(-) -- 2.1.0

1 5

[libvirt] [PATCH] qemu_cgroup: initialize mem_mask to NULL
by Pavel Hrdina 17 Feb '15

17 Feb '15

If 'virNumaGetHostNodeset()' fails then the error path will try to free uninitialized pointer mem_mask. Introduced by commit af2a1f058. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index fc46450..7b8eed0 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -791,32 +791,32 @@ qemuInitCgroup(virQEMUDriverPtr driver, static void qemuRestoreCgroupState(virDomainObjPtr vm) { - char *mem_mask; + char *mem_mask = NULL; int empty = -1; qemuDomainObjPrivatePtr priv = vm->privateData; virBitmapPtr all_nodes; if (!(all_nodes = virNumaGetHostNodeset())) goto error; if (!(mem_mask = virBitmapFormat(all_nodes))) goto error; if ((empty = virCgroupHasEmptyTasks(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) <= 0) goto error; if (virCgroupSetCpusetMems(priv->cgroup, mem_mask) < 0) goto error; cleanup: VIR_FREE(mem_mask); virBitmapFree(all_nodes); return; error: virResetLastError(); VIR_DEBUG("Couldn't restore cgroups to meaningful state"); goto cleanup; } -- 2.0.5

1 0

[libvirt] [PATCH] qemu: fix vm deadlock when try to use numatune in session mode
by Luyao Huang 17 Feb '15

17 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1126762 commit 43b67f introduce a deadlock issue when we use numatune to change numa settings to a vm in session mode. Jump to endjob instead of jump to cleanup. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 709f468..1bbbe9b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9495,7 +9495,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, flags & VIR_DOMAIN_AFFECT_LIVE) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("NUMA tuning is not available in session mode")); - goto cleanup; + goto endjob; } if (flags & VIR_DOMAIN_AFFECT_LIVE) { -- 1.8.3.1

2 1

[libvirt] Fwd: libvirt 1.2.10 and latest EL6 qemu-kvm
by Franky Van Liedekerke 17 Feb '15

17 Feb '15

Since there was no reaction in the user list, I'm posting it in the devel in the hope for some guidance to the problem mentioned below (sorry about this). Franky ---------- Forwarded message ---------- From: Franky Van Liedekerke <franky(a)e-dynamics.be> Date: Wed, Feb 11, 2015 at 3:44 PM Subject: Re: libvirt 1.2.10 and latest EL6 qemu-kvm To: libvirt-users(a)redhat.com (I'm sorry, I didn't find my original message but I provide the archive link: https://www.redhat.com/archives/libvirt-users/2015-January/msg00069.html ) I just tried the latest libvirt release (1.2.12), combined with the following qemu EL6 package from centos: qemu-kvm-0.12.1.2-2.448.el6_6.x86_64 Using 1.2.12 and this version of qemu-kvm, I still get the following error when trying to start a domain: error: Failed to start domain btcab0001ap.unix.banksys.be error: internal error: unable to execute QEMU command 'qom-list': The command qom-list has not been found The older qemu package (qemu-kvm-0.12.1.2-2.415.el6_5.14.x86_64) works just fine though (I also tried the qemu-rhev-packages for el6 from ovirt, but no change). I verified the changelog from libvirt 1.2.12 and the earlier suggested fix is in there (but doesn't seem to change anything): 2015-01-14 Pavel Hrdina <phrdina(a)redhat.com> qemu_monitor: introduce new function to get QOM path Now, I have activated libvirtd debug and these are the qom-list lines (I can provide the full logfile if wanted): 2015-02-11 14:10:33.259+0000: 13280: debug : virJSONValueToString:1528 : result={"execute":"qom-list","arguments":{"path":"/machine/unattached/device[0]"},"id":"libvirt-5"} 2015-02-11 14:10:33.259+0000: 13280: debug : qemuMonitorJSONCommandWithFd:290 : Send command '{"execute":"qom-list","arguments":{"path":"/machine/unattached/device[0]"},"id":"libvirt-5"}' for write with FD -1 2015-02-11 14:10:33.259+0000: 13280: info : qemuMonitorSend:972 : QEMU_MONITOR_SEND_MSG: mon=0x7fa62801cbf0 msg={"execute":"qom-list","arguments":{"path":"/machine/unattached/device[0]"},"id":"libvirt-5"} 2015-02-11 14:10:33.260+0000: 13278: info : qemuMonitorIOWrite:503 : QEMU_MONITOR_IO_WRITE: mon=0x7fa62801cbf0 buf={"execute":"qom-list","arguments":{"path":"/machine/unattached/device[0]"},"id":"libvirt-5"} 2015-02-11 14:10:33.261+0000: 13278: info : qemuMonitorIOProcess:399 : QEMU_MONITOR_IO_PROCESS: mon=0x7fa62801cbf0 buf={"id": "libvirt-5", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}} 2015-02-11 14:10:33.261+0000: 13278: debug : qemuMonitorJSONIOProcessLine:183 : Line [{"id": "libvirt-5", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}}] 2015-02-11 14:10:33.261+0000: 13278: debug : virJSONValueFromString:1361 : string={"id": "libvirt-5", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}} 2015-02-11 14:10:33.261+0000: 13278: info : qemuMonitorJSONIOProcessLine:203 : QEMU_MONITOR_RECV_REPLY: mon=0x7fa62801cbf0 reply={"id": "libvirt-5", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}} 2015-02-11 14:10:33.289+0000: 13280: debug : virJSONValueToString:1528 : result={"execute":"qom-list","arguments":{"path":"/machine/peripheral"},"id":"libvirt-7"} 2015-02-11 14:10:33.289+0000: 13280: debug : qemuMonitorJSONCommandWithFd:290 : Send command '{"execute":"qom-list","arguments":{"path":"/machine/peripheral"},"id":"libvirt-7"}' for write with FD -1 2015-02-11 14:10:33.289+0000: 13280: info : qemuMonitorSend:972 : QEMU_MONITOR_SEND_MSG: mon=0x7fa62801cbf0 msg={"execute":"qom-list","arguments":{"path":"/machine/peripheral"},"id":"libvirt-7"} 2015-02-11 14:10:33.289+0000: 13278: info : qemuMonitorIOWrite:503 : QEMU_MONITOR_IO_WRITE: mon=0x7fa62801cbf0 buf={"execute":"qom-list","arguments":{"path":"/machine/peripheral"},"id":"libvirt-7"} 2015-02-11 14:10:33.291+0000: 13278: info : qemuMonitorIOProcess:399 : QEMU_MONITOR_IO_PROCESS: mon=0x7fa62801cbf0 buf={"id": "libvirt-7", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}} 2015-02-11 14:10:33.291+0000: 13278: debug : qemuMonitorJSONIOProcessLine:183 : Line [{"id": "libvirt-7", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}}] 2015-02-11 14:10:33.291+0000: 13278: debug : virJSONValueFromString:1361 : string={"id": "libvirt-7", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}} 2015-02-11 14:10:33.291+0000: 13278: info : qemuMonitorJSONIOProcessLine:203 : QEMU_MONITOR_RECV_REPLY: mon=0x7fa62801cbf0 reply={"id": "libvirt-7", "error": {"class": "CommandNotFound", "desc": "The command qom-list has not been found", "data": {"name": "qom-list"}}} 2015-02-11 14:10:33.291+0000: 13280: debug : virJSONValueToString:1528 : result={"execute":"qom-list","arguments":{"path":"/machine/peripheral"},"id":"libvirt-7"} 2015-02-11 14:10:33.292+0000: 13280: debug : virJSONValueToString:1528 : result={"id":"libvirt-7","error":{"class":"CommandNotFound","desc":"The command qom-list has not been found","data":{"name":"qom-list"}}} 2015-02-11 14:10:33.292+0000: 13280: debug : qemuMonitorJSONCheckError:370 : unable to execute QEMU command {"execute":"qom-list","arguments":{"path":"/machine/peripheral"},"id":"libvirt-7"}: {"id":"libvirt-7","error":{"class":"CommandNotFound","desc":"The command qom-list has not been found","data":{"name":"qom-list"}}} 2015-02-11 14:10:33.292+0000: 13280: error : qemuMonitorJSONCheckError:381 : internal error: unable to execute QEMU command 'qom-list': The command qom-list has not been found (again: full log can be provided, but maybe that should be sent in private, I don't know if it is allowed as an attachment here). Any tips? Franky

3 3

[libvirt] Getting Introduced to the Community
by Gaurav Bansal 17 Feb '15

17 Feb '15

Hi, My name is Gaurav Bansal and I would like to introduce myself to the developers of this community. I'm (technically) a junior in the Computer Science degree program at Birla Institute of Technology and Science Pilani. I am well versed with Python, C/C++, Java, PHP and bash. I have been using the qemu tool and the virt-manager for almost 6 months now and I'm comfortable with it. I was very much fascinated with the concept of Virtualization and wanted to explore it more and what could be a better way to start off than KVM. I was having a look at the GSoC 2015 ideas <http://qemu-project.org/Google_Summer_of_Code_2015> page and the particular project of Running docker containers using virt-sandbox <http://qemu-project.org/Google_Summer_of_Code_2015#Running_docker_container…>. I have some basic information about the docker images and have worked using the libvirt API. I have also tried the proof of concept uploaded by Daniel for downloading the docker images. Could you please guide me through where should I look forward that would be helpful for the project? - Gaurav Bansal Github : https://github.com/gauravb7090 IRC : gauravb7090 LinkedIn <http://in.linkedin.com/in/gauravb7090/>

2 1

[libvirt] [PATCH] virsh: fix IP address in vncdisplay for listen type='network'
by Luyao Huang 17 Feb '15

17 Feb '15

Just like the fix for domdisplay in commit 1ba815. --- tools/virsh-domain.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index dc4a863..2506b89 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10269,6 +10269,18 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) listen_addr = virXPathString("string(/domain/devices/graphics" "[@type='vnc']/@listen)", ctxt); + if (!listen_addr) { + /* The subelement address - <listen address='xyz'/> - + * *should* have been automatically backfilled into its + * parent <graphics listen='xyz'> (which we just tried to + * retrieve into listen_addr above) but in some cases it + * isn't, so we also do an explicit check for the + * subelement (which, by the way, doesn't exist on libvirt + * < 0.9.4, so we really do need to check both places) + */ + listen_addr = virXPathString("string(/domain/devices/graphics" + "[@type='vnc']/listen/@address)", ctxt); + } if (listen_addr == NULL || STREQ(listen_addr, "0.0.0.0")) vshPrint(ctl, ":%d\n", port-5900); else -- 1.8.3.1

3 2

[libvirt] [PATCH] Comment out variables/functions that are unused.
by Gary R Hook 17 Feb '15

17 Feb '15

Avoids complaints when the compiler is configured to "warn-unused". A few files contain unnecessary code that results in the compiler erroring out when -Wunused* options are used. Comment out the code until such time as it is needed. --- src/libxl/libxl_conf.c | 2 ++ tests/virnetsockettest.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0555b91..f8db4d2 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -305,7 +305,9 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) regmatch_t subs[4]; char *saveptr = NULL; size_t i; +/* virArch hostarch = caps->host.arch; +*/ struct guest_arch guest_archs[32]; int nr_guest_archs = 0; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 5d91f26..988ab43 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -333,9 +333,10 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) return ret; } +/* static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED) { - virNetSocketPtr csock = NULL; /* Client socket */ + virNetSocketPtr csock = NULL; / * Client socket * / char buf[100]; size_t i; int ret = -1; @@ -360,10 +361,12 @@ static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED) virObjectUnref(csock); return ret; } +*/ +/* static int testSocketCommandFail(const void *data ATTRIBUTE_UNUSED) { - virNetSocketPtr csock = NULL; /* Client socket */ + virNetSocketPtr csock = NULL; / * Client socket * / char buf[100]; int ret = -1; virCommandPtr cmd = virCommandNewArgList("/bin/cat", "/dev/does-not-exist", NULL); @@ -383,6 +386,7 @@ static int testSocketCommandFail(const void *data ATTRIBUTE_UNUSED) virObjectUnref(csock); return ret; } +*/ struct testSSHData { const char *nodename; -- 1.9.1

2 2

[libvirt] [PATCH] qemu: check the validity of a pointer
by Matthias Gatto 17 Feb '15

17 Feb '15

In the current code if mem_mask is NULL there is a "goto error", but we freeing it without knowing if mem_mask is NULL or not, therefor I've had a check. Signed-off-by: Matthias Gatto <matthias.gatto(a)outscale.com> --- src/qemu/qemu_cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ca255c8..926726c 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -810,7 +810,8 @@ qemuRestoreCgroupState(virDomainObjPtr vm) goto error; cleanup: - VIR_FREE(mem_mask); + if (mem_mask) + VIR_FREE(mem_mask); virBitmapFree(all_nodes); return; -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] Document virtlockd
by Daniel P. Berrange 17 Feb '15

17 Feb '15

Just some docs additions wrt virtlockd Daniel P. Berrange (2): docs: split out sanlock setup docs docs: add page about virtlockd setup docs/locking-lockd.html.in | 160 +++++++++++++++++++++++++ docs/locking-sanlock.html.in | 247 ++++++++++++++++++++++++++++++++++++++ docs/locking.html.in | 277 ++++++------------------------------------- docs/sitemap.html.in | 10 ++ 4 files changed, 450 insertions(+), 244 deletions(-) create mode 100644 docs/locking-lockd.html.in create mode 100644 docs/locking-sanlock.html.in -- 2.1.0

3 4

[libvirt] [PATCH 0/3] numatune: Prefer old approach
by Michal Privoznik 17 Feb '15

17 Feb '15

Consider the following part of domain XML: <numatune> <memory mode='static' nodeset="0,2"/> </numatune> <cpu> <numa> <cell id='0' cpus='0' memory='65536' unit='KiB'/> </numa> </cpu> Yes, this have a great potential of breaking things. Especially, this will break migration between previous two or three upstream releases and current release we are working on, because libvirt started domains in more complicated way (even if not needed). After these patches, domains will be started in simpler way which is incompatible. On the other hand, we get backward compatibility with much more releases than we are about to break. Michal Privoznik (3): numatune_conf: Expose virDomainNumatuneNodeSpecified qemuxml2argvtest: Fake response from numad qemuBuildMemoryBackendStr: Report backend requirement more appropriately src/conf/numatune_conf.c | 2 +- src/conf/numatune_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 6 ++++-- tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args | 5 +++++ tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args | 5 +++++ tests/qemuxml2argvtest.c | 12 +++++++++++- 8 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args -- 2.0.5

3 6

[libvirt] [PATCH 0/2] Fix virFileFindResource in VPATH
by Jiri Denemark 16 Feb '15

16 Feb '15

Jiri Denemark (2): virFileFindResource: Add support for looking in source tree Search for schemas and cpu_map.xml in source tree src/Makefile.am | 2 ++ src/conf/domain_conf.c | 6 ++--- src/cpu/cpu_map.c | 6 ++--- src/driver.c | 1 + src/libvirt_private.syms | 1 + src/locking/lock_driver_lockd.c | 1 + src/locking/lock_manager.c | 1 + src/remote/remote_driver.c | 1 + src/util/virfile.c | 49 +++++++++++++++++++++++++++++++++-------- src/util/virfile.h | 12 +++++++++- 10 files changed, 64 insertions(+), 16 deletions(-) -- 2.3.0

2 4

[libvirt] why not shutdown the src vm to avoid split-brain
by zhang bo 15 Feb '15

15 Feb '15

In func doPeer2PeerMigrate3(), in the "finish" step, it checks whether domainMigrateFinish3() returns NULL or not. if it(ddomain) is NULL, it just restarts the guest on the source. Please consider the scenario that the ddomain has already been running on the dest, but it fails to tell the source this fact, and ddomain becomes NULL. If we then restart the guest on the source, there will be 2 same guests running on both sides, and a SPLIT-BRAIN occurs. It seems much better to stop them both , rather than leaving them both running. At least, when we found the ddomain is NULL, we should probably check whether the problem is caused by keepAlive failure, if so, kill the guest on the source rather than restarting it. How do you think about that? BTW, it says that: "The lock manager plugins should take care of safety in this scenario" in the comment, with the commit 2593f9692df0f128b14cde811e18aa49c1cf3e06, I don't quite understand that: 1) If we migrate the guest with the flag VIR_MIGRATE_NON_SHARED_DISK, then nbd server may take care of the data consistency, But before it starts the cpus on the dest, the nbd server is already stopped. So, at this moment, no one takes care of this problem. 2) If we migrate the guest with a shared disk, then does it mean that the nfs or other shareing-disk schemas should prevent split-brain by themselves?

1 0

[libvirt] [PATCH 0/3] fsfreeze and fsthaw API testing
by Jincheng Miao 15 Feb '15

15 Feb '15

Added guest agent conf to domain xml in order to test API fsfreeze and fsthaw. Jincheng Miao (3): add guest agent configuration to domain xml Add domain fsfreeze and fsthaw API testing Add fsfreeze fsthaw test case to linux_domain cases/linux_domain.conf | 18 +++++ repos/domain/domain_fsfreeze.py | 76 ++++++++++++++++++++ repos/domain/domain_fsthaw.py | 49 +++++++++++++ .../domain/xmls/kvm_linux_guest_install_cdrom.xml | 4 + repos/domain/xmls/kvm_linux_guest_install_net.xml | 20 +++-- 5 files changed, 159 insertions(+), 8 deletions(-) create mode 100644 repos/domain/domain_fsfreeze.py create mode 100644 repos/domain/domain_fsthaw.py

4 8

[libvirt] Tunnelled post-copy live migration - support of bidirectional communication over the tunnel
by Vojtech Cima 15 Feb '15

15 Feb '15

Hello everyone, we are very interested about the post-copy live migration mechanism in libvirt [1] using QEMU. Mentioning post-copy in this context means the setup with the first full iteration of standard pre-copy and then switching to the post-copy. VIR_MIGRATE_ENABLE_POSTCOPY, VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY together with VIR_MIGRATE_TUNNELLED flag. Recently we have noticed the issue that post-copy live migration doesn't work over the tunnel since since current tunnel implementation in libvirt supports only uni-directional communication. I spent some time trying to enable bidirectional communication over the tunnel but still facing several issues and I would appreciate any hints how to move forward. The idea is to add a function (probably a callback function) responsible for handling the traffic in the opposite direction (dest->src) reading from the virStream and writing to the QEMU [2]. To be able to do so I replaced the current 'pipe' calls with the 'socketpair' calls to create bidirectional paths. Now, trying to use tunnelled post-copy live migration, it gets initiated, there is some traffic going from source to destination (obviously the pre-copy phase) but at some point it gets stuck on the 'saferead' function [3] which is now blocking. Can this issue issue be linked with the default socket blocking policy? Trying to use standard 'read' function instead of 'saferead' results that the lower data transfers and it seems it's missing significant part of information. Another point is that we suppose that the virStream on its own supports bidirectional communication, is that correct? [1] https://github.com/orbitfp7/qemu/tree/wp3-postcopy [2] http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/qemu/qemu_migration.c;h=… [3] http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/qemu/qemu_migration.c;h=… Thank you very much for any ideas on this topic. Regards, Vojtech

2 3

[libvirt] [PATCH v2] Comment out variables/functions that are unused.
by Gary R Hook 14 Feb '15

14 Feb '15

Avoids complaints when the compiler is configured to "warn-unused". A few files contain unnecessary code that results in the compiler erroring out when -Wunused* options are used. Comment out the code until such time as it is needed. Signed-off-by: Gary R Hook <gary.hook(a)nimboxx.com> --- src/libxl/libxl_conf.c | 2 ++ tests/virnetsockettest.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0555b91..f8db4d2 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -305,7 +305,9 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCapsPtr caps) regmatch_t subs[4]; char *saveptr = NULL; size_t i; +/* virArch hostarch = caps->host.arch; +*/ struct guest_arch guest_archs[32]; int nr_guest_archs = 0; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 5d91f26..988ab43 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -333,9 +333,10 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) return ret; } +/* static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED) { - virNetSocketPtr csock = NULL; /* Client socket */ + virNetSocketPtr csock = NULL; / * Client socket * / char buf[100]; size_t i; int ret = -1; @@ -360,10 +361,12 @@ static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED) virObjectUnref(csock); return ret; } +*/ +/* static int testSocketCommandFail(const void *data ATTRIBUTE_UNUSED) { - virNetSocketPtr csock = NULL; /* Client socket */ + virNetSocketPtr csock = NULL; / * Client socket * / char buf[100]; int ret = -1; virCommandPtr cmd = virCommandNewArgList("/bin/cat", "/dev/does-not-exist", NULL); @@ -383,6 +386,7 @@ static int testSocketCommandFail(const void *data ATTRIBUTE_UNUSED) virObjectUnref(csock); return ret; } +*/ struct testSSHData { const char *nodename; -- 1.9.1

2 1

[libvirt] [PATCH 0/2] Resolve a couple of Coverity issues
by John Ferlan 14 Feb '15

14 Feb '15

One new one and one that I've seen periodically. John Ferlan (2): security: Resolve Coverity RESOURCE_LEAK libxl: Resolve Coverity CHECKED_RETURN src/libxl/libxl_domain.c | 6 +++++- src/security/security_manager.c | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH v4 0/3] lxc: fix show the wrong xml when guest start failed
by John Ferlan 14 Feb '15

14 Feb '15

This is a rework of the patch Luyao Huang sent to resolve a couple of issues found in virLXCStartProcess. See explanation here: http://www.redhat.com/archives/libvir-list/2015-February/msg00433.html John Ferlan (1): lxc: Modify/add some debug messages Luyao Huang (2): lxc: Move console checks in LXCProcessStart lxc: Fix container cleanup for LXCProcessStart src/lxc/lxc_process.c | 109 ++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 57 deletions(-) -- 2.1.0

2 7

[libvirt] [PATCH v2 0/4] attach-interface: Learn net type='direct'
by Michal Privoznik 13 Feb '15

13 Feb '15

v2 Michal Privoznik (4): libvirt_private.syms: Expose virDomainNetTypeFromString virsh attach-interface: Use enum instead of arbitrary integers virsh attach-interface: Use virDomainNetType{From,To}String() virsh attach-interface: Allow macvtap hotplug src/libvirt_private.syms | 1 + tools/virsh-domain.c | 36 ++++++++++++++++++++++++++---------- tools/virsh.pod | 14 ++++++++------ 3 files changed, 35 insertions(+), 16 deletions(-) -- 2.0.5

4 7

[libvirt] [PATCH v3 1/2] security: introduce virSecurityManagerCheckAllLabel function
by Erik Skultety 13 Feb '15

13 Feb '15

We do have a check for valid per-domain security model, however we still do permit an invalid security model for a domain's device (those which are specified with <source> element). This patch introduces a new function virSecurityManagerCheckAllLabel which compares user specified security model against currently registered security drivers. That being said, it also permits 'none' being specified as a device security model. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1165485 --- src/libvirt_private.syms | 1 + src/lxc/lxc_process.c | 3 ++ src/qemu/qemu_process.c | 6 +++ src/security/security_manager.c | 89 +++++++++++++++++++++++++++++++++++++++++ src/security/security_manager.h | 2 + 5 files changed, 101 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 645aef1..e98e813 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -955,6 +955,7 @@ virSecurityDriverLookup; # security/security_manager.h +virSecurityManagerCheckAllLabel; virSecurityManagerClearSocketLabel; virSecurityManagerGenLabel; virSecurityManagerGetBaseLabel; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 19ea7f3..52b7f41 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1135,6 +1135,9 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DEFAULT) vm->def->seclabels[0]->type = VIR_DOMAIN_SECLABEL_NONE; + if (virSecurityManagerCheckAllLabel(driver->securityManager, vm->def) < 0) + goto cleanup; + if (virSecurityManagerGenLabel(driver->securityManager, vm->def) < 0) { virDomainAuditSecurityLabel(vm, false); goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 43a64a1..1d4e957 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4488,6 +4488,10 @@ int qemuProcessStart(virConnectPtr conn, NULL) < 0) goto cleanup; + VIR_DEBUG("Checking domain and device security labels"); + if (virSecurityManagerCheckAllLabel(driver->securityManager, vm->def) < 0) + goto cleanup; + /* If you are using a SecurityDriver with dynamic labelling, then generate a security label for isolation */ VIR_DEBUG("Generating domain security label (if required)"); @@ -5488,6 +5492,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, } } + if (virSecurityManagerCheckAllLabel(driver->securityManager, vm->def) < 0) + goto error; if (virSecurityManagerGenLabel(driver->securityManager, vm->def) < 0) goto error; diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 302f54d..68ed85b 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -703,6 +703,95 @@ virSecurityManagerReleaseLabel(virSecurityManagerPtr mgr, } +static int virSecurityManagerCheckSecurityModel(char *secmodel, + void *opaque) +{ + size_t i; + virSecurityManagerPtr mgr = opaque; + virSecurityManagerPtr *sec_managers = NULL; + + if ((sec_managers = virSecurityManagerGetNested(mgr)) == NULL) + return -1; + + if (STREQ_NULLABLE(secmodel, "none")) + return 0; + + for (i = 0; sec_managers[i]; i++) { + if (STREQ_NULLABLE(secmodel, + sec_managers[i]->drv->name)) { + return 0; + } + } + + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unable to find security driver for model %s"), + secmodel); + return -1; +} + + +static int +virSecurityManagerCheckSecurityDiskLabel(virDomainDiskDefPtr disk, + void *opaque) +{ + size_t i; + + for (i = 0; i < disk->src->nseclabels; i++) { + if (virSecurityManagerCheckSecurityModel(disk->src->seclabels[i]->model, + opaque) < 0) + return -1; + } + + return 0; +} + + +static int +virSecurityManagerCheckSecurityChardevLabel(virDomainChrDefPtr dev, + void *opaque) +{ + size_t i; + + for (i = 0; i < dev->nseclabels; i++) { + if (virSecurityManagerCheckSecurityModel(dev->seclabels[i]->model, + opaque) < 0) + return -1; + } + + return 0; +} + + +static int +virSecurityManagerCheckSecurityChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainChrDefPtr dev, + void *opaque) +{ + return virSecurityManagerCheckSecurityChardevLabel(dev, opaque); +} + + +int virSecurityManagerCheckAllLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm) +{ + size_t i; + + for (i = 0; i < vm->ndisks; i++) { + if (virSecurityManagerCheckSecurityDiskLabel(vm->disks[i], + mgr) < 0) + return -1; + } + + if (virDomainChrDefForeach(vm, + true, + virSecurityManagerCheckSecurityChardevCallback, + mgr) < 0) + return -1; + + return 0; +} + + int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm, diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 156f882..13468db 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -111,6 +111,8 @@ int virSecurityManagerReserveLabel(virSecurityManagerPtr mgr, pid_t pid); int virSecurityManagerReleaseLabel(virSecurityManagerPtr mgr, virDomainDefPtr sec); +int virSecurityManagerCheckAllLabel(virSecurityManagerPtr mgr, + virDomainDefPtr sec); int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr, virDomainDefPtr sec, const char *stdin_path); -- 1.9.3

2 3

[libvirt] QEMU capabilities vs machine types
by Michal Privoznik 13 Feb '15

13 Feb '15

Dear list, I've ran into the following bug [1]. The problem is, even though we check whether memory-backend-{ram,file} devices are supported, qemu fails to start. As I see it, on one hand, qemu lies about supported devices (when I imitated libvirt capabilities check by hand on the command line). But on the other hand, libvirt is using '-M none' so even if qemu is fixed, the domain would be unable to start anyway. So I believe my question is, does anybody have a bright idea how to fix this? I don't think we want to extend our capabilities from a list to a matrix (where a machine type would select a list). Moreover, querying and creating the matrix would take ages. But then again, machine type is important. Maybe not so for -x86_64 but for -arm definitely! Or? Michal 1: https://bugzilla.redhat.com/show_bug.cgi?id=1191567

3 5

[libvirt] [PATCH v3] lxc: fix show the wrong xml when guest start failed
by Luyao Huang 13 Feb '15

13 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=1176503 When guest start failed, libvirt will keep the current vm->def, this will make a issue that we cannot get a right xml after guest start failed. And don't call the stop/release hook to do some other clean work. Call virLXCProcessCleanup to help us clean the source and call the hooks if start a vm failed Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: use virLXCProcessCleanup to free the source and call the hook. v3: rework the patch to suit the virLXCProcessStart code changed. src/lxc/lxc_process.c | 76 ++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 01da344..1a6cfbb 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1022,6 +1022,7 @@ int virLXCProcessStart(virConnectPtr conn, virCgroupPtr selfcgroup; int status; char *pidfile = NULL; + bool need_stop = false; if (virCgroupNewSelf(&selfcgroup) < 0) return -1; @@ -1259,6 +1260,7 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } + need_stop = true; priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_FAILED; priv->wantReboot = false; vm->def->id = vm->pid; @@ -1272,20 +1274,20 @@ int virLXCProcessStart(virConnectPtr conn, if (VIR_CLOSE(handshakefds[1]) < 0) { virReportSystemError(errno, "%s", _("could not close handshake fd")); - goto error; + goto cleanup; } if (virCommandHandshakeWait(cmd) < 0) - goto error; + goto cleanup; /* Write domain status to disk for the controller to * read when it starts */ if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) - goto error; + goto cleanup; /* Allow the child to exec the controller */ if (virCommandHandshakeNotify(cmd) < 0) - goto error; + goto cleanup; if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); @@ -1298,7 +1300,7 @@ int virLXCProcessStart(virConnectPtr conn, _("guest failed to start: %s"), out); } - goto error; + goto cleanup; } /* We know the cgroup must exist by this synchronization @@ -1310,13 +1312,13 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->resource->partition : NULL, -1, &priv->cgroup) < 0) - goto error; + goto cleanup; if (!priv->cgroup) { virReportError(VIR_ERR_INTERNAL_ERROR, _("No valid cgroup for machine %s"), vm->def->name); - goto error; + goto cleanup; } /* And we can get the first monitor connection now too */ @@ -1329,17 +1331,17 @@ int virLXCProcessStart(virConnectPtr conn, virReportError(VIR_ERR_INTERNAL_ERROR, _("guest failed to start: %s"), ebuf); } - goto error; + goto cleanup; } if (autoDestroy && virCloseCallbacksSet(driver->closeCallbacks, vm, conn, lxcProcessAutoDestroy) < 0) - goto error; + goto cleanup; if (virDomainObjSetDefTransient(caps, driver->xmlopt, vm, false) < 0) - goto error; + goto cleanup; /* We don't need the temporary NIC names anymore, clear them */ virLXCProcessCleanInterfaces(vm->def); @@ -1358,47 +1360,38 @@ int virLXCProcessStart(virConnectPtr conn, * If the script raised an error abort the launch */ if (hookret < 0) - goto error; + goto cleanup; } rc = 0; cleanup: - if (rc != 0 && !err) - err = virSaveLastError(); - virCommandFree(cmd); if (VIR_CLOSE(logfd) < 0) { virReportSystemError(errno, "%s", _("could not close logfile")); rc = -1; } - for (i = 0; i < nveths; i++) { - if (rc != 0 && veths[i]) - ignore_value(virNetDevVethDelete(veths[i])); - VIR_FREE(veths[i]); - } if (rc != 0) { - if (vm->newDef) { - virDomainDefFree(vm->newDef); - vm->newDef = NULL; - } - if (priv->monitor) { - virObjectUnref(priv->monitor); - priv->monitor = NULL; - } - virDomainConfVMNWFilterTeardown(vm); - - virSecurityManagerRestoreAllLabel(driver->securityManager, - vm->def, false); - virSecurityManagerReleaseLabel(driver->securityManager, vm->def); - /* Clear out dynamically assigned labels */ - if (vm->def->nseclabels && - vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { - VIR_FREE(vm->def->seclabels[0]->model); - VIR_FREE(vm->def->seclabels[0]->label); - VIR_FREE(vm->def->seclabels[0]->imagelabel); - VIR_DELETE_ELEMENT(vm->def->seclabels, 0, vm->def->nseclabels); + err = virSaveLastError(); + if (need_stop) { + virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + } else { + virSecurityManagerRestoreAllLabel(driver->securityManager, + vm->def, false); + virSecurityManagerReleaseLabel(driver->securityManager, vm->def); + /* Clear out dynamically assigned labels */ + if (vm->def->nseclabels && + vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { + VIR_FREE(vm->def->seclabels[0]->model); + VIR_FREE(vm->def->seclabels[0]->label); + VIR_FREE(vm->def->seclabels[0]->imagelabel); + VIR_DELETE_ELEMENT(vm->def->seclabels, 0, vm->def->nseclabels); + } + virLXCProcessCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); } } + virCommandFree(cmd); + for (i = 0; i < nveths; i++) + VIR_FREE(veths[i]); for (i = 0; i < nttyFDs; i++) VIR_FORCE_CLOSE(ttyFDs[i]); VIR_FREE(ttyFDs); @@ -1415,11 +1408,6 @@ int virLXCProcessStart(virConnectPtr conn, } return rc; - - error: - err = virSaveLastError(); - virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); - goto cleanup; } struct virLXCProcessAutostartData { -- 1.8.3.1

3 2