September 2019 - Devel - libvirt List Archives

[libvirt] [PATCH v2 00/23] Use a slirp helper process
by marcandre.lureau＠redhat.com 06 Sep '19

06 Sep '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, SLIRP networking can be running in a separate process. This allows for stricter security policies for QEMU & SLIRP, as SLIRP is notoriously not very safe (discussed on ML, various CVEs, and even the code says so explicitly in the comments), yet people rely on it for various reasons. With this series, for a network interface "user", libvirt will: - check the slirp-helper presence and capabilites (see [1]) - setup a socket pair between qemu and the helper - use -net socket - setup migration thanks to dbus-vmstate There are no changes required to domain configuration to benefit it. "guestfwd" isn't supported at this point, but it is known to be in a broken state with libvirt+qemu anyway. The dbus-vmstate is being proposed to QEMU. The libslirp-rs slirp-helper hasn't yet received a release. The current DBus p2p mode works ok, but is a hack. This is due to poor DBus support in Rust, and also relatively poor DBus p2p mode support in libdbus. fwiw, I have been working on an alternative rust-only implementation of a slirp-helper that will also follow [1], but I am now wondering if netstack or vpnkit could do the job. [1] https://gitlab.freedesktop.org/slirp/libslirp-rs/blob/master/src/bin/README… Marc-André Lureau (23): Add .editorconfig tests: fix xml2xml tpm-emulator.xml test dbus: correctly build reply message qemu: replace logCtxt with qemuDomainLogAppendMessage() qemu: add socket datagram capability qemu: add dbus-vmstate capability qemu: reset VM id after external devices stop qemu-security: add qemuSecurityCommandRun() qemu: add dbus-vmstate domain-conf: add network def private data qemu: add qemuDomainNetworkPrivate qemu-conf: add configurable slirp-helper location qemu-conf: add slirp state dir qemu: add slirp helper unit qemu-domain: save and restore slirp state qemu: add a flag to the cookie to prevent slirp-helper setup qemu-migration: prevent migration if dbus-vmstate is required qemu-migration: prevent migration if slirp cannot be migrated qemu-extdevice: prepare, start and stop slirp-helper qemu-command: use -net socket,fd= with slirp-helper qemu-process: prepare slirp-helper qemu-hotplug: handle hotplugging of slirp-helper tests: add slirp-helper qemuxml2argv test .editorconfig | 21 + m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 21 +- src/conf/domain_conf.h | 6 + src/qemu/Makefile.inc.am | 4 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 3 + src/qemu/qemu_alias.c | 17 + src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 118 ++++- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 11 +- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_dbus.c | 94 ++++ src/qemu/qemu_dbus.h | 42 ++ src/qemu/qemu_domain.c | 220 ++++++++- src/qemu/qemu_domain.h | 20 + src/qemu/qemu_driver.c | 8 + src/qemu/qemu_extdevice.c | 82 ++-- src/qemu/qemu_extdevice.h | 10 +- src/qemu/qemu_hotplug.c | 112 ++++- src/qemu/qemu_hotplug.h | 11 + src/qemu/qemu_interface.c | 27 ++ src/qemu/qemu_interface.h | 4 + src/qemu/qemu_migration.c | 19 + src/qemu/qemu_monitor.c | 13 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_process.c | 24 +- src/qemu/qemu_security.c | 22 + src/qemu/qemu_security.h | 6 + src/qemu/qemu_slirp.c | 448 ++++++++++++++++++ src/qemu/qemu_slirp.h | 81 ++++ src/qemu/qemu_tpm.c | 4 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virdbus.c | 18 +- src/util/virdbus.h | 6 +- .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../net-user.x86_64-4.0.0.args | 34 ++ tests/qemuxml2argvdata/tpm-emulator.xml | 2 +- tests/qemuxml2argvtest.c | 16 + tests/testutilsqemu.h | 1 + tests/virfirewalltest.c | 9 +- tests/virpolkittest.c | 3 +- 51 files changed, 1498 insertions(+), 77 deletions(-) create mode 100644 .editorconfig create mode 100644 src/qemu/qemu_dbus.c create mode 100644 src/qemu/qemu_dbus.h create mode 100644 src/qemu/qemu_slirp.c create mode 100644 src/qemu/qemu_slirp.h create mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args -- 2.23.0.rc1

3 48

[libvirt] [jenkins-ci PATCH] guests: Include "locales" by default
by Fabiano Fidêncio 06 Sep '19

06 Sep '19

osinfo-db tests require "en_US.UTF-8" locale to be set. Unfortunately, our containers do not contain the needed locale file. After a discussion on libosinfo mailing list[0], it's been agreed on having the locale as part of our libvirt-jenkins-ci's base packages. [0]: https://www.redhat.com/archives/libosinfo/2019-September/msg00011.html Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/base.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index c5a7824..90ac611 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -431,6 +431,12 @@ mappings: rpm: libxslt-devel cross-policy-deb: foreign + locales: + CentOS: glibc-common + deb: locales + Fedora: glibc-langpack-en + FreeBSD: + lsof: default: lsof diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index a7e572b..2a84029 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -16,6 +16,7 @@ packages: - glibc - libtool - libtoolize + - locales - lsof - net-tools - make -- 2.21.0

1 1

[libvirt] [PATCH 0/2] test_driver: implement PM suspend/wakeup APIs
by Ilias Stamatis 06 Sep '19

06 Sep '19

Ilias Stamatis (2): test_driver: implement virDomainPMSuspendForDuration test_driver: implement virDomainPMWakeup src/test/test_driver.c | 116 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) -- 2.22.0

2 6

[libvirt] [PATCH] qemu: qapi: Limit traversal depth for QAPI schema queries
by Peter Krempa 06 Sep '19

06 Sep '19

Implicitly the query depth is limited by the length of the QAPI schema query, but 'alternate' and 'array' QAPI meta-types don't consume a part of the query string thus a loop on such types would get our traversal code stuck in an infinite loop. Prevent this from happening by limiting the nesting depth to 1000. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_qapi.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 0226d6c659..93fcae0d44 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -74,9 +74,23 @@ struct virQEMUQAPISchemaTraverseContext { virHashTablePtr schema; char **queries; virJSONValuePtr returnType; + size_t depth; }; +static int +virQEMUQAPISchemaTraverseContextValidateDepth(struct virQEMUQAPISchemaTraverseContext *ctxt) +{ + if (ctxt->depth++ > 1000) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("possible loop in QMP schema")); + return -1; + } + + return 0; +} + + static void virQEMUQAPISchemaTraverseContextInit(struct virQEMUQAPISchemaTraverseContext *ctxt, char **queries, @@ -329,6 +343,9 @@ virQEMUQAPISchemaTraverse(const char *baseName, const char *metatype; size_t i; + if (virQEMUQAPISchemaTraverseContextValidateDepth(ctxt) < 0) + return -2; + if (!(cur = virHashLookup(ctxt->schema, baseName))) return -2; -- 2.21.0

2 3

[libvirt] [PATCH] qemu: maintain user alias for video type 'none'
by Jonathon Jongsma 06 Sep '19

06 Sep '19

After parsing a video device with a model type of VIR_DOMAIN_VIDEO_TYPE_NONE, all device info is cleared (see virDomainDefPostParseVideo()) in order to avoid formatting any auto-generated values for the XML. Subsequently, however, an alias is generated for the video device (e.g. 'video0'), which results in an alias property being formatted in the XML output anyway. This creates confusion if the user has explicitly provided an alias for the video device since the alias will change. To avoid this, don't clear the user-defined alias for video devices of type "none". See https://bugzilla.redhat.com/show_bug.cgi?id=1720612 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++-- tests/qemuxml2argvdata/video-none-device.xml | 1 + tests/qemuxml2xmloutdata/video-none-device.xml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c429cd593..d11d1fb903 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5635,11 +5635,14 @@ virDomainDefPostParseVideo(virDomainDefPtr def, return 0; if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_NONE) { + char *alias; /* we don't want to format any values we automatically fill in for - * videos into the XML, so clear them - */ + * videos into the XML, so clear them, but retain any user-assigned + * alias */ + VIR_STEAL_PTR(alias, def->videos[0]->info.alias); virDomainVideoDefClear(def->videos[0]); def->videos[0]->type = VIR_DOMAIN_VIDEO_TYPE_NONE; + VIR_STEAL_PTR(def->videos[0]->info.alias, alias); } else { virDomainDeviceDef device = { .type = VIR_DOMAIN_DEVICE_VIDEO, diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxml2argvdata/video-none-device.xml index 4b591562b7..c1c60c1d9e 100644 --- a/tests/qemuxml2argvdata/video-none-device.xml +++ b/tests/qemuxml2argvdata/video-none-device.xml @@ -31,6 +31,7 @@ <graphics type='vnc'/> <video> <model type='none'/> + <alias name='ua-user-video-alias'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.xml index 6e76b394fe..82615f5125 100644 --- a/tests/qemuxml2xmloutdata/video-none-device.xml +++ b/tests/qemuxml2xmloutdata/video-none-device.xml @@ -34,6 +34,7 @@ </graphics> <video> <model type='none'/> + <alias name='ua-user-video-alias'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> -- 2.21.0

3 2

[libvirt] [PATCH] vircgroupv2: fix setting cpu.max period
by Pavel Hrdina 06 Sep '19

06 Sep '19

When we set cpu.max period we need to parse the cpu.max file first as it contains both quota and period values separated by space. When only a single number is written to that file it will set quota, in order to change period we need to write both values. The code was prepared for that but mistakenly used new line to end the string with the first value. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749227 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/vircgroupv2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 2aca4e5d62..0663c67190 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -1508,7 +1508,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, _("Invalid 'cpu.max' data.")); return -1; } - *tmp = '\n'; + *tmp = '\0'; if (virAsprintf(&value, "%s %llu", str, cfs_period) < 0) return -1; -- 2.21.0

2 1

[libvirt] [PATCH] qemu: Fix qemuDomainObjTaint with virtlogd
by Jiri Denemark 05 Sep '19

05 Sep '19

When virtlogd is used to capture QEMU's stdout, qemuDomainObjTaint would always fail to write the message to the log file when QEMU is already running (i.e., outside qemuProcessLaunch). This can happen during device hotplug or by sending a custom QEMU guest agent command: warning : qemuDomainObjTaint:8757 : Domain id=9 name='blaf' uuid=9cfa4e37-2930-405b-bcb4-faac1829dad8 is tainted: custom-ga-command error : virLogHandlerDomainOpenLogFile:388 : Cannot open log file: '/var/log/libvirt/qemu/blaf.log': Device or resource busy error : virNetClientProgramDispatchError:172 : Cannot open log file: '/var/log/libvirt/qemu/blaf.log': Device or resource busy The fix is easy, we just need to use the right API for appending a message to QEMU log file instead of creating a new log context. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c7eb0b5e9a..709e4e568b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8783,9 +8783,9 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, qemuDomainLogContextPtr logCtxt) { virErrorPtr orig_err = NULL; - bool closeLog = false; char *timestamp = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; + int rc; if (!virDomainObjTaint(obj, taint)) return; @@ -8806,27 +8806,25 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, if (!(timestamp = virTimeStringNow())) goto cleanup; - if (logCtxt == NULL) { - logCtxt = qemuDomainLogContextNew(driver, obj, - QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); - if (!logCtxt) { - VIR_WARN("Unable to open domainlog"); - goto cleanup; - } - closeLog = true; + if (logCtxt) { + rc = qemuDomainLogContextWrite(logCtxt, + "%s: Domain id=%d is tainted: %s\n", + timestamp, + obj->def->id, + virDomainTaintTypeToString(taint)); + } else { + rc = qemuDomainLogAppendMessage(driver, obj, + "%s: Domain id=%d is tainted: %s\n", + timestamp, + obj->def->id, + virDomainTaintTypeToString(taint)); } - if (qemuDomainLogContextWrite(logCtxt, - "%s: Domain id=%d is tainted: %s\n", - timestamp, - obj->def->id, - virDomainTaintTypeToString(taint)) < 0) + if (rc < 0) virResetLastError(); cleanup: VIR_FREE(timestamp); - if (closeLog) - virObjectUnref(logCtxt); if (orig_err) { virSetError(orig_err); virFreeError(orig_err); -- 2.23.0

2 1

[libvirt] [PATCH 0/3] qemu: Fix disk IO tuning on hotplug with -blockdev (blockdev-add saga)
by Peter Krempa 05 Sep '19

05 Sep '19

Few cleanups and a bugfix as with blockdev we need to issue an extra command to honour disk throttling config. Peter Krempa (3): qemu: hotplug: Simplify cleanup in qemuDomainChangeMediaLegacy qemu: hotplug: Use VIR_AUTOFREE in qemuDomainAttachDiskGeneric qemu: hotplug: Setup disk throttling with blockdev src/qemu/qemu_hotplug.c | 52 ++++++++++++++++++++++++----------------- src/qemu/qemu_process.c | 1 + 2 files changed, 32 insertions(+), 21 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH 0/2] qemu: Limit backing chain to max 200 layers (blockdev-add saga)
by Peter Krempa 05 Sep '19

05 Sep '19

More than 256 deep element tree break with our XML parser. Backing chains are one of the simple ways to get there. Forbid them. Note that the practical limit/sane approach is way less than 200. Peter Krempa (2): qemu: domain: Refactor cleanup in qemuDomainDetermineDiskChain qemu: Prevent storage causing too much nested XML src/qemu/qemu_domain.c | 91 +++++++++++++++++++++++++++++++----------- src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 6 +++ 3 files changed, 78 insertions(+), 23 deletions(-) -- 2.21.0

3 5

[libvirt] [PATCH v3 00/18] qemu: Blockdevize external snapshot creation (blokcdev-add saga)
by Peter Krempa 05 Sep '19

05 Sep '19

Another posting of this series as I've added a few patches which fix a problem with shallow block copy. Patches 1-5 of the original series were pushed. Patches 1-3 of this series were originally posted and reviewed separately but were not pushed yet due to the ongoing freeze. They are included as they make the snapshots actually usable. Patches 4-9 are new and fix a problem in block copy. The changes necessary would conflict with the snapshot code so this version rebases everything and includes them here. Patches 10-12 fix a snapshot locking regression as outlined in the previous posting. The rest is from the original external snapshot blockdevization series with feedback applied. Peter Krempa (18): qemu: block: Use correct type when creating image size JSON entries tests: qemublock: Use bigger numbers as dummy capacity/physical qemu: monitor: Fix formatting of 'offset' in qemuMonitorJSONSaveMemory qemu: block: Unify conditions to format backing store of format node definition qemu: block: Explicitly specify backingStore when creating format layer props qemu: command: Refactor qemuBuildStorageSourceChainAttachPrepareBlockdevInternal qemu: block: explicitly pass backing store to qemuBlockStorageSourceAttachPrepareBlockdev qemu: Explicitly pass backing store to qemuBuildStorageSourceChainAttachPrepareBlockdevTop qemu: driver: Fix shallow non-reuse block copy qemu: snapshot: Fix image lock handling when taking a snapshot qemu: snapshot: Save status and config XMLs only on success qemu: snapshot: Move error preservation to qemuDomainSnapshotDiskDataCleanup qemu: snapshot: Rename external disk snapshot handling functions qemu: Disband qemuDomainSnapshotCreateSingleDiskActive qemu: Merge use of 'reuse' flag in qemuDomainSnapshotDiskPrepareOne qemu: snapshot: Skip overlay file creation/interogation if unsupported qemu: Add -blockdev support for external snapshots qemu: Defer support checks for external active snapshots to blockdev code or qemu src/qemu/qemu_block.c | 54 ++-- src/qemu/qemu_block.h | 4 +- src/qemu/qemu_command.c | 63 ++-- src/qemu/qemu_command.h | 1 + src/qemu/qemu_driver.c | 279 +++++++++++------- src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_monitor_json.c | 2 +- tests/qemublocktest.c | 6 +- .../imagecreate/luks-encopts.json | 4 +- .../imagecreate/luks-noopts.json | 4 +- .../imagecreate/network-gluster-qcow2.json | 4 +- .../imagecreate/network-rbd-qcow2.json | 4 +- .../imagecreate/network-sheepdog-qcow2.json | 4 +- .../imagecreate/network-ssh-qcow2.json | 4 +- .../imagecreate/qcow2-backing-luks.json | 4 +- .../imagecreate/qcow2-backing-raw-nbd.json | 4 +- .../imagecreate/qcow2-backing-raw.json | 4 +- .../qcow2-luks-encopts-backing.json | 4 +- .../imagecreate/qcow2-luks-encopts.json | 4 +- .../imagecreate/qcow2-luks-noopts.json | 4 +- .../qemublocktestdata/imagecreate/qcow2.json | 4 +- tests/qemublocktestdata/imagecreate/raw.json | 2 +- 22 files changed, 280 insertions(+), 187 deletions(-) -- 2.21.0

2 31