- Devel - libvirt List Archives

[GSoC][PATCH 0/7] Making `qemu_domainjob` hypervisor-agnostic
by Prathamesh Chavan 24 Aug '20

24 Aug '20

Following are a series of patches aimed to make qemu_domainjob hypervisor agnostic, and create a virdomainjob file in the future which handles domain-jobs. Prathamesh Chavan (7): qemu_domain: Added `qemuDomainJobInfo` to domainJob's `privateData` qemu_domainjob: added maxQueuedJobs and jobs_queued to `qemuDomainJob` qemu_domainjob: add `saveDomainStatus` as a callback function to jobs qemu_domain: funciton declarations moved to correct file qemu_domainjob: added `getDomainXMLOptionPtr` callback function qemu_domainjob: removed reference to `qemuDomainObjPrivatePtr` virmigraiton: `qemuMigrationJobPhase` transformed for more generic use src/hypervisor/meson.build | 1 + src/hypervisor/virmigration.c | 41 ++ src/hypervisor/virmigration.h | 38 + src/libvirt_private.syms | 4 + src/qemu/MIGRATION.txt | 8 +- src/qemu/qemu_backup.c | 72 +- src/qemu/qemu_backup.h | 3 +- src/qemu/qemu_block.c | 45 +- src/qemu/qemu_block.h | 6 +- src/qemu/qemu_blockjob.c | 45 +- src/qemu/qemu_blockjob.h | 3 +- src/qemu/qemu_checkpoint.c | 29 +- src/qemu/qemu_domain.c | 595 ++++++++++++++-- src/qemu/qemu_domain.h | 106 ++- src/qemu/qemu_domainjob.c | 845 +++++----------------- src/qemu/qemu_domainjob.h | 152 ++-- src/qemu/qemu_driver.c | 1127 ++++++++++++++++-------------- src/qemu/qemu_hotplug.c | 319 ++++----- src/qemu/qemu_hotplug.h | 30 +- src/qemu/qemu_migration.c | 438 ++++++------ src/qemu/qemu_migration.h | 29 +- src/qemu/qemu_migration_cookie.c | 15 +- src/qemu/qemu_migration_params.c | 48 +- src/qemu/qemu_migration_params.h | 15 +- src/qemu/qemu_process.c | 364 +++++----- src/qemu/qemu_process.h | 15 +- tests/qemuhotplugtest.c | 2 +- 27 files changed, 2211 insertions(+), 2184 deletions(-) create mode 100644 src/hypervisor/virmigration.c create mode 100644 src/hypervisor/virmigration.h -- 2.25.1

2 17

[libvirt PATCH v2 0/1] meson: Drop RPATH usage
by Andrea Bolognani 23 Aug '20

23 Aug '20

Changes since [v1] * drop RPATH usage completely instead of making it conditional. [v1] https://www.redhat.com/archives/libvir-list/2020-August/msg00599.html Andrea Bolognani (1): meson: Drop RPATH usage src/meson.build | 6 ------ tools/meson.build | 4 ---- 2 files changed, 10 deletions(-) -- 2.26.2

4 10

[PATCH] tools: fix libvirt-guests.sh text assignments
by Christian Ehrhardt 22 Aug '20

22 Aug '20

In libvirt 6.6 stopping guests with libvirt-guests.sh is broken. As soon as there is more than one guest one can see `systemctl stop libvirt-guests` faiing and in the log we see: libvirt-guests.sh[2455]: Running guests on default URI: libvirt-guests.sh[2457]: /usr/lib/libvirt/libvirt-guests.sh: 120: local: 2a49cb0f-1ff8-44b5-a61d-806b9e52dae2: bad variable name libvirt-guests.sh[2462]: no running guests. That is due do mutliple guests becoming a list of UUIDs. Without recognizing this as one single string the assignment breaks when using 'local' (which was recently added in 6.3.0). This is because local is defined as local [option] [name[=value] ... | - ] which makes the shell trying handle the further part of the string as variable names. In the error above that string isn't a valid variable name triggering the issue that is seen. To resolve that 'textify' all assignments that are strings or potentially can become such lists (even if they are not using the local qualifier). Fixes: 08071ec0 "tools: variables clean-up in libvirt-guests script" Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- tools/libvirt-guests.sh.in | 136 ++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 534c4d5e0f..d69df908d2 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -30,9 +30,9 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions || export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@" -URIS=default -ON_BOOT=start -ON_SHUTDOWN=suspend +URIS="default" +ON_BOOT="start" +ON_SHUTDOWN="suspend" SHUTDOWN_TIMEOUT=300 PARALLEL_SHUTDOWN=0 START_DELAY=0 @@ -65,7 +65,7 @@ retval() { # If URI is "default" virsh is called without the "-c" argument # (using libvirt's default connection) run_virsh() { - local uri=$1 + local uri="$1" shift if [ "x$uri" = xdefault ]; then @@ -86,7 +86,7 @@ run_virsh_c() { # check if URI is reachable test_connect() { - local uri=$1 + local uri="$1" if run_virsh "$uri" connect 2>/dev/null; then return 0; @@ -103,9 +103,9 @@ test_connect() # --transient: list only transient guests # [none]: list both persistent and transient guests list_guests() { - local uri=$1 - local persistent=$2 - local list=$(run_virsh_c "$uri" list --uuid $persistent) + local uri="$1" + local persistent="$2" + local list="$(run_virsh_c "$uri" list --uuid $persistent)" if [ $? -ne 0 ]; then RETVAL=1 @@ -118,8 +118,8 @@ list_guests() { # guest_name URI UUID # return name of guest UUID on URI guest_name() { - local uri=$1 - local uuid=$2 + local uri="$1" + local uuid="$2" run_virsh "$uri" domname "$uuid" 2>/dev/null } @@ -128,17 +128,17 @@ guest_name() { # check if guest UUID on URI is running # Result is returned by variable "guest_running" guest_is_on() { - local uri=$1 - local uuid=$2 - local id=$(run_virsh "$uri" domid "$uuid") + local uri="$1" + local uuid="$2" + local id="$(run_virsh "$uri" domid "$uuid")" - guest_running=false + guest_running="false" if [ $? -ne 0 ]; then RETVAL=1 return 1 fi - [ -n "$id" ] && [ "x$id" != x- ] && guest_running=true + [ -n "$id" ] && [ "x$id" != x- ] && guest_running="true" return 0 } @@ -151,9 +151,9 @@ started() { # start # Start or resume the guests start() { - local isfirst=true + local isfirst="true" local bypass= - local sync_time=false + local sync_time="false" local uri= local list= @@ -167,10 +167,10 @@ start() { return 0 fi - test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache - test "x$SYNC_TIME" = x0 || sync_time=true + test "x$BYPASS_CACHE" = x0 || bypass="--bypass-cache" + test "x$SYNC_TIME" = x0 || sync_time="true" while read uri list; do - local configured=false + local configured="false" local confuri= local guest= @@ -178,7 +178,7 @@ start() { for confuri in $URIS; do set +f if [ "x$confuri" = "x$uri" ]; then - configured=true + configured="true" break fi done @@ -192,14 +192,14 @@ start() { eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do - local name=$(guest_name "$uri" "$guest") + local name="$(guest_name "$uri" "$guest")" eval_gettext "Resuming guest \$name: " if guest_is_on "$uri" "$guest"; then if "$guest_running"; then gettext "already active"; echo else if "$isfirst"; then - isfirst=false + isfirst="false" else sleep $START_DELAY fi @@ -223,25 +223,25 @@ start() { # was saved. suspend_guest() { - local uri=$1 - local guest=$2 - local name=$(guest_name "$uri" "$guest") - local label=$(eval_gettext "Suspending \$name: ") + local uri="$1" + local guest="$2" + local name="$(guest_name "$uri" "$guest")" + local label="$(eval_gettext "Suspending \$name: ")" local bypass= local slept=0 - test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache + test "x$BYPASS_CACHE" = x0 || bypass="--bypass-cache" printf '%s...\n' "$label" run_virsh "$uri" managedsave $bypass "$guest" >/dev/null & - local virsh_pid=$! + local virsh_pid="$!" while true; do sleep 1 kill -0 "$virsh_pid" >/dev/null 2>&1 || break slept=$(($slept + 1)) if [ $(($slept % 5)) -eq 0 ]; then - local progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ - awk '/^Data processed:/{print $3, $4}') + local progress="$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ + awk '/^Data processed:/{print $3, $4}')" if [ -n "$progress" ]; then printf '%s%s\n' "$label" "$progress" else @@ -257,11 +257,11 @@ suspend_guest() # was successfully shutdown or the timeout defined by $SHUTDOWN_TIMEOUT expired. shutdown_guest() { - local uri=$1 - local guest=$2 - local name=$(guest_name "$uri" "$guest") - local timeout=$SHUTDOWN_TIMEOUT - local check_timeout=false + local uri="$1" + local guest="$2" + local name="$(guest_name "$uri" "$guest")" + local timeout="$SHUTDOWN_TIMEOUT" + local check_timeout="false" local format= local slept= @@ -270,11 +270,11 @@ shutdown_guest() retval run_virsh "$uri" shutdown "$guest" >/dev/null || return if [ $timeout -gt 0 ]; then - check_timeout=true - format=$(eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") + check_timeout="true" + format="$(eval_gettext "Waiting for guest %s to shut down, %d seconds left\n")" else slept=0 - format=$(eval_gettext "Waiting for guest %s to shut down\n") + format="$(eval_gettext "Waiting for guest %s to shut down\n")" fi while ! $check_timeout || [ "$timeout" -gt 0 ]; do sleep 1 @@ -309,9 +309,9 @@ shutdown_guest() # was issued to libvirt to allow parallel shutdown. shutdown_guest_async() { - local uri=$1 - local guest=$2 - local name=$(guest_name "$uri" "$guest") + local uri="$1" + local guest="$2" + local name="$(guest_name "$uri" "$guest")" eval_gettext "Starting shutdown on guest: \$name" echo @@ -332,8 +332,8 @@ guest_count() # Result is returned in "guests_shutting_down" check_guests_shutdown() { - local uri=$1 - local guests_to_check=$2 + local uri="$1" + local guests_to_check="$2" local guest= guests_shutting_down= @@ -354,9 +354,9 @@ check_guests_shutdown() # a shutdown complete notice for guests that have finished print_guests_shutdown() { - local uri=$1 - local before=$2 - local after=$3 + local uri="$1" + local before="$2" + local after="$3" local guest= for guest in $before; do @@ -364,7 +364,7 @@ print_guests_shutdown() *" $guest "*) continue;; esac - local name=$(guest_name "$uri" "$guest") + local name="$(guest_name "$uri" "$guest")" if [ -n "$name" ]; then eval_gettext "Shutdown of guest \$name complete." echo @@ -376,28 +376,28 @@ print_guests_shutdown() # Shutdown guests GUESTS on machine URI in parallel shutdown_guests_parallel() { - local uri=$1 - local guests=$2 + local uri="$1" + local guests="$2" local on_shutdown= - local check_timeout=false - local timeout=$SHUTDOWN_TIMEOUT + local check_timeout="false" + local timeout="$SHUTDOWN_TIMEOUT" local slept= local format= if [ $timeout -gt 0 ]; then - check_timeout=true - format=$(eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") + check_timeout="true" + format="$(eval_gettext "Waiting for %d guests to shut down, %d seconds left\n")" else slept=0 - format=$(eval_gettext "Waiting for %d guests to shut down\n") + format="$(eval_gettext "Waiting for %d guests to shut down\n")" fi while [ -n "$on_shutdown" ] || [ -n "$guests" ]; do while [ -n "$guests" ] && [ $(guest_count "$on_shutdown") -lt "$PARALLEL_SHUTDOWN" ]; do set -- $guests - local guest=$1 + local guest="$1" shift - guests=$* + guests="$*" if [ -z "$(echo $on_shutdown | grep $guest)" ] && [ -n "$(guest_name "$uri" "$guest")" ]; then shutdown_guest_async "$uri" "$guest" @@ -428,7 +428,7 @@ shutdown_guests_parallel() fi fi - local on_shutdown_prev=$on_shutdown + local on_shutdown_prev="$on_shutdown" check_guests_shutdown "$uri" "$on_shutdown" on_shutdown="$guests_shutting_down" print_guests_shutdown "$uri" "$on_shutdown_prev" "$on_shutdown" @@ -438,14 +438,14 @@ shutdown_guests_parallel() # stop # Shutdown or save guests on the configured uris stop() { - local suspending=true + local suspending="true" local uri= # last stop was not followed by start [ -f "$LISTFILE" ] && return 0 if [ "x$ON_SHUTDOWN" = xshutdown ]; then - suspending=false + suspending="false" if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -463,13 +463,13 @@ stop() { eval_gettext "Running guests on \$uri URI: " - local list=$(list_guests "$uri") + local list="$(list_guests "$uri")" if [ $? -eq 0 ]; then local empty=true for uuid in $list; do "$empty" || printf ", " printf %s "$(guest_name "$uri" "$uuid")" - empty=false + empty="false" done if "$empty"; then @@ -479,15 +479,15 @@ stop() { fi if "$suspending"; then - local transient=$(list_guests "$uri" "--transient") + local transient="$(list_guests "$uri" "--transient")" if [ $? -eq 0 ]; then - local empty=true + local empty="true" local uuid= for uuid in $transient; do if "$empty"; then eval_gettext "Not suspending transient guests on URI: \$uri: " - empty=false + empty="false" else printf ", " fi @@ -495,7 +495,7 @@ stop() { done echo # reload domain list to contain only persistent guests - list=$(list_guests "$uri" "--persistent") + list="$(list_guests "$uri" "--persistent")" if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -582,7 +582,7 @@ rh_status() { # usage [val] # Display usage string, then exit with VAL (defaults to 2). usage() { - local program_name=$0 + local program_name="$0" eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ "condrestart|try-restart|reload|force-reload|gueststatus|shutdown}"; echo exit ${1-2} @@ -612,7 +612,7 @@ case "$1" in rh_status ;; shutdown) - ON_SHUTDOWN=shutdown + ON_SHUTDOWN="shutdown" stop ;; *) -- 2.28.0

3 4

[PATCH] virnuma: Don't work around numa_node_to_cpus() for non-existent nodes
by Michal Privoznik 21 Aug '20

21 Aug '20

In a very distant past, we came around machines that has not continuous node IDs. This made us error out when constructing capabilities XML. We resolved it by utilizing strange behaviour of numa_node_to_cpus() in which it returned a mask with all bits set for a non-existent node. However, this is not the only case when it returns all ones mask - if the node exists and has enough CPUs to fill the mask up (e.g. 128 CPUs). The fix consists of using nodemask_isset(&numa_all_nodes, ..) prior to calling numa_node_to_cpus() to determine if the node exists. Fixes: 628c93574758abb59e71160042524d321a33543f Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1860231 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnuma.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index eeca438f25..75d5628cff 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -256,31 +256,23 @@ virNumaGetNodeCPUs(int node, int mask_n_bytes = max_n_cpus / 8; size_t i; g_autofree unsigned long *mask = NULL; - g_autofree unsigned long *allonesmask = NULL; g_autoptr(virBitmap) cpumap = NULL; *cpus = NULL; + if (!nodemask_isset(&numa_all_nodes, node)) { + VIR_DEBUG("NUMA topology for cell %d is not available, ignoring", node); + return -2; + } + if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof(*mask)) < 0) return -1; - if (VIR_ALLOC_N(allonesmask, mask_n_bytes / sizeof(*mask)) < 0) - return -1; - - memset(allonesmask, 0xff, mask_n_bytes); - - /* The first time this returns -1, ENOENT if node doesn't exist... */ if (numa_node_to_cpus(node, mask, mask_n_bytes) < 0) { VIR_WARN("NUMA topology for cell %d is not available, ignoring", node); return -2; } - /* second, third... times it returns an all-1's mask */ - if (memcmp(mask, allonesmask, mask_n_bytes) == 0) { - VIR_DEBUG("NUMA topology for cell %d is invalid, ignoring", node); - return -2; - } - if (!(cpumap = virBitmapNew(max_n_cpus))) return -1; -- 2.26.2

2 1

[PATCH v3 0/6] bhyve: implement sound device support
by Roman Bogorodskiy 21 Aug '20

21 Aug '20

Changes since v2: - Add 'ich7' sound device model, - Convert audio id from string to integer, - Use 'union' to store audio backend specific configuration, - Document changes in formatdomain, - Don't use hash for sound<->audio mapping lookups. Roman Bogorodskiy (6): conf: add 'ich7' sound model bhyve: implement sound device support conf: allow to map sound device to host device bhyve: allow to specify host sound device tests: schema: test bhyvexml2xmloutdata schemas docs: formatdomain: document <audio> element docs/formatdomain.rst | 49 +++++ docs/schemas/domaincommon.rng | 37 ++++ src/bhyve/bhyve_capabilities.c | 14 ++ src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 53 +++++ src/bhyve/bhyve_device.c | 9 + src/conf/domain_capabilities.c | 4 + src/conf/domain_conf.c | 190 +++++++++++++++++- src/conf/domain_conf.h | 33 +++ src/conf/virconftypes.h | 3 + src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 3 + src/qemu/qemu_driver.c | 5 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_validate.c | 2 + .../bhyvexml2argv-sound.args | 10 + .../bhyvexml2argv-sound.ldargs | 3 + .../bhyvexml2argvdata/bhyvexml2argv-sound.xml | 30 +++ tests/bhyvexml2argvtest.c | 6 +- .../bhyvexml2xmlout-sound.xml | 41 ++++ tests/bhyvexml2xmltest.c | 1 + tests/virschematest.c | 3 +- 24 files changed, 502 insertions(+), 4 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-sound.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-sound.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-sound.xml -- 2.27.0

2 15

Conflicting parameters on qemu call
by Jan Walzer 21 Aug '20

21 Aug '20

Hi Lists, I currently have the issue of wanting to use emu-system-x86_64 on a ppc64le platform. It is imperative to pass the "-accel tcg,thread=multi” parameter to qemu when starting an instance, as without that, it will only use one thread and hence of limited/no use. The problem is, that libvirt itself, passes “-machine q35,accel=tcg” to qemu, which is a different parameter, that conflicts with the other one. Can we discuss, if I either have overlooked something, or is there a workaround, or is this a bug? I’m running: # uname -a Linux tiger-v4 5.7.0-1-powerpc64le #1 SMP Debian 5.7.6-1 (2020-06-24) ppc64le GNU/Linux # apt-cache policy libvirt-daemon libvirt-daemon: Installed: 6.5.0-1 Candidate: 6.5.0-1 Version table: *** 6.5.0-1 500 500 http://deb.debian.org/debian testing/main ppc64el Packages # apt-cache policy qemu-system-x86 qemu-system-x86: Installed: 1:5.0-14 Candidate: 1:5.0-14 Version table: *** 1:5.0-14 500 500 http://deb.debian.org/debian testing/main ppc64el Packages Do you need any more information? Feel free to only continue on the list that matters. Greetings, Jan

2 8

[PATCH v2] examples: Use GLib event loop impl in events.stp
by Han Han 21 Aug '20

21 Aug '20

Update the events stap example because the event loop impl is replaced by GLib based event loop impl after commit 55fe8110. Signed-off-by: Han Han <hhan(a)redhat.com> --- examples/systemtap/events.stp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp index fd4fe4664d..016e2ca048 100644 --- a/examples/systemtap/events.stp +++ b/examples/systemtap/events.stp @@ -89,44 +89,34 @@ probe begin { print_ts("begin"); } -probe libvirt.event_poll.add_handle { +probe libvirt.event_glib.add_handle { print_ts(sprintf("%d + handle %d %d %d", pid(), watch, fd, events)); } -probe libvirt.event_poll.remove_handle { +probe libvirt.event_glib.remove_handle { print_ts(sprintf("%d - handle %d", pid(), watch)); } -probe libvirt.event_poll.update_handle { +probe libvirt.event_glib.update_handle { if (showUpdates) print_ts(sprintf("%d * handle %d %d", pid(), watch, events)); } -probe libvirt.event_poll.purge_handle { - print_ts(sprintf("%d ! handle %d", pid(), watch)); -} -probe libvirt.event_poll.dispatch_handle { +probe libvirt.event_glib.dispatch_handle { if (showDispatch) print_ts(sprintf("%d > handle %d %d", pid(), watch, events)); } -probe libvirt.event_poll.add_timeout { +probe libvirt.event_glib.add_timeout { print_ts(sprintf("%d + timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.remove_timeout { +probe libvirt.event_glib.remove_timeout { print_ts(sprintf("%d - timeout %d", pid(), timer)); } -probe libvirt.event_poll.update_timeout { +probe libvirt.event_glib.update_timeout { if (showUpdates) print_ts(sprintf("%d * timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.purge_timeout { - print_ts(sprintf("%d ! timeout %d", pid(), timer)); -} -probe libvirt.event_poll.dispatch_timeout { +probe libvirt.event_glib.dispatch_timeout { if (showDispatch) print_ts(sprintf("%d > timeout %d", pid(), timer)); } -probe libvirt.event_poll.run { - if (showIter) - print_ts(sprintf("%d ~ %d %d", pid(), nfds, timeout)); -} -- 2.27.0

2 2

[PATCH] kbase: Add knowledge base for libvirt systemtap
by Han Han 21 Aug '20

21 Aug '20

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/kbase.rst | 3 ++ docs/kbase/meson.build | 1 + docs/kbase/systemtap.rst | 113 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 docs/kbase/systemtap.rst diff --git a/docs/kbase.rst b/docs/kbase.rst index 78daaa5989..d8bff5d41e 100644 --- a/docs/kbase.rst +++ b/docs/kbase.rst @@ -36,6 +36,9 @@ Knowledge base Examination of the security protections used for QEMU and how they need configuring to allow use of QEMU passthrough with host files/devices. + `Systemtap <kbase/systemtap.html>`__ + Explanation of how to use systemtap for libvirt tracing. + `Virtio-FS <kbase/virtiofs.html>`__ Share a filesystem between the guest and the host diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index d7f254e163..ca032a4b9b 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -13,6 +13,7 @@ docs_kbase_files = [ 'rpm-deployment', 's390_protected_virt', 'secureusage', + 'systemtap', 'virtiofs', ] diff --git a/docs/kbase/systemtap.rst b/docs/kbase/systemtap.rst new file mode 100644 index 0000000000..34420efbb2 --- /dev/null +++ b/docs/kbase/systemtap.rst @@ -0,0 +1,113 @@ +======================= +Systemtap of Libvirt +======================= + +.. contents:: + +`Systemtap <https://sourceware.org/systemtap/>`__ is a scripting +language and tool for dynamically probing or tracing in Linux kernel +space or user space. This page is about the usage of systemtap +in libvirt tracing. + +Preparation +=================== + +Libvirt +------------------------- + +Libvirt should be configured with the systemtap option to support libvirt +probing events in systemtap. + +For libvirt before **6.7.0**, it can be configured by: + +:: + + mkdir build + cd build + ../configure --with-dtrace + +For libvirt **6.7.0** or later, configure it by the ``meson`` (seeing +`libvirt compiling <https://libvirt.org/compiling.html>`__): + +:: + + meson build -Ddtrace=enabled + +For the libvirt binaries installed by the package manager like ``dnf`` or +``apt``, if libvirt systemtap tapset ``/usr/share/systemtap/tapset/libvirt_*`` +exists, it means the libvirt enables the systemtap feature. + +Systemtap +------------------------ + +For most of linux distributions, execute ``stap-prep`` by root to prepare the +environment for systemtap after installing the systemtap. If your distribution +doesn't have ``stap-prep``, install the ``kernel debuginfo`` packages manually. + +After these above, run this test command to confirm the systemtap works well: + +:: + + stap -e 'probe oneshot{ printf("hello world\n")}' + + +Tracing events +======================= + +The libvirt systemtap tracing events are defined in tapset +``/usr/share/systemtap/tapset/libvirt_*``. Libvirt support these type of tracing +events: ``dbus``, ``event_glib``, ``object``, ``qemu``, ``rpc``. + +List all tracing events in libvirt: + +:: + + grep 'probe libvirt.[a-z_0-9.]*' /usr/share/systemtap/tapset/libvirt_* -o|cut -f 2 -d : + + +Tracing examples +================== + +Here is an example of the systemtap script to trace the QMP messages sent from libvirtd +daemon to the qemu process. +``qmp.stp``: + +:: + + probe begin + { + printf("Start tracing\n") + } + probe libvirt.qemu.monitor_send_msg + { + printf("QMPs: %s", msg); + } + +Then run the systemtap script attaching to the libvirtd process: + +:: + + stap qmp.stp -x `pidof libvirtd` + + +To trace a libvirtd started from command line, use the option ``-c`` + +:: + + stap qmp.stp -c "/usr/sbin/libvirtd" + + +Then after seeing the welcome message "Start tracing" from systemtap, then execute a virsh +command associated with QMP, for example ``virsh domstats``. Then get the QMP tracing logs +from systemtap. For example, the result from ``virsh domstats`` + +:: + + QMPs: {"execute":"query-balloon","id":"libvirt-393"} + QMPs: {"execute":"qom-get","arguments":{"path":"/machine/peripheral/balloon0","property":"guest-stats"},"id":"libvirt-394"} + QMPs: {"execute":"query-blockstats","id":"libvirt-395"} + QMPs: {"execute":"query-named-block-nodes","id":"libvirt-396"} + QMPs: {"execute":"query-iothreads","id":"libvirt-397"} + +For more examples of libvirt systemtap scripts, see the scripts in ``/usr/share/doc/libvirt-docs/examples/systemtap`` +For more details of systemtap language, see `document of systemtap <https://sourceware.org/systemtap/documentation.html>`__ -- 2.27.0

3 3

[PATCH 1/2] logging: Replace virMutex with GMutex
by Han Han 21 Aug '20

21 Aug '20

Signed-off-by: Han Han <hhan(a)redhat.com> --- src/logging/log_daemon.c | 26 ++++++-------------------- src/logging/log_daemon.h | 4 ++-- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 028f771f14..0649a70c9d 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -56,7 +56,7 @@ VIR_LOG_INIT("logging.log_daemon"); struct _virLogDaemon { - virMutex lock; + GMutex lock; virNetDaemonPtr dmn; virLogHandlerPtr handler; }; @@ -86,7 +86,7 @@ virLogDaemonFree(virLogDaemonPtr logd) return; virObjectUnref(logd->handler); - virMutexDestroy(&logd->lock); + g_mutex_clear(&logd->lock); virObjectUnref(logd->dmn); VIR_FREE(logd); @@ -119,12 +119,7 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) if (VIR_ALLOC(logd) < 0) return NULL; - if (virMutexInit(&logd->lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to initialize mutex")); - VIR_FREE(logd); - return NULL; - } + g_mutex_init(&logd->lock); if (!(logd->dmn = virNetDaemonNew())) goto error; @@ -222,12 +217,7 @@ virLogDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged, if (VIR_ALLOC(logd) < 0) return NULL; - if (virMutexInit(&logd->lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to initialize mutex")); - VIR_FREE(logd); - return NULL; - } + g_mutex_init(&logd->lock); if (!(child = virJSONValueObjectGet(object, "daemon"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -325,7 +315,7 @@ virLogDaemonClientFree(void *opaque) priv, (unsigned long long)priv->clientPid); - virMutexDestroy(&priv->lock); + g_mutex_clear(&priv->lock); VIR_FREE(priv); } @@ -343,11 +333,7 @@ virLogDaemonClientNew(virNetServerClientPtr client, if (VIR_ALLOC(priv) < 0) return NULL; - if (virMutexInit(&priv->lock) < 0) { - VIR_FREE(priv); - virReportSystemError(errno, "%s", _("unable to init mutex")); - return NULL; - } + g_mutex_init(&priv->lock); if (virNetServerClientGetUNIXIdentity(client, &clientuid, diff --git a/src/logging/log_daemon.h b/src/logging/log_daemon.h index fa661e1793..6979bdcd5a 100644 --- a/src/logging/log_daemon.h +++ b/src/logging/log_daemon.h @@ -20,7 +20,7 @@ #pragma once -#include "virthread.h" +#include <glib.h> #include "log_handler.h" typedef struct _virLogDaemon virLogDaemon; @@ -30,7 +30,7 @@ typedef struct _virLogDaemonClient virLogDaemonClient; typedef virLogDaemonClient *virLogDaemonClientPtr; struct _virLogDaemonClient { - virMutex lock; + GMutex lock; pid_t clientPid; }; -- 2.27.0

2 4

[PATCH] Xen: Improve parsing of PCI addresses in config converter
by Jim Fehlig 21 Aug '20

21 Aug '20

There was a report on libvirt-users [1] about the domxml to/from native converter in the Xen driver not handling PCI addresses without a domain specification. This patch improves parsing of PCI addresses in the converter and allows PCI addresses with only bb:ss.f. xl.cfg(5) also allows either the dddd:bb:ss.f or bb:ss.f format. A test has been added to check the conversion from xl.cfg to domXML. [1] https://www.redhat.com/archives/libvirt-users/2020-August/msg00040.html Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/xen_common.c | 81 +++++++++------------- tests/xmconfigdata/test-pci-dev-syntax.cfg | 26 +++++++ tests/xmconfigdata/test-pci-dev-syntax.xml | 71 +++++++++++++++++++ tests/xmconfigtest.c | 1 + 4 files changed, 129 insertions(+), 50 deletions(-) diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 75fe7e0644..73ce412fe7 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -372,63 +372,44 @@ static virDomainHostdevDefPtr xenParsePCI(char *entry) { virDomainHostdevDefPtr hostdev = NULL; - char domain[5]; - char bus[3]; - char slot[3]; - char func[2]; - char *key, *nextkey; - int domainID; - int busID; - int slotID; - int funcID; + VIR_AUTOSTRINGLIST tokens = NULL; + size_t ntokens = 0; + size_t nexttoken = 0; + char *slotstr; + char *funcstr; + int domain = 0x0; + int bus; + int slot; + int func; - domain[0] = bus[0] = slot[0] = func[0] = '\0'; - - /* pci=['0000:00:1b.0','0000:00:13.0'] */ - if (!(key = entry)) - return NULL; - if (!(nextkey = strchr(key, ':'))) - return NULL; - if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain %s too big for destination"), key); + /* pci=['00:1b.0','0000:00:13.0'] */ + if (!(tokens = virStringSplitCount(entry, ":", 3, &ntokens))) return NULL; - } - key = nextkey + 1; - if (!(nextkey = strchr(key, ':'))) - return NULL; - if (virStrncpy(bus, key, (nextkey - key), sizeof(bus)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Bus %s too big for destination"), key); - return NULL; + /* domain */ + if (ntokens == 3) { + if (virStrToLong_i(tokens[nexttoken], NULL, 16, &domain) < 0) + return NULL; + nexttoken++; } - key = nextkey + 1; - if (!(nextkey = strchr(key, '.'))) + /* bus */ + if (virStrToLong_i(tokens[nexttoken], NULL, 16, &bus) < 0) return NULL; - if (virStrncpy(slot, key, (nextkey - key), sizeof(slot)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Slot %s too big for destination"), key); - return NULL; - } + nexttoken++; - key = nextkey + 1; - if (strlen(key) != 1) - return NULL; - if (virStrncpy(func, key, 1, sizeof(func)) < 0) { + /* slot and function */ + slotstr = tokens[nexttoken]; + if (!(funcstr = strchr(slotstr, '.'))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Function %s too big for destination"), key); + _("Malformed PCI address %s"), slotstr); return NULL; } - - if (virStrToLong_i(domain, NULL, 16, &domainID) < 0) - return NULL; - if (virStrToLong_i(bus, NULL, 16, &busID) < 0) - return NULL; - if (virStrToLong_i(slot, NULL, 16, &slotID) < 0) + *funcstr = '\0'; + funcstr++; + if (virStrToLong_i(slotstr, NULL, 16, &slot) < 0) return NULL; - if (virStrToLong_i(func, NULL, 16, &funcID) < 0) + if (virStrToLong_i(funcstr, NULL, 16, &func) < 0) return NULL; if (!(hostdev = virDomainHostdevDefNew())) @@ -436,10 +417,10 @@ xenParsePCI(char *entry) hostdev->managed = false; hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; - hostdev->source.subsys.u.pci.addr.domain = domainID; - hostdev->source.subsys.u.pci.addr.bus = busID; - hostdev->source.subsys.u.pci.addr.slot = slotID; - hostdev->source.subsys.u.pci.addr.function = funcID; + hostdev->source.subsys.u.pci.addr.domain = domain; + hostdev->source.subsys.u.pci.addr.bus = bus; + hostdev->source.subsys.u.pci.addr.slot = slot; + hostdev->source.subsys.u.pci.addr.function = func; return hostdev; } diff --git a/tests/xmconfigdata/test-pci-dev-syntax.cfg b/tests/xmconfigdata/test-pci-dev-syntax.cfg new file mode 100644 index 0000000000..e0f00d9bd7 --- /dev/null +++ b/tests/xmconfigdata/test-pci-dev-syntax.cfg @@ -0,0 +1,26 @@ +name = "test" +uuid = "cc2315e7-d26a-307a-438c-6d188ec4c09c" +maxmem = 382 +memory = 350 +vcpus = 1 +pae = 1 +acpi = 1 +apic = 1 +viridian = 0 +rtc_timeoffset = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "destroy" +on_crash = "destroy" +device_model = "/usr/lib/xen/bin/qemu-system-i386" +sdl = 0 +vnc = 1 +vncunused = 1 +vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000" ] +pci = [ "0001:0c:1b.2", "01:13.0" ] +parallel = "none" +serial = "pty" +builder = "hvm" +kernel = "/usr/lib/xen/boot/hvmloader" +boot = "c" +disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ] diff --git a/tests/xmconfigdata/test-pci-dev-syntax.xml b/tests/xmconfigdata/test-pci-dev-syntax.xml new file mode 100644 index 0000000000..5d5d29c61c --- /dev/null +++ b/tests/xmconfigdata/test-pci-dev-syntax.xml @@ -0,0 +1,71 @@ +<domain type='xen'> + <name>test</name> + <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid> + <memory unit='KiB'>391168</memory> + <currentMemory unit='KiB'>358400</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='variable' adjustment='0' basis='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/sda8'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='phy' type='raw'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='xenbus' index='0'/> + <controller type='ide' index='0'/> + <interface type='bridge'> + <mac address='00:16:3e:0a:7b:39'/> + <source bridge='xenbr0'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'> + <listen type='address'/> + </graphics> + <video> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> + </video> + <hostdev mode='subsystem' type='pci' managed='no'> + <driver name='xen'/> + <source> + <address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='no'> + <driver name='xen'/> + <source> + <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/> + </source> + </hostdev> + <memballoon model='xen'/> + </devices> +</domain> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index e4a2b39384..43949fe3b5 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -216,6 +216,7 @@ mymain(void) DO_TEST("escape-paths"); DO_TEST("no-source-cdrom"); DO_TEST("pci-devs"); + DO_TEST_FORMAT("pci-dev-syntax"); DO_TEST("disk-drv-blktap-raw"); DO_TEST("disk-drv-blktap2-raw"); -- 2.28.0

3 2

qemu modularization of qemu-5.1 vs libvirt domcapabilities cache?
by Mark Mielke 21 Aug '20

21 Aug '20

Hi all: In testing qemu-5.1rc2 on my Fedora 32 home system, I found that the Fedora rawhide package has broken out both the QXL display device and the USB redirect device into separate RPM modules: qemu-device-display-qxl.x86_64 2:5.1.0-0.1.rc2.fc32 @@commandline qemu-device-usb-redirect.x86_64 2:5.1.0-0.1.rc2.fc32 @@commandline The upgrade from 5.0.0 to 5.1.0 does not treat these sub-packages as mandatory packages, therefore a straight upgrade of packages causes these domcapabilities to disappear. If the user tries to use libvirt after this, then existing domains using QXL display device or USB redirect device will fail to start. If the user then investigates and realizes that they now need to install the above packages separately, they find that qemu-kvm recognizes the modules right away, but libvirt does not. This looks to be due to the libvirt domcapabilities cache? The domcapabilities cache will be automatically updated only under certain conditions such as the qemu binary ctime changing - but that isn't triggering any action here? With the devices broken out into modules, such as the Fedora rawhide RPM .spec file is proposing, this allows the devices to be individually installed or uninstalled at any time, and causes libvirt domcapabilities cache to be out-of-date. I was able to sometimes see it work by downgrading to qemu-5.0, upgrading to qemu-5.1rc2, and installing the device packages prior to calling "virsh domcapabilities" (or otherwise using them). I was also able to do the same by removing the libvirt cache files and restarted libvirtd service. Both of these are pretty non-obvious actions for a user. I'm wondering how to codify this when I use it for real on a production system. The upgrade path here seems unreliable, especially given that libvirt domcapabilities cache may even persist across reboots? This means I need to be very careful about the procedure to upgrade, and also I need to make sure to never install or remove any of the device packages without checking the procedure. Ouch. :-( Thoughts? -- Mark Mielke <mark.mielke(a)gmail.com>

7 23

[PATCH] lxc: Add TPM passthrough option for LXC driver
by Julio Faracco 21 Aug '20

21 Aug '20

There is no support to use TPM for passthrough for LXC libvirt driver this commit adds the option to use host TPM inside containers. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/lxc/lxc_cgroup.c | 27 +++++++++++++++++++ src/lxc/lxc_controller.c | 56 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index d13f2adde5..955d2b4fc1 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -374,6 +374,33 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, return -1; } + for (i = 0; i < def->ntpms; i++) { + virDomainTPMDefPtr tpm = def->tpms[i]; + const char *dev = NULL; + + switch (tpm->type) { + case VIR_DOMAIN_TPM_TYPE_EMULATOR: + case VIR_DOMAIN_TPM_TYPE_LAST: + break; + case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + dev = "/dev/tpm0"; + break; + } + + if (!dev) + continue; + + if (!virFileExists(dev)) { + VIR_DEBUG("Ignoring non-existent device %s", dev); + continue; + } + + if (virCgroupAllowDevicePath(cgroup, dev, + VIR_CGROUP_DEVICE_READ, + false) < 0) + return -1; + } + VIR_DEBUG("Device ACL setup complete"); return 0; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ae6b737b60..70ca773bbf 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1644,6 +1644,59 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, } +static int +virLXCControllerSetupTPM(virLXCControllerPtr ctrl) +{ + virDomainDefPtr def = ctrl->def; + size_t i; + + for (i = 0; i < def->ntpms; i++) { + virDomainTPMDefPtr tpm = def->tpms[i]; + g_autofree char *path = NULL; + const char *tpm_dev = NULL; + struct stat sb; + dev_t dev; + + switch (tpm->type) { + case VIR_DOMAIN_TPM_TYPE_EMULATOR: + case VIR_DOMAIN_TPM_TYPE_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported timer type (name) '%s'"), + virDomainTPMBackendTypeToString(tpm->type)); + return -1; + case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: + tpm_dev = "/dev/tpm0"; + path = g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, + def->name, "/rtc"); + break; + } + + if (!tpm_dev) + continue; + + if (stat(tpm_dev, &sb) < 0) { + virReportSystemError(errno, _("Unable to access %s"), + tpm_dev); + return -1; + } + + dev = makedev(major(sb.st_rdev), minor(sb.st_rdev)); + if (mknod(path, S_IFCHR, dev) < 0 || + chmod(path, sb.st_mode)) { + virReportSystemError(errno, + _("Failed to make device %s"), + path); + return -1; + } + + if (lxcContainerChown(def, path) < 0) + return -1; + } + + return 0; +} + + static int virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, virDomainHostdevDefPtr def, @@ -2358,6 +2411,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupAllHostdevs(ctrl) < 0) goto cleanup; + if (virLXCControllerSetupTPM(ctrl) < 0) + goto cleanup; + if (virLXCControllerSetupFuse(ctrl) < 0) goto cleanup; -- 2.25.1

2 1

[PATCH 0/2] Fix a few deadlocks with musl libc
by Natanael Copa 19 Aug '20

19 Aug '20

Fix a couple of deadlocks due to use of async-unsafe calls (malloc/free) after fork() and before exec(). They don't fix all theoretical problems but at least they make libvirt usable again with musl 1.2 on Alpine Linux. Natanael Copa (2): util: avoid free() when reset log after fork util: command: improve generic mass close of fds src/util/vircommand.c | 80 ++++++++++++++++++++++++++++++++----------- src/util/virlog.c | 44 ++++++++++++++++++------ src/util/virlog.h | 1 + 3 files changed, 95 insertions(+), 30 deletions(-) -- 2.28.0

2 5

[PATCH] virdevmapper: Ignore all errors when opening /dev/mapper/control
by Michal Privoznik 19 Aug '20

19 Aug '20

So far, only ENOENT is ignored (to deal with kernels without devmapper). However, as reported on the list, under certain scenarios a different error can occur. For instance, when libvirt is running inside a container which doesn't have permissions to talk to the devmapper. If this is the case, then open() returns -1 and sets errno=EPERM. Assuming that multipath devices are fairly narrow use case and using them in a restricted container is even more narrow the best fix seems to be to ignore all open errors BUT produce a warning on failure. To avoid flooding logs with warnings on kernels without devmapper the level is reduced to a plain debug message. Reported-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virdevmapper.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 3cc399f382..7c89c2a952 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -35,9 +35,12 @@ # include "viralloc.h" # include "virstring.h" # include "virfile.h" +# include "virlog.h" # define VIR_FROM_THIS VIR_FROM_STORAGE +VIR_LOG_INIT("util.virdevmapper"); + # define PROC_DEVICES "/proc/devices" # define DM_NAME "device-mapper" # define DEV_DM_DIR "/dev/" DM_DIR @@ -130,11 +133,15 @@ virDMOpen(void) memset(&dm, 0, sizeof(dm)); if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) { - if (errno == ENOENT) - return -2; - - virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH); - return -1; + /* We can't talk to devmapper. Produce a warning and let + * the caller decide what to do next. */ + if (errno == ENOENT) { + VIR_DEBUG("device mapper not available"); + } else { + VIR_WARN("unable to open %s: %s", + CONTROL_PATH, g_strerror(errno)); + } + return -2; } if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) { @@ -309,9 +316,9 @@ virDevMapperGetTargets(const char *path, if ((controlFD = virDMOpen()) < 0) { if (controlFD == -2) { - /* The CONTROL_PATH doesn't exist. Probably the - * module isn't loaded, yet. Don't error out, just - * exit. */ + /* The CONTROL_PATH doesn't exist or is unusable. + * Probably the module isn't loaded, yet. Don't error + * out, just exit. */ return 0; } -- 2.26.2

2 1

[libvirt PATCH 0/2] meson: AppArmor fixes
by Andrea Bolognani 19 Aug '20

19 Aug '20

Found while updating the Debian package for libvirt to a snapshot taken from master. Possibly more to come. Andrea Bolognani (2): meson: Set WITH_APPARMOR_PROFILES meson: Don't hardcode /etc in APPARMOR_DIR meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.26.2

2 3

[PATCH v2 0/2] Deal with kernels without DM support
by Michal Privoznik 19 Aug '20

19 Aug '20

v2 of: https://www.redhat.com/archives/libvir-list/2020-August/msg00489.html diff to v1: - After discussion to v1 I've decided to not cache DM major number and thus the patches looks a bit different. Michal Prívozník (2): virdevmapper: Don't cache device-mapper major virdevmapper: Handle kernel without device-mapper support src/util/virdevmapper.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) -- 2.26.2

3 8

[libvirt PATCH 0/2] meson: Introduce rpath option
by Andrea Bolognani 19 Aug '20

19 Aug '20

See 1/2 for details. Andrea Bolognani (2): meson: Introduce rpath option spec: Disable RPATH libvirt.spec.in | 1 + meson.build | 7 + meson_options.txt | 1 + src/meson.build | 485 +++++++++++++++++++++++++++++++--------------- tools/meson.build | 332 ++++++++++++++++++++----------- 5 files changed, 567 insertions(+), 259 deletions(-) -- 2.26.2

2 4

libvirt 6.6.0 tarball breaks on Homebrew/MacOS
by Scott Shambarger 19 Aug '20

19 Aug '20

The latest release at https://libvirt.org/sources/libvirt-6.6.0.tar.xz includes a configure script that breaks Homebrew (and other builds on MacOS/Darwin). The breaking change is related to a new version of the file m4/libtool.m4; line 2648 was changed to: shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' However, src/driver.c loads modules with ".so" extensions, at line 56: if (!(modfile = virFileFindResourceFull(name, "libvirt_driver_", ".so", The released tarball for 6.5.0 had the same shrext_cmds as upstream libtool: shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' Not sure where to submit the issue (as the m4 files aren't in libvirt source control)... it appears to only affect the distribution tarball. Perhaps the tarball could be re-released with autoconf from the official upstream libtool? (2.4.6) Thanks, Scott PS. MacPorts is unaffected as it runs autogen.sh... but that shouldn't be necessary with a distribution tarball :)

3 2

[libvirt PATCH 0/2] meson: Small style fixes
by Andrea Bolognani 19 Aug '20

19 Aug '20

All pushed as trivial. Andrea Bolognani (2): meson: Fix indentation meson: Don't use spaces after parentheses meson.build | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) -- 2.26.2

1 2

[libvirt PATCH] meson: Fix typo supprt -> support
by Andrea Bolognani 19 Aug '20

19 Aug '20

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index 1d19094e2e..c538d323c1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -36,7 +36,7 @@ option('pciaccess', type: 'feature', value: 'auto', description: 'pciaccess supp option('polkit', type: 'feature', value: 'auto', description: 'use PolicyKit for UNIX socket access checks') option('readline', type: 'feature', value: 'auto', description: 'readline support') option('sanlock', type: 'feature', value: 'auto', description: 'sanlock support') -option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') +option('sasl', type: 'feature', value: 'auto', description: 'sasl support') option('selinux', type: 'feature', value: 'auto', description: 'selinux support') option('selinux_mount', type: 'string', value: '', description: 'set SELinux mount point') option('udev', type: 'feature', value: 'auto', description: 'udev support') -- 2.26.2

1 0

[libvirt PATCH] meson: Fix typo backand -> backend
by Andrea Bolognani 19 Aug '20

19 Aug '20

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index 1313effd09..1d19094e2e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -74,7 +74,7 @@ option('secdriver_selinux', type: 'feature', value: 'auto', description: 'use SE # storage driver options -option('storage_dir', type: 'feature', value: 'auto', description: 'directory backand for the storage driver') +option('storage_dir', type: 'feature', value: 'auto', description: 'directory backend for the storage driver') option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk backend for the storage driver') option('storage_fs', type: 'feature', value: 'auto', description: 'FileSystem backend for the storage driver') option('storage_gluster', type: 'feature', value: 'auto', description: 'Gluster backend for the storage driver') -- 2.26.2

1 0

[PATCH] numa_conf: Properly check for caches in virDomainNumaDefValidate()
by Michal Privoznik 19 Aug '20

19 Aug '20

When adding support for HMAT, in f0611fe8830 I've introduced a check which aims to validate /domain/cpu/numa/interconnects. As a part of that, there is a loop which checks whether all <latency/> with @cache attribute refer to an existing cache level. For instance: <cpu mode='host-model' check='partial'> <numa> <cell id='0' cpus='0-5' memory='512000' unit='KiB' discard='yes'> <cache level='1' associativity='direct' policy='writeback'> <size value='8' unit='KiB'/> <line value='5' unit='B'/> </cache> </cell> <interconnects> <latency initiator='0' target='0' cache='1' type='access' value='5'/> <bandwidth initiator='0' target='0' type='access' value='204800' unit='KiB'/> </interconnects> </numa> </cpu> This XML defines that accessing L1 cache of node #0 from node #0 has latency of 5ns. However, the loop was not written properly. Well, the check in it, as it was always checking for the first cache in the target node and not the rest. Therefore, the following example errors out: <cpu mode='host-model' check='partial'> <numa> <cell id='0' cpus='0-5' memory='512000' unit='KiB' discard='yes'> <cache level='3' associativity='direct' policy='writeback'> <size value='10' unit='KiB'/> <line value='8' unit='B'/> </cache> <cache level='1' associativity='direct' policy='writeback'> <size value='8' unit='KiB'/> <line value='5' unit='B'/> </cache> </cell> <interconnects> <latency initiator='0' target='0' cache='1' type='access' value='5'/> <bandwidth initiator='0' target='0' type='access' value='204800' unit='KiB'/> </interconnects> </numa> </cpu> This errors out even though it is a valid configuration. The L1 cache under node #0 is still present. Fixes: f0611fe8830 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Is this trivial enough to be pushed as such? ;-) src/conf/numa_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 50d57ba8f6..9305e125b7 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -1421,7 +1421,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) if (l->cache > 0) { for (j = 0; j < def->mem_nodes[l->target].ncaches; j++) { - const virDomainNumaCache *cache = def->mem_nodes[l->target].caches; + const virDomainNumaCache *cache = &def->mem_nodes[l->target].caches[j]; if (l->cache == cache->level) break; -- 2.26.2

2 1

[libvirt PATCH 0/2] meson augeas test fixes
by Pavel Hrdina 18 Aug '20

18 Aug '20

Pavel Hrdina (2): src/meson: introduce srcdir and builddir into augeas_test_data dictionary meson/src: add missing augeas tests src/bhyve/meson.build | 3 +++ src/libxl/meson.build | 3 +++ src/locking/meson.build | 9 +++++++ src/logging/meson.build | 3 +++ src/lxc/meson.build | 3 +++ src/meson.build | 52 +++++++++++++++++++++++++++-------------- src/qemu/meson.build | 3 +++ 7 files changed, 58 insertions(+), 18 deletions(-) -- 2.26.2

2 4

[libvirt PATCH 00/16] Add support for persistent mediated devices
by Jonathon Jongsma 18 Aug '20

18 Aug '20

This patch series follows the previously-merged series which added support for transient mediated devices. This series expands mdev support to include persistent device definitions. Again, it relies on mdevctl as the backend. It follows the common libvirt pattern of APIs by adding the following new APIs for node devices: - virNodeDeviceDefineXML() - defines a persistent device - virNodeDeviceUndefine() - undefines a persistent device - virNodeDeviceCreate() - starts a previously-defined device It also adds virsh commands mapping to these new APIs: nodedev-define, nodedev-undefine, and nodedev-start. The method of staying up-to-date with devices defined by mdevctl is currently a little bit crude due to the fact that mdevctl does not emit any events when new devices are added or removed. As a workaround, we create a file monitor for the mdevctl config directory and re-query mdevctl when we detect changes within that directory. In the future, mdevctl may introduce a more elegant solution. Jonathon Jongsma (16): tests: remove extra trailing semicolon nodedev: introduce concept of 'active' node devices nodedev: Add ability to filter by active state virsh: Add --active, --inactive, --all to nodedev-list nodedev: add ability to list and parse defined mdevs nodedev: add STOPPED/STARTED lifecycle events nodedev: add mdevctl devices to node device list nodedev: handle mdevs that disappear from mdevctl nodedev: add an mdevctl thread api: add virNodeDeviceDefineXML() virsh: add nodedev-define command api: add virNodeDeviceUndefine() virsh: Factor out function to find node device virsh: add nodedev-undefine command api: add virNodeDeviceCreate() virsh: add "nodedev-start" command examples/c/misc/event-test.c | 4 + include/libvirt/libvirt-nodedev.h | 19 +- src/conf/node_device_conf.h | 9 + src/conf/virnodedeviceobj.c | 24 + src/conf/virnodedeviceobj.h | 7 + src/driver-nodedev.h | 14 + src/libvirt-nodedev.c | 115 ++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/node_device/node_device_driver.c | 522 +++++++++++++++++- src/node_device/node_device_driver.h | 38 ++ src/node_device/node_device_udev.c | 275 ++++++++- src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 40 +- src/remote_protocol-structs | 16 + src/rpc/gendispatch.pl | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.argv | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.json | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.argv | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.json | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.argv | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.json | 1 + tests/nodedevmdevctldata/mdevctl-create.argv | 1 + .../mdevctl-list-defined.argv | 1 + .../mdevctl-list-multiple-parents.json | 59 ++ .../mdevctl-list-multiple-parents.out.xml | 39 ++ .../mdevctl-list-multiple.json | 59 ++ .../mdevctl-list-multiple.out.xml | 39 ++ .../mdevctl-list-single-noattr.json | 11 + .../mdevctl-list-single-noattr.out.xml | 8 + .../mdevctl-list-single.json | 31 ++ .../mdevctl-list-single.out.xml | 14 + .../nodedevmdevctldata/mdevctl-undefine.argv | 1 + tests/nodedevmdevctltest.c | 226 +++++++- tools/virsh-nodedev.c | 281 ++++++++-- 35 files changed, 1783 insertions(+), 88 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-define.json create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-define.json create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-define.json create mode 100644 tests/nodedevmdevctldata/mdevctl-create.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-defined.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple-parents.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple-parents.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single-noattr.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single-noattr.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-undefine.argv -- 2.21.3

3 20

[PATCH] doCoreDump: fix return value not expect as result
by Hao Wang 18 Aug '20

18 Aug '20

From: Hao Wang <wanghao232(a)huawei.com> Subject: [PATCH] doCoreDump: fix return value not expect as result In a case that qemuDumpToFd() return zero while VIR_CLOSE(fd) fails, codes will go to "cleanup" with "ret=0", resulting in unexpected return value. Fix that. Signed-off-by: Hao Wang <wanghao232(a)huawei.com> --- src/qemu/qemu_driver.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f98243fe4..8dfb9a38bf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3796,6 +3796,7 @@ doCoreDump(virQEMUDriverPtr driver, { int fd = -1; int ret = -1; + int rc = -1; virFileWrapperFdPtr wrapperFd = NULL; int directFlag = 0; unsigned int flags = VIR_FILE_WRAPPER_NON_BLOCKING; @@ -3843,8 +3844,8 @@ doCoreDump(virQEMUDriverPtr driver, if (STREQ(memory_dump_format, "elf")) memory_dump_format = NULL; - ret = qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, - memory_dump_format); + rc = qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, + memory_dump_format); } else { if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", @@ -3856,11 +3857,11 @@ doCoreDump(virQEMUDriverPtr driver, if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; - ret = qemuMigrationSrcToFile(driver, vm, fd, compressor, - QEMU_ASYNC_JOB_DUMP); + rc = qemuMigrationSrcToFile(driver, vm, fd, compressor, + QEMU_ASYNC_JOB_DUMP); } - if (ret < 0) + if (rc < 0) goto cleanup; if (VIR_CLOSE(fd) < 0) { -- 2.23.0

2 1