- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Fix access controls for virtlockd/virtlogd sockets
by Daniel P. Berrangé 21 May '19

21 May '19

This series fixes CVE-2019-10132 It is pushed to master as it was reviewed on the security list ahead of time. Daniel P. Berrangé (3): admin: reject clients unless their UID matches the current UID locking: restrict sockets to mode 0600 logging: restrict sockets to mode 0600 src/admin/admin_server_dispatch.c | 22 ++++++++++++++++++++++ src/locking/virtlockd-admin.socket.in | 1 + src/locking/virtlockd.socket.in | 1 + src/logging/virtlogd-admin.socket.in | 1 + src/logging/virtlogd.socket.in | 1 + 5 files changed, 26 insertions(+) -- 2.21.0

1 3

[libvirt] [PATCH v2 for 5.3.0] storage_backend_rbd: Ignore rbd_diff_iterate error() if needed
by Michal Privoznik 21 May '19

21 May '19

When cloning an RBD volume we try to find a snapshot which is not different to the image we're trying to clone. This boils down to calling rbd_diff_iterate() or rbd_diff_iterate2() on systems with newer ceph. These two are passed a callback - virStorageBackendRBDIterateCb() which sets @diff to 1 and returns -1. The idea is to stop iterating as soon as possible (i.e. we're iterating over a snapshot with some deltas). Unfortunately, returning a negative value from the callback means that iterate() function fails and thus we report an error: virsh # vol-clone --pool rbd_image_root coreos_2023 coreos00.disk error: Failed to clone vol from coreos_2023 error: failed to iterate RBD snapshot coreos_2023@base: Operation not permitted Therefore, report an error if and only if it doesn't originates in the callback. Reported on libvirt-users list: https://www.redhat.com/archives/libvirt-users/2019-April/msg00060.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Ignore error as suggested by Jason as it allows us to exit iteration early. src/storage/storage_backend_rbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index f8c968e682..69f4fa2117 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -1101,7 +1101,9 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image, virStorageBackendRBDIterateCb, (void *)&diff); #endif - if (r < 0) { + /* We care for errors only if the callback wasn't called at all. If it + * was, rbd_diff_iterate() returns an error which we have to ignore. */ + if (r < 0 && diff == 0) { virReportSystemError(-r, _("failed to iterate RBD snapshot %s@%s"), imgname, snaps[i].name); goto cleanup; -- 2.21.0

2 1

[libvirt] [PATCH 0/4] qemu: Don't use API flags in monitor code (blockdev-add saga)
by Peter Krempa 21 May '19

21 May '19

Peter Krempa (4): qemu: migration: Don't pass around flags for different API qemu: monitor: Don't pass full flags to qemuMonitorJSONBlockdevMirror qemu: monitor: Don't pass full flags to qemuMonitorJSONDriveMirror qemu: monitor: Use VIR_AUTOPTR in qemuMonitorJSON(Drive/Blockdev)Mirror src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_migration.c | 21 ++++------ src/qemu/qemu_monitor.c | 17 ++++---- src/qemu/qemu_monitor.h | 5 ++- src/qemu/qemu_monitor_json.c | 79 ++++++++++++++---------------------- src/qemu/qemu_monitor_json.h | 5 ++- tests/qemumonitorjsontest.c | 6 +-- 7 files changed, 60 insertions(+), 77 deletions(-) -- 2.21.0

2 8

[libvirt] [PATCH 00/12] qemu: cleanups and improvements of blockjob handling (blockdev-add saga)
by Peter Krempa 21 May '19

21 May '19

Peter Krempa (12): qemu: blockjob: Remove 'started' from struct _qemuBlockJobData qemu: blockjob: Fix documentation for 'newstate' of _qemuBlockJobData qemu: driver: Don't try to update blockjob status in qemuDomainGetBlockJobInfo qemu: driver: Set mirror state after successful command qemu: Modernize memory cleaning in qemuDomainBlockCopyCommon qemu: Modernize memory cleaning in qemuDomainBlockPullCommon qemu: Modernize memory cleaning in qemuDomainBlockCommit qemu: Remove unecessary error keeping in qemuDomainBlockCopyCommon qemu: Remove unnecessary calls to qemuDomainStorageSourceAccessRevoke qemu: Validate backing store of 'mirror' for block copy qemu: Simplify allowing access to storage file for block copy qemu: blockcopy: sanitize permission handling for 'mirror' src/qemu/qemu_blockjob.h | 3 +- src/qemu/qemu_driver.c | 185 ++++++++++++++++++++------------------- 2 files changed, 97 insertions(+), 91 deletions(-) -- 2.21.0

2 24

[libvirt] [PATCH] i18n: simplify mini po generation
by Marty E. Plummer 21 May '19

21 May '19

If you pass --for-msgfmt to msgmerge it will automatically do most of what you had the perl script doing. Signed-off-by: Marty E. Plummer <hanetzer(a)startmail.com> --- The only downside I can see is the loss of the comment headers with the copyright year and such. A global note in the README.md or so may be an acceptable change. Makefile.am | 1 - build-aux/minimize-po.pl | 37 ------------------------------------- po/Makefile.am | 8 +++----- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100755 build-aux/minimize-po.pl diff --git a/Makefile.am b/Makefile.am index dedd8d2ff8..ca7e012512 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,6 @@ EXTRA_DIST = \ build-aux/check-spacing.pl \ build-aux/gitlog-to-changelog \ build-aux/header-ifdef.pl \ - build-aux/minimize-po.pl \ build-aux/mock-noinline.pl \ build-aux/prohibit-duplicate-header.pl \ build-aux/useless-if-before-free \ diff --git a/build-aux/minimize-po.pl b/build-aux/minimize-po.pl deleted file mode 100755 index 497533a836..0000000000 --- a/build-aux/minimize-po.pl +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/perl - -my @block; -my $msgstr = 0; -my $empty = 0; -my $unused = 0; -my $fuzzy = 0; -while (<>) { - if (/^$/) { - if (!$empty && !$unused && !$fuzzy) { - print @block; - } - @block = (); - $msgstr = 0; - $fuzzy = 0; - push @block, $_; - } else { - if (/^msgstr/) { - $msgstr = 1; - $empty = 1; - } - if (/^#.*fuzzy/) { - $fuzzy = 1; - } - if (/^#~ msgstr/) { - $unused = 1; - } - if ($msgstr && /".+"/) { - $empty = 0; - } - push @block, $_; - } -} - -if (@block && !$empty && !$unused) { - print @block; -} diff --git a/po/Makefile.am b/po/Makefile.am index da117edbd5..9ac0bf3357 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -55,11 +55,9 @@ update-gmo: $(GMOFILES) update-mini-po: $(POTFILE) for lang in $(LANGS); do \ echo "Minimizing $$lang content" && \ - $(MSGMERGE) --no-location --no-fuzzy-matching --sort-output \ - $$lang.po $(POTFILE) | \ - $(SED) $(SED_PO_FIXUP_ARGS) | \ - $(PERL) $(top_srcdir)/build-aux/minimize-po.pl > \ - $(srcdir)/$$lang.mini.po ; \ + $(MSGMERGE) --for-msgfmt --sort-output \ + $$lang.po $(POTFILE) \ + -o $(srcdir)/$$lang.mini.po ; \ done push-pot: $(POTFILE) -- 2.21.0

2 3

[libvirt] [PATCH] virt-xml-validate: Allow input to be read from stdin
by Johannes Holmberg 20 May '19

20 May '19

--- Hello, This is an updated version of a patch I submitted on 2015-06-10. I got some feedback on it but then moved on to a different project and forgot about it. Anyway, I've updated the patch according to the feedback so if you are still interested, here it is! :) /Johannes tools/virt-xml-validate.in | 44 ++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 64aeaaaa33..2d2afb74ec 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -16,6 +16,16 @@ set -e +TMPFILE= + +cleanup() { + if [ $TMPFILE ]; then + rm -f $TMPFILE + fi +} + +trap cleanup EXIT + case $1 in -h | --h | --he | --hel | --help) cat <<EOF @@ -34,7 +44,7 @@ $0 (libvirt) @VERSION@ EOF exit ;; --) shift ;; - -*) + -?*) echo "$0: unrecognized option '$1'" >&2 exit 1 ;; esac @@ -42,18 +52,27 @@ esac XMLFILE="$1" TYPE="$2" -if [ -z "$XMLFILE" ]; then - echo "syntax: $0 XMLFILE [TYPE]" >&2 - exit 1 -fi +if [ "$XMLFILE" = "-" ]; then + TMPFILE=`mktemp --tmpdir virt-xml.XXXX` + cat > $TMPFILE +else + if [ -z "$XMLFILE" ]; then + echo "syntax: $0 XMLFILE [TYPE]" >&2 + exit 1 + fi -if [ ! -f "$XMLFILE" ]; then - echo "$0: document $XMLFILE does not exist" >&2 - exit 2 + if [ ! -f "$XMLFILE" ]; then + echo "$0: document $XMLFILE does not exist" >&2 + exit 2 + fi fi if [ -z "$TYPE" ]; then - ROOT=`xmllint --stream --debug "$XMLFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + if [ $TMPFILE ]; then + ROOT=`xmllint --stream --debug - < "$TMPFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + else + ROOT=`xmllint --stream --debug "$XMLFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + fi case "$ROOT" in *domainsnapshot*) # Must come first, since *domain* is a substring TYPE="domainsnapshot" @@ -101,6 +120,9 @@ if [ ! -f "$SCHEMA" ]; then exit 4 fi -xmllint --noout --relaxng "$SCHEMA" "$XMLFILE" - +if [ $TMPFILE ]; then + xmllint --noout --relaxng "$SCHEMA" - < "$TMPFILE" +else + xmllint --noout --relaxng "$SCHEMA" "$XMLFILE" +fi exit -- 2.17.1

3 5

[libvirt] [PATCH 0/6] networkStartNetworkVirtual: Cleanup error labels
by Michal Privoznik 20 May '19

20 May '19

*** BLURB HERE *** Michal Prívozník (6): networkStartNetworkVirtual: s/err5/error networkStartNetworkVirtual: Dissolve 'err4' label in 'error' networkStartNetworkVirtual: Dissolve 'err3' label in 'error' networkStartNetworkVirtual: Dissolve 'err2' label in 'error' networkStartNetworkVirtual: Dissolve 'err1' label in 'error' networkStartNetworkVirtual: Dissolve 'err0' label in 'error' src/network/bridge_driver.c | 73 +++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 40 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH] Revert "qemu: Do not override config XML in case of snapshot revert"
by Michal Privoznik 20 May '19

20 May '19

This reverts commit dfd70ca1ebc623fcda788c414a472107b37b2bb8. Pushed by a mistake, sorry. There's still some discussion going on upstream. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- /me needs to learn to clean branches before pushing some stuff. Sorry for the noise. Pushed now. src/qemu/qemu_driver.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 06d8cb2471..9c0796b0a4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16243,7 +16243,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuDomainObjPrivatePtr priv; int rc; virDomainDefPtr config = NULL; - virDomainDefPtr inactiveConfig = NULL; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; bool was_stopped = false; @@ -16458,7 +16457,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto endjob; } if (config) { - virDomainObjAssignDef(vm, config, false, &inactiveConfig); + virDomainObjAssignDef(vm, config, false, NULL); virCPUDefFree(priv->origCPU); VIR_STEAL_PTR(priv->origCPU, origCPU); } @@ -16467,7 +16466,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, load: was_stopped = true; if (config) - virDomainObjAssignDef(vm, config, false, &inactiveConfig); + virDomainObjAssignDef(vm, config, false, NULL); /* No cookie means libvirt which saved the domain was too old to * mess up the CPU definitions. @@ -16526,9 +16525,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, detail); } } - if (inactiveConfig) - VIR_STEAL_PTR(vm->newDef, inactiveConfig); - break; case VIR_DOMAIN_SNAPSHOT_SHUTDOWN: @@ -16556,11 +16552,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuProcessEndJob(driver, vm); goto cleanup; } - if (config) { - virDomainObjAssignDef(vm, config, false, &inactiveConfig); - if (inactiveConfig) - VIR_STEAL_PTR(vm->newDef, inactiveConfig); - } + if (config) + virDomainObjAssignDef(vm, config, false, NULL); if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { -- 2.21.0

2 1

[libvirt] [glib PATCH 00/16] Update libvirt-glib python examples
by Fabiano Fidêncio 20 May '19

20 May '19

This series contains a bunch of trivial fixes for our python examples, including: - Not using ";" at the end of the lines; - Ensuring that the right version of the libraries are imported; - Change the scripts so they're python3 compatible - Update the sha-bang lines to use python3 Fabiano Fidêncio (16): config-demo: Don't use ";" in the end of lines config-demo: Ensure the right LibvirtGConfig version gets loaded config-demo: Use print() in a py3 compatible way config-demo: Use octal when setting mode config-demo: Change she-bang line to use python3 conn-test: Don't use ";" in the end of lines conn-test: Ensure the right versions of LibvirtGObject and Gtk get loaded conn-test: Use print() in a py3 compatible way conn-test: Handle exceptions in a py3 compatible way conn-test: Change sha-bang line to use python3 event-test: LibvirtGLib.init() takes (at maximum) 1 argment event-test: Don't use ";" in the end of lines event-test: Ensure the right versions of LibvirtGLib and Gtk get loaded event-test: Use print() in a py3 compatible way event-test: Handle exceptions in a py3 compatible way event-test: Change sha-bang line to use python3 examples/config-demo.py | 15 +++++++++------ examples/conn-test.py | 20 ++++++++++++-------- examples/event-test.py | 28 ++++++++++++++++------------ 3 files changed, 37 insertions(+), 26 deletions(-) -- 2.21.0

3 28

[libvirt] [PATCH v1] qemu: migration: Convert to virErrorRestore/virErrorPreserveLast
by Syed Humaid 20 May '19

20 May '19

Replaced usages of virSaveLastError and virSetError/virFreeError with virErrorPreserveLast and virErrorRestore respectively. Signed-off-by: Syed Humaid <syedhumaidbinharoon(a)gmail.com> --- src/qemu/qemu_migration.c | 75 +++++++++++++-------------------------- 1 file changed, 24 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e3ad4e52a7..b1fe79aed9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -722,7 +722,7 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, if (rv != 0) { if (rv < 0) { if (!err) - err = virSaveLastError(); + virErrorPreserveLast(&err); failed = true; } qemuBlockJobSyncEnd(vm, job, asyncJob); @@ -747,7 +747,7 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, } if (failed && !err) - err = virSaveLastError(); + virErrorPreserveLast(&err); if (virDomainObjWait(vm) < 0) goto cleanup; @@ -769,10 +769,7 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, ret = failed ? -1 : 0; cleanup: - if (err) { - virSetError(err); - virFreeError(err); - } + virErrorRestore(&err); return ret; } @@ -3189,16 +3186,13 @@ static void qemuMigrationSrcIOFunc(void *arg) return; abrt: - err = virSaveLastError(); + virErrorPreserveLast(&err); if (err && err->code == VIR_ERR_OK) { virFreeError(err); err = NULL; } virStreamAbort(data->st); - if (err) { - virSetError(err); - virFreeError(err); - } + virErrorRestore(&err); error: /* Let the source qemu know that the transfer cant continue anymore. @@ -3685,15 +3679,12 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, if (events) priv->signalIOError = false; - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); return ret; error: - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); if (virDomainObjIsActive(vm)) { if (cancel && @@ -3948,7 +3939,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); cancelled = true; - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); goto finish; } @@ -3971,7 +3962,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver, /* Perform failed. Make sure Finish doesn't overwrite the error */ if (ret < 0) - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); /* If Perform returns < 0, then we need to cancel the VM * startup on the destination @@ -4004,10 +3995,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver, virObjectUnref(st); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); VIR_FREE(uri_out); VIR_FREE(cookie); @@ -4181,13 +4169,13 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, if (useParams && virTypedParamsReplaceString(&params, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); goto finish; } } else if (!uri && !(flags & VIR_MIGRATE_TUNNELLED)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare3 did not set uri")); - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); goto finish; } @@ -4220,7 +4208,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, /* Perform failed. Make sure Finish doesn't overwrite the error */ if (ret < 0) { - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); } else { qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE); @@ -4312,7 +4300,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, * one we need to preserve it in case confirm3 overwrites */ if (!orig_err) - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); /* * If cancelled, then src VM will be restarted, else @@ -4344,10 +4332,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, virObjectUnref(st); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); VIR_FREE(uri_out); VIR_FREE(cookiein); VIR_FREE(cookieout); @@ -4523,15 +4508,12 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver, } cleanup: - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); qemuDomainObjEnterRemote(vm); virConnectUnregisterCloseCallback(dconn, qemuMigrationSrcConnectionClosed); virObjectUnref(dconn); ignore_value(qemuDomainObjExitRemote(vm, false)); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); virObjectUnref(cfg); return ret; } @@ -4619,7 +4601,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, endjob: if (ret < 0) - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); /* v2 proto has no confirm phase so we need to reset migration parameters * here @@ -4639,10 +4621,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); } - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -5052,7 +5031,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, /* Need to save the current error, in case shutting * down the process overwrites it */ - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); /* * In v3 protocol, the source VM is still available to @@ -5181,10 +5160,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, VIR_FREE(priv->origname); virDomainObjEndAPI(&vm); qemuMigrationCookieFree(mig); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); virObjectUnref(cfg); /* Set a special error if Finish is expected to return NULL as a result of @@ -5289,7 +5265,7 @@ qemuMigrationSrcToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, if (rc < 0) { if (rc == -2) { - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); virCommandAbort(cmd); if (virDomainObjIsActive(vm) && qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { @@ -5308,7 +5284,7 @@ qemuMigrationSrcToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, cleanup: if (ret < 0 && !orig_err) - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); /* Restore max migration bandwidth */ if (virDomainObjIsActive(vm) && @@ -5326,10 +5302,7 @@ qemuMigrationSrcToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, virCommandFree(cmd); } - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); return ret; } -- 2.20.1

2 1