- Devel - libvirt List Archives

[PATCH 0/3] Use g_autoptr and g_autofree
by Kristina Hanicova 25 Feb '21

25 Feb '21

This uses g_autofree (if possible) in file networkcommon_conf and g_autoptr instead of virNetDevIPRouteFree where possible. Kristina Hanicova (3): networkcommon_conf: Use g_autofree where possible Use g_autoptr instead of virNetDevIPRouteFree if possible Remove redundant variables/labels src/conf/domain_conf.c | 3 +- src/conf/networkcommon_conf.c | 74 +++++++++++++++-------------------- src/lxc/lxc_native.c | 10 ++--- src/vz/vz_sdk.c | 3 +- 4 files changed, 36 insertions(+), 54 deletions(-) -- 2.29.2

3 6

[PATCH] qemu_monitor: Document qemuMonitorUnregister()
by Michal Privoznik 25 Feb '21

25 Feb '21

The most important bit is that the caller is expected to pass locked monitor. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ed35da17e1..73f337a6be 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -850,6 +850,13 @@ qemuMonitorRegister(qemuMonitorPtr mon) } +/** + * qemuMonitorUnregister: + * @mon: monitor object + * + * Unregister monitor from the event loop. The monitor object + * must be locked before calling this function. + */ void qemuMonitorUnregister(qemuMonitorPtr mon) { -- 2.26.2

2 1

[PATCH v2 4/4] utils: Deprecate inexact fractional suffix sizes
by Eric Blake 24 Feb '21

24 Feb '21

The value '1.1k' is inexact; 1126.4 bytes is not possible, so we happen to truncate it to 1126. Our use of fractional sizes is intended for convenience, but when a user specifies a fraction that is not a clean translation to binary, truncating/rounding behind their backs can cause confusion. Better is to deprecate inexact values, which still leaves '1.5k' as valid, but alerts the user to spell out their values as a precise byte number in cases where they are currently being rounded. Note that values like '0.1G' in the testsuite need adjustment as a result. Since qemu_strtosz() does not have an Err** parameter, and plumbing that in would be a much larger task, we instead go with just directly emitting the deprecation warning to stderr. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm not a fan of this patch, but am proposing it for discussion purposes. --- docs/system/deprecated.rst | 9 +++++++++ tests/test-cutils.c | 6 +++--- tests/test-keyval.c | 4 ++-- tests/test-qemu-opts.c | 4 ++-- util/cutils.c | 9 +++++++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 113c2e933f1b..2c9cb849eec5 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -154,6 +154,15 @@ Input parameters that take a size value should only use a size suffix the value is hexadecimal. That is, '0x20M' is deprecated, and should be written either as '32M' or as '0x2000000'. +inexact sizes via scaled fractions (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a fractional +size (such as '1.5M') that will result in an exact byte value. The +use of inexact values (such as '1.1M') that require truncation or +rounding is deprecated, and you should instead consider writing your +unusual size in bytes (here, '1153433' or '1153434' as desired). + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/tests/test-cutils.c b/tests/test-cutils.c index bad3a6099389..c6c33866277b 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -2124,11 +2124,11 @@ static void test_qemu_strtosz_float(void) g_assert_cmpint(res, ==, 1024); g_assert(endptr == str + 3); - /* For convenience, we permit values that are not byte-exact */ - str = "12.345M"; + /* Fractional values should still be byte-exact */ + str = "12.125M"; err = qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, (uint64_t) (12.345 * MiB)); + g_assert_cmpint(res, ==, (uint64_t) (12.125 * MiB)); g_assert(endptr == str + 7); } diff --git a/tests/test-keyval.c b/tests/test-keyval.c index e20c07cf3ea5..7a45c22942e6 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -525,7 +525,7 @@ static void test_keyval_visit_size(void) visit_free(v); /* Suffixes */ - qdict = keyval_parse("sz1=8b,sz2=1.5k,sz3=2M,sz4=0.1G,sz5=16777215T", + qdict = keyval_parse("sz1=8b,sz2=1.5k,sz3=2M,sz4=0.125G,sz5=16777215T", NULL, NULL, &error_abort); v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); qobject_unref(qdict); @@ -537,7 +537,7 @@ static void test_keyval_visit_size(void) visit_type_size(v, "sz3", &sz, &error_abort); g_assert_cmphex(sz, ==, 2 * MiB); visit_type_size(v, "sz4", &sz, &error_abort); - g_assert_cmphex(sz, ==, GiB / 10); + g_assert_cmphex(sz, ==, GiB / 8); visit_type_size(v, "sz5", &sz, &error_abort); g_assert_cmphex(sz, ==, 16777215ULL * TiB); visit_check_struct(v, &error_abort); diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 6568e31a7229..549e994938fe 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -720,10 +720,10 @@ static void test_opts_parse_size(void) g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, 8); g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 1536); g_assert_cmphex(qemu_opt_get_size(opts, "size3", 0), ==, 2 * MiB); - opts = qemu_opts_parse(&opts_list_02, "size1=0.1G,size2=16777215T", + opts = qemu_opts_parse(&opts_list_02, "size1=0.125G,size2=16777215T", false, &error_abort); g_assert_cmpuint(opts_count(opts), ==, 2); - g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 10); + g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 8); g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 16777215ULL * TiB); /* Beyond limit with suffix */ diff --git a/util/cutils.c b/util/cutils.c index 6a8a175e0d71..1154b9de131a 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -246,12 +246,13 @@ static int64_t suffix_mul(char suffix, int64_t unit) * The size parsing supports the following syntaxes * - 12345 - decimal, scale determined by @default_suffix and @unit * - 12345{bBkKmMgGtTpPeE} - decimal, scale determined by suffix and @unit - * - 12345.678{kKmMgGtTpPeE} - decimal, scale determined by suffix, and - * fractional portion is truncated to byte + * - 12345.678{kKmMgGtTpPeE} - decimal, scale determined by suffix, if + * fractional portion is exact * - 0x7fEE - hexadecimal, unit determined by @default_suffix * * The following cause a deprecation warning, and may be removed in the future * - 0xabc{kKmMgGtTpP} - hex with scaling suffix + * - 12345.678{kKmMgGtTpPeE} - decimal with inexact fraction that caused truncation * * The following are intentionally not supported * - octal, such as 08 @@ -342,6 +343,10 @@ static int do_strtosz(const char *nptr, const char **end, retval = -ERANGE; goto out; } + if (mul_required && fraction * mul != (uint64_t) (fraction * mul)) { + warn_report("Using a fractional size that is not an exact byte " + "multiple is deprecated: %s", nptr); + } *result = val * mul + (uint64_t) (fraction * mul); retval = 0; -- 2.30.1

2 2

[PATCH] NEW: Mention some bug fixes for the 7.1.0 dev cycle
by Jim Fehlig 24 Feb '21

24 Feb '21

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- NEWS.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 6ca539b1cd..8cb26d4d4c 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -88,6 +88,23 @@ v7.1.0 (unreleased) For more details why this is necessary see `systemd cgroup <https://systemd.io/CGROUP_DELEGATION/>`_ documentation. + * qemu: Fix swtpm device with aarch64 + + The TPM TIS device name for x86 is ``tpm-tis``, whereas for aarch64 it is + ``tpm-tis-device``. Fix the use of TPM TIS device with aarch64 by using + the proper device name when building the QEMU command line. + + * libxl: Fix domain shutdown + + Commit fa30ee04a2 introduced the possibility of a race between the + shutdown and death threads used to process domain shutdown and death + events from libxl. On normal domain shutdown the shutdown thread handles + all aspects of shutting down and cleaning up the domain. The death + thread is only used to handle out-of-band domain destruction and is + inhibited when domain shutdown is under libvirt's control. The race is + avoided by also inhibiting the death thread when libvirt starts the + shutdown thread. + v7.0.0 (2021-01-15) =================== -- 2.29.2

3 2

[libvirt PATCH 0/2] Fix bonehead errors in <hostdev> <teaming> support
by Laine Stump 24 Feb '21

24 Feb '21

I hadn't caught the code omission because my migration tester system was out of commission, and I stupidly assumed migration would work. The docs typo was pure lack of attention. This (sub) feature will be new for this release, and there is an open BZ for it downstream, so it would be nice to get the fix ACKed and pushed in time for the release. Laine Stump (2): qemu: allow migration of generic <hostdev> with <teaming> docs: fix bad cut/paste in <teaming> example docs/formatdomain.rst | 3 +-- src/qemu/qemu_migration.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) -- 2.29.2

2 3

[PATCH] qemuMonitorUnregister: Fix use-after-free of mon->watch
by Peng Liang 24 Feb '21

24 Feb '21

qemuMonitorUnregister will be called in multiple threads (e.g. threads in rpc worker pool and the vm event thread). In some cases, it isn't protected by the monitor lock, which may lead to call g_source_unref more than one time and a use-after-free problem eventually. To avoid similar problem in the future, use g_atomic_pointer_compare_and_exchange instead of adding a lock in the missing cases. Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- src/qemu/qemu_monitor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0476d606f553..f4d05cd951c2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -853,10 +853,11 @@ qemuMonitorRegister(qemuMonitorPtr mon) void qemuMonitorUnregister(qemuMonitorPtr mon) { - if (mon->watch) { - g_source_destroy(mon->watch); - g_source_unref(mon->watch); - mon->watch = NULL; + GSource *watch = mon->watch; + + if (watch && g_atomic_pointer_compare_and_exchange(&mon->watch, watch, NULL)) { + g_source_destroy(watch); + g_source_unref(watch); } } -- 2.29.2

2 1

[PATCH v2 3/4] utils: Deprecate hex-with-suffix sizes
by Eric Blake 24 Feb '21

24 Feb '21

Supporting '0x20M' looks odd, particularly since we have a 'B' suffix that is ambiguous for bytes, as well as a less-frequently-used 'E' suffix for extremely large exibytes. In practice, people using hex inputs are specifying values in bytes (and would have written 0x2000000, or possibly relied on default_suffix in the case of qemu_strtosz_MiB), and the use of scaling suffixes makes the most sense for inputs in decimal (where the user would write 32M). But rather than outright dropping support for hex-with-suffix, let's follow our deprecation policy. Sadly, since qemu_strtosz() does not have an Err** parameter, and plumbing that in would be a much larger task, we instead go with just directly emitting the deprecation warning to stderr. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/system/deprecated.rst | 8 ++++++++ util/cutils.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 2fcac7861e07..113c2e933f1b 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -146,6 +146,14 @@ library enabled as a cryptography provider. Neither the ``nettle`` library, or the built-in cryptography provider are supported on FIPS enabled hosts. +hexadecimal sizes with scaling multipliers (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a size suffix +(such as 'k' or 'M') when the base is written in decimal, and not when +the value is hexadecimal. That is, '0x20M' is deprecated, and should +be written either as '32M' or as '0x2000000'. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/util/cutils.c b/util/cutils.c index 22d27b0fd21b..6a8a175e0d71 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -250,6 +250,9 @@ static int64_t suffix_mul(char suffix, int64_t unit) * fractional portion is truncated to byte * - 0x7fEE - hexadecimal, unit determined by @default_suffix * + * The following cause a deprecation warning, and may be removed in the future + * - 0xabc{kKmMgGtTpP} - hex with scaling suffix + * * The following are intentionally not supported * - octal, such as 08 * - fractional hex, such as 0x1.8 @@ -272,7 +275,7 @@ static int do_strtosz(const char *nptr, const char **end, int retval; const char *endptr, *f; unsigned char c; - bool mul_required = false; + bool mul_required = false, hex = false; uint64_t val; int64_t mul; double fraction = 0.0; @@ -298,6 +301,7 @@ static int do_strtosz(const char *nptr, const char **end, retval = -EINVAL; goto out; } + hex = true; } else if (*endptr == '.') { /* * Input looks like a fraction. Make sure even 1.k works @@ -320,6 +324,10 @@ static int do_strtosz(const char *nptr, const char **end, c = *endptr; mul = suffix_mul(c, unit); if (mul > 0) { + if (hex) { + warn_report("Using a multiplier suffix on hex numbers " + "is deprecated: %s", nptr); + } endptr++; } else { mul = suffix_mul(default_suffix, unit); -- 2.30.1

3 2

[PATCH] libxl: Add lock process indicator to libxlDomainObjPrivate object
by Jim Fehlig 24 Feb '21

24 Feb '21

The libvirt libxl driver has no access to FDs associated with VM disks. The disks are opened by libxl.so and any related FDs are not exposed to applications. The prevents using virtlockd's auto-release feature to release locks when the FD is closed. Acquiring and releasing locks is explicitly handled by the libxl driver. The current logic is structured such that locks are acquired in libxlDomainStart and released in libxlDomainCleanup. This works well except for migration, where the locks must be released on the source host before the domain can be started on the destination host, but the domain cannot be cleaned up until the migration confirmation stage. When libxlDomainCleanup if finally called in the confirm stage, locks are again released resulting in confusing errors from virtlockd and libvirtd virtlockd[8095]: resource busy: Lockspace resource 'xxxxxx' is not locked libvirtd[8050]: resource busy: Lockspace resource 'xxxxxx' is not locked libvirtd[8050]: Unable to release lease on testvm The error is also encountered in some error cases, e.g. when libxlDomainStart fails before acquiring locks and libxlDomainCleanup is still used for cleanup. In lieu of a mechanism to check if a lock has been acquired, this patch takes an easy approach to fixing the unnecessary lock releases by adding an indicator to the libxlDomainPrivate object that can be set when the lock is acquired and cleared when the lock is released. libxlDomainCleanup can then skip releasing the lock in cases where it was previously released or never acquired in the first place. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- danpb and I discussed this issue on IRC and after pursuing several options I've decided to send this simple approach to the list for comment. I reworked the code in several ways but in the end cant escape the fact that there are occasions where domain cleanup needs to be performed but stopping the lock process is not needed. Another simple approach I pursued was creating a cleanup function that skipped virDomainLockProcessPause, but this approach was a bit cleaner IMO. Other suggestions welcomed. All is not lost in the effort as it resulted in several cleanup and improvement patches that I'll post after release. It includes decomposing libxlDomainStart and making it idempotent on error so libxlDomainCleanup only needs to be called after a successful call to libxlDomainStart. src/libxl/libxl_domain.c | 13 +++++++++---- src/libxl/libxl_domain.h | 1 + src/libxl/libxl_migration.c | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 604b94a006..014f6aceca 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -861,10 +861,14 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def, hostdev_flags); - VIR_FREE(priv->lockState); - if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) - VIR_WARN("Unable to release lease on %s", vm->def->name); - VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + if (priv->lockProcessRunning) { + VIR_FREE(priv->lockState); + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + else + priv->lockProcessRunning = false; + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } libxlLoggerCloseFile(cfg->logger, vm->def->id); vm->def->id = -1; @@ -1426,6 +1430,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, priv->lockState) < 0) goto destroy_dom; VIR_FREE(priv->lockState); + priv->lockProcessRunning = true; /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 00682546e0..5fb76bd303 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -68,6 +68,7 @@ struct _libxlDomainObjPrivate { virThreadPtr migrationDstReceiveThr; unsigned short migrationPort; char *lockState; + bool lockProcessRunning; struct libxlDomainJobObj job; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 631f67930d..a5a9df98ad 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1242,9 +1242,12 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, virObjectLock(vm); if (ret == 0) { - if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) == 0) { + priv->lockProcessRunning = false; + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } else { VIR_WARN("Unable to release lease on %s", vm->def->name); - VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } } else { /* * Confirm phase will not be executed if perform fails. End the @@ -1377,6 +1380,7 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, "xen:///system", vm, priv->lockState); + priv->lockProcessRunning = true; if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, 0) == 0) { ret = 0; } else { -- 2.29.2

2 1

A brief look at deprecating our JSON extensions over RFC 8259
by Markus Armbruster 23 Feb '21

23 Feb '21

We use JSON in several external interfaces: * QMP * The guest agent's QMP * QAPIfied command line options when the option argument starts with '{' * The block layer's pseudo-protocol "json:" (which can get embedded in image headers) I *think* that's all. The JSON parser we use for these interfaces supports extensions over RFC 8259. Quoting json-lexer.c: - Extra escape sequence in strings: 0x27 (apostrophe) is recognized after escape, too - Single-quoted strings: Like double-quoted strings, except they're delimited by %x27 (apostrophe) instead of %x22 (quotation mark), and can't contain unescaped apostrophe, but can contain unescaped quotation mark. - Interpolation, if enabled: The lexer accepts %[A-Za-z0-9]*, and leaves rejecting invalid ones to the parser. Ignore interpolation; it's never enabled at external interfaces. This leaves single-quotes strings and the escape sequence to go with them. I disabled them as an experiment. Some 20 iotests, a qtest and two unit tests explode. The unit test testing the JSON parser is of course excused. The remaining qtest and the unit test could perhaps be dismissed as atypical use of QEMU from C. The iotests less so, I think. I looked at some iotest failures, and quickly found single-quoted strings used with all external interfaces except for qemu-ga's QMP. We could certainly tidy up the tests to stick to standard JSON. However, the prevalence of single-quoted strings in iotests makes me suspect that they are being used in the field as well. Deprecating the extension is likely more trouble than it's worth. Opinions?

6 17

[PATCH python] iothread: fix memory access out of bounds
by Hogan Wang 23 Feb '21

23 Feb '21

From: suruifeng <suruifeng(a)huawei.com> When the 'pcpu' is larger then the last 'iothr->cpumap' bits, set the list element to False to avoid out of bounds access 'iothr->cpumap'. Signed-off-by: suruifeng <suruifeng(a)huawei.com> Reviewed-by: Hogan Wang <hogan.wang(a)huawei.com> --- libvirt-override.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 1f55864..b099f51 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -1625,10 +1625,14 @@ libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, VIR_PY_TUPLE_SET_GOTO(iothrtpl, 1, iothrmap, cleanup); for (pcpu = 0; pcpu < cpunum; pcpu++) - VIR_PY_LIST_SET_GOTO(iothrmap, pcpu, - PyBool_FromLong(VIR_CPU_USED(iothr->cpumap, - pcpu)), - cleanup); + if (VIR_CPU_MAPLEN(pcpu + 1) > iothr->cpumaplen) { + VIR_PY_LIST_SET_GOTO(iothrmap, pcpu, PyBool_FromLong(0), cleanup); + } else { + VIR_PY_LIST_SET_GOTO(iothrmap, pcpu, + PyBool_FromLong(VIR_CPU_USED(iothr->cpumap, + pcpu)), + cleanup); + } } py_retval = py_iothrinfo; -- 2.23.0

2 1

[libvirt PATCH] NEWS: mention cgroups on hosts with systemd bug fix
by Pavel Hrdina 23 Feb '21

23 Feb '21

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- NEWS.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index bee49923a5..eac86d8a4e 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -71,6 +71,23 @@ v7.1.0 (unreleased) of relying on ``VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE`` if they need finer grained control. + * cgroups: Fix how we setup and configure cgroups on hosts with systemd + + When libvirt is running on host with systemd we register every VM with + machined which creates the VM root cgroup for us as well. Before this fix + we were directly modifying files in the VM root cgroup which was incorrect + because all the files are managed by systemd. The implication was that any + change done by libvirt to cgroup attributes supported by systemd could be + removed which happens for example by running ``systemctl daemon-reload``. + + To fix the issue libvirt now uses DBus calls for some of the cgroup + attributes that distributes the resources proportionally to the cgroup + siblings and for the rest we have new sub-cgroup that libvirt can managed + directly. + + For more details why this is necessary see + `systemd cgroug <https://systemd.io/CGROUP_DELEGATION/>`_ documentation. + v7.0.0 (2021-01-15) =================== -- 2.29.2

2 1

[PATCH RESEND 00/20] handle missing SR-IOV VF hostdevs during running domains
by Daniel Henrique Barboza 23 Feb '21

23 Feb '21

This is the rebased version of https://www.redhat.com/archives/libvir-list/2021-January/msg00028.html with master at 57b1ddcaaa5b5. No changes made aside from trivial conflicts fixes. I also removed the military jargon from the previous subject to make it clear what this series is doing. Daniel Henrique Barboza (20): virpci, domain_audit: use virPCIDeviceAddressAsString() qemu, lxc: move NodeDeviceGetPCIInfo() function to domain_driver.c domain_driver.c: use PCI address with virDomainDriverNodeDeviceGetPCIInfo() virpci.c: simplify virPCIDeviceNew() signature virpci: introduce virPCIDeviceExists() virhostdev.c: virHostdevGetPCIHostDevice() now reports missing device security_selinux.c: modernize set/restore hostdev subsys label functions security_dac.c: modernize hostdev label set/restore functions dac, selinux: skip setting/restoring label for absent PCI devices libvirt-nodedev.c: remove return value from virNodeDeviceFree() qemu_driver.c: modernize qemuNodeDeviceReAttach() libxl_driver.c: modernize libxlNodeDeviceReAttach() virsh-domain.c: modernize cmdDetachDevice() virhostdev.c: add virHostdevIsPCIDevice() helper qemu_cgroup.c: skip absent PCI devices in qemuTeardownHostdevCgroup() virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListFindIndex() virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListFind() virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListSteal() virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListDel() virhostdev.c: remove missing PCI devs from hostdev manager include/libvirt/libvirt-nodedev.h | 2 +- src/conf/domain_audit.c | 6 +- src/datatypes.h | 2 + src/hypervisor/domain_driver.c | 30 ++++++++++ src/hypervisor/domain_driver.h | 4 ++ src/hypervisor/virhostdev.c | 88 ++++++++++++++++++++++------ src/hypervisor/virhostdev.h | 2 + src/libvirt-nodedev.c | 15 +++-- src/libvirt_private.syms | 3 + src/libxl/libxl_driver.c | 87 ++++++++-------------------- src/node_device/node_device_udev.c | 11 ++-- src/qemu/qemu_cgroup.c | 10 ++++ src/qemu/qemu_domain_address.c | 5 +- src/qemu/qemu_driver.c | 81 +++++++------------------- src/security/security_apparmor.c | 3 +- src/security/security_dac.c | 61 ++++++++------------ src/security/security_selinux.c | 66 +++++++++------------ src/security/virt-aa-helper.c | 6 +- src/util/virnetdev.c | 3 +- src/util/virnvme.c | 5 +- src/util/virpci.c | 93 ++++++++++++++---------------- src/util/virpci.h | 14 ++--- tests/virhostdevtest.c | 3 +- tests/virpcitest.c | 35 ++++++++--- tools/virsh-domain.c | 18 ++---- 25 files changed, 325 insertions(+), 328 deletions(-) -- 2.26.2

2 49

[PATCH] libxl: Fix domain shutdown
by Jim Fehlig 23 Feb '21

23 Feb '21

Commit fa30ee04a2 caused a regression in normal domain shutown. Initiating a shutdown from within the domain or via 'virsh shutdown' does cause the guest OS running in the domain to shutdown, but libvirt never reaps the domain so it is always shown in a running state until calling 'virsh destroy'. The shutdown thread is also an internal user of the driver shutdown machinery and eventually calls libxlDomainDestroyInternal where the ignoreDeathEvent inhibitor is set, but running in a thread introduces the possibility of racing with the death event from libxl. This can be prevented by setting ignoreDeathEvent before running the shutdown thread. An additional improvement is to handle the destroy event synchronously instead of spawning a thread. The time consuming aspects of destroying a domain have been completed when the destroy event is delivered. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 115 ++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 61 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d59153fffa..32dc503089 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -476,6 +476,7 @@ libxlDomainShutdownHandleRestart(libxlDriverPrivatePtr driver, struct libxlShutdownThreadInfo { libxlDriverPrivatePtr driver; + virDomainObjPtr vm; libxl_event *event; }; @@ -484,7 +485,7 @@ static void libxlDomainShutdownThread(void *opaque) { struct libxlShutdownThreadInfo *shutdown_info = opaque; - virDomainObjPtr vm = NULL; + virDomainObjPtr vm = shutdown_info->vm; libxl_event *ev = shutdown_info->event; libxlDriverPrivatePtr driver = shutdown_info->driver; virObjectEventPtr dom_event = NULL; @@ -494,12 +495,6 @@ libxlDomainShutdownThread(void *opaque) libxl_domain_config_init(&d_config); - vm = virDomainObjListFindByID(driver->domains, ev->domid); - if (!vm) { - VIR_INFO("Received event for unknown domain ID %d", ev->domid); - goto cleanup; - } - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) goto cleanup; @@ -616,32 +611,18 @@ libxlDomainShutdownThread(void *opaque) } static void -libxlDomainDeathThread(void *opaque) +libxlDomainHandleDeath(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { - struct libxlShutdownThreadInfo *shutdown_info = opaque; - virDomainObjPtr vm = NULL; - libxl_event *ev = shutdown_info->event; - libxlDriverPrivatePtr driver = shutdown_info->driver; virObjectEventPtr dom_event = NULL; - g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); - libxlDomainObjPrivatePtr priv; - - vm = virDomainObjListFindByID(driver->domains, ev->domid); - if (!vm) { - /* vm->def->id already cleared, means the death was handled by the - * driver already */ - goto cleanup; - } - - priv = vm->privateData; + libxlDomainObjPrivatePtr priv = vm->privateData; if (priv->ignoreDeathEvent) { priv->ignoreDeathEvent = false; - goto cleanup; + return; } if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) - goto cleanup; + return; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_DESTROYED); dom_event = virDomainEventLifecycleNewFromObj(vm, @@ -651,12 +632,7 @@ libxlDomainDeathThread(void *opaque) if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); libxlDomainObjEndJob(driver, vm); - - cleanup: - virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, dom_event); - libxl_event_free(cfg->ctx, ev); - VIR_FREE(shutdown_info); } @@ -668,16 +644,13 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) { libxlDriverPrivatePtr driver = data; libxl_shutdown_reason xl_reason = event->u.domain_shutdown.shutdown_reason; - struct libxlShutdownThreadInfo *shutdown_info = NULL; - virThread thread; + virDomainObjPtr vm = NULL; g_autoptr(libxlDriverConfig) cfg = NULL; - int ret = -1; - g_autofree char *name = NULL; if (event->type != LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN && event->type != LIBXL_EVENT_TYPE_DOMAIN_DEATH) { VIR_INFO("Unhandled event type %d", event->type); - goto error; + goto cleanup; } /* @@ -685,42 +658,62 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) * after calling libxl_domain_suspend() are handled by its callers. */ if (xl_reason == LIBXL_SHUTDOWN_REASON_SUSPEND) - goto error; + goto cleanup; - /* - * Start a thread to handle shutdown. We don't want to be tying up - * libxl's event machinery by doing a potentially lengthy shutdown. - */ - shutdown_info = g_new0(struct libxlShutdownThreadInfo, 1); + vm = virDomainObjListFindByID(driver->domains, event->domid); + if (!vm) { + /* Nothing to do if we can't find the virDomainObj */ + goto cleanup; + } - shutdown_info->driver = driver; - shutdown_info->event = (libxl_event *)event; - name = g_strdup_printf("ev-%d", event->domid); - if (event->type == LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN) - ret = virThreadCreateFull(&thread, false, libxlDomainShutdownThread, - name, false, shutdown_info); - else if (event->type == LIBXL_EVENT_TYPE_DOMAIN_DEATH) - ret = virThreadCreateFull(&thread, false, libxlDomainDeathThread, - name, false, shutdown_info); + if (event->type == LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN) { + libxlDomainObjPrivatePtr priv = vm->privateData; + struct libxlShutdownThreadInfo *shutdown_info = NULL; + virThread thread; + g_autofree char *name = NULL; - if (ret < 0) { /* - * Not much we can do on error here except log it. + * Start a thread to handle shutdown. We don't want to be tying up + * libxl's event machinery by doing a potentially lengthy shutdown. */ - VIR_ERROR(_("Failed to create thread to handle domain shutdown")); - goto error; - } + shutdown_info = g_new0(struct libxlShutdownThreadInfo, 1); - /* - * libxlShutdownThreadInfo and libxl_event are freed in shutdown thread - */ - return; + shutdown_info->driver = driver; + shutdown_info->vm = vm; + shutdown_info->event = (libxl_event *)event; + name = g_strdup_printf("ev-%d", event->domid); + /* + * Cleanup will be handled by the shutdown thread. + * Ignore the forthcoming death event from libxl + */ + priv->ignoreDeathEvent = true; + if (virThreadCreateFull(&thread, false, libxlDomainShutdownThread, + name, false, shutdown_info) < 0) { + /* + * Not much we can do on error here except log it. + */ + VIR_ERROR(_("Failed to create thread to handle domain shutdown")); + VIR_FREE(shutdown_info); + goto cleanup; + } + /* + * virDomainObjEndAPI is called in the shutdown thread, where + * libxlShutdownThreadInfo and libxl_event are also freed. + */ + return; + } else if (event->type == LIBXL_EVENT_TYPE_DOMAIN_DEATH) { + /* + * On death the domain is cleaned up from Xen's perspective. + * Cleanup on the libvirt side can be done synchronously. + */ + libxlDomainHandleDeath(driver, vm); + } - error: + cleanup: + virDomainObjEndAPI(&vm); cfg = libxlDriverConfigGet(driver); /* Cast away any const */ libxl_event_free(cfg->ctx, (libxl_event *)event); - VIR_FREE(shutdown_info); } char * -- 2.29.2

2 4

[PATCH v2 RESEND 00/13] Introduce virtio-mem <memory/> model
by Michal Privoznik 23 Feb '21

23 Feb '21

Resend of: https://listman.redhat.com/archives/libvir-list/2021-February/msg00534.html We had couple of changes made (new capabilities added mostly) and the original patch set no long applies cleanly. This is pure rebase of the original patch set, no functional change (hence I'm keeping version number). Michal Prívozník (13): virhostmem: Introduce virHostMemGetTHPSize() qemu_process: Deduplicate code in qemuProcessNeedHugepagesPath() qemu_process: Drop needless check in qemuProcessNeedMemoryBackingPath() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event Introduce MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the actual size of virtio-mem on monitor reconnect virsh: Introduce update-memory command news: document recent virtio memory addition kbase: Document virtio-mem NEWS.rst | 7 + docs/formatdomain.rst | 58 ++++- docs/kbase/index.rst | 4 + docs/kbase/memorydevices.rst | 160 ++++++++++++++ docs/kbase/meson.build | 1 + docs/manpages/virsh.rst | 30 +++ docs/schemas/domaincommon.rng | 16 ++ examples/c/misc/event-test.c | 17 ++ include/libvirt/libvirt-domain.h | 23 ++ src/conf/domain_conf.c | 115 +++++++++- src/conf/domain_conf.h | 15 ++ src/conf/domain_event.c | 84 +++++++ src/conf/domain_event.h | 10 + src/conf/domain_validate.c | 39 ++++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +- src/qemu/qemu_domain.c | 67 +++++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 38 +++- src/qemu/qemu_driver.c | 209 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 37 ++++ src/qemu/qemu_monitor.h | 27 +++ src/qemu/qemu_monitor_json.c | 95 ++++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 101 +++++++-- src/qemu/qemu_validate.c | 22 +- src/remote/remote_daemon_dispatch.c | 30 +++ src/remote/remote_driver.c | 32 +++ src/remote/remote_protocol.x | 15 +- src/remote_protocol-structs | 7 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 63 ++++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 48 ++++ .../memory-hotplug-virtio-mem.xml | 64 ++++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 170 ++++++++++++++ 50 files changed, 1619 insertions(+), 68 deletions(-) create mode 100644 docs/kbase/memorydevices.rst create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.26.2

4 25

[libvirt PATCH] NEWS: mention support for vhost-user-blk
by Pavel Hrdina 22 Feb '21

22 Feb '21

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 440dbf2601..56a9afe749 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -47,6 +47,11 @@ v7.1.0 (unreleased) to set the hostdev device's MAC address (which is a necessary part of the alternate <interface type='hostdev'>). + * Introduce ``<disk type='vhostuser'>`` support + + Introduces a support for QEMU vhost-user-blk device that can be used + together with qemu-storage-daemon to provide disks for VMs. + * **Improvements** * **Bug fixes** -- 2.29.2

2 2

[PATCH] NEWS: Mention snapshot quiesce rollback bugfix
by Peter Krempa 22 Feb '21

22 Feb '21

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 440dbf2601..8d639253ff 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -51,6 +51,20 @@ v7.1.0 (unreleased) * **Bug fixes** + * qemu: Fix disk quiescing rollback when creating external snapshots + + If the qemu guest agent call to freeze filesystems failed when creating + an external snapshot with ``VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE`` flag the + filesystems would be unconditionally thawed. This could cause problems when + the filesystems were frozen by an explicit call to ``virDomainFSFreeze`` + since the guest agent then rejects any further freeze attempts once are + filesystems frozen, an explicit freeze followed by a quiesced snapshot + would fail and thaw filesystems. + + Users are also encouraged to use ``virDomainFSFreeze/Thaw`` manually instead + of relying on ``VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE`` if they need finer + grained control. + v7.0.0 (2021-01-15) =================== -- 2.29.2

2 1

[libvirt PATCH 0/2] followup fix for cpu quota limits
by Pavel Hrdina 22 Feb '21

22 Feb '21

Pavel Hrdina (2): domain_validate: use defines for cpu period and quota limits docs: use proper cpu quota value in our documentation docs/formatdomain.rst | 8 ++++---- docs/manpages/virsh.rst | 2 +- docs/schemas/domaincommon.rng | 2 +- src/conf/domain_validate.c | 20 +++++++++++++------- 4 files changed, 19 insertions(+), 13 deletions(-) -- 2.29.2

2 3

[PATCH 00/25] Clear pointers in virJSONValue(Object|Array)Append and other cleanups
by Peter Krempa 20 Feb '21

20 Feb '21

Peter Krempa (25): virLockDaemonPreExecRestart: Refactor memory cleanup virLogDaemonPreExecRestart: Refactor memory cleanup virLogHandlerPreExecRestart: Refactor memory cleanup virNetDaemonPreExecRestart: Refactor memory cleanup virNetServerServicePreExecRestart: Refactor memory cleanup virNetServerClientPreExecRestart: Refactor memory cleanup virNetServerPreExecRestart: Drop error reporting from virJSONValueObjectAppend* calls virNetServerPreExecRestart: Refactor memory cleanup virLockSpacePreExecRestart: Refactor memory cleanup qemuAgentMakeCommand: Refactor memory cleanup virJSONValueObjectInsert: Clear @value on successful insertion virJSONValueCopy: Don't use virJSONValue(Object|Array)Append virJSONValue(Array|Object)Append*: Simplify handling of appended object virJSONValueNewArrayFromBitmap: Refactor cleanup virJSONValueObjectAddVArgs: Use autofree for the temporary bitmap virJSONValueObjectAppend: Clear pointer when taking ownership of passed value qemuAgentMakeStringsArray: Refactor cleanup virMACMapHashDumper: Refactor array addition testQEMUSchemaValidateObjectMergeVariantMember: Fix theoretical leak virJSONValueArrayAppend: Clear pointer when taking ownership of passed value qemuMonitorJSONTransactionAdd: Refactor cleanup qemuAgentSetVCPUsCommand: Refactor cleanup virJSONParserHandle*: Refactor memory cleanup and drop NULL checks virJSONValueNewNumber: Take ownership of passed string virJSONParserInsertValue: Take double pointer for @value src/locking/lock_daemon.c | 77 ++++---- src/logging/log_daemon.c | 52 +++--- src/logging/log_handler.c | 40 ++-- src/network/leaseshelper.c | 3 +- src/node_device/node_device_driver.c | 4 +- src/qemu/qemu_agent.c | 89 ++++----- src/qemu/qemu_block.c | 19 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_firmware.c | 27 +-- src/qemu/qemu_migration_params.c | 4 +- src/qemu/qemu_monitor_json.c | 58 +++--- src/rpc/virnetdaemon.c | 25 +-- src/rpc/virnetserver.c | 79 +++----- src/rpc/virnetserverclient.c | 24 +-- src/rpc/virnetserverservice.c | 34 ++-- src/util/virjson.c | 261 +++++++++++---------------- src/util/virjson.h | 7 +- src/util/virlease.c | 2 +- src/util/virlockspace.c | 47 ++--- src/util/virmacmap.c | 13 +- tests/testutilsqemuschema.c | 4 +- 21 files changed, 322 insertions(+), 550 deletions(-) -- 2.29.2

2 28

[PATCH v2 00/15] qemu: migrate block bitmaps when migrating storage
by Peter Krempa 20 Feb '21

20 Feb '21

When we are copying storage we should also preserve the block dirty bitmaps. This series implements their migration. For standard migration with shared storage we let qemu flush the bitmaps to disk and reload them on destination. There is possibility to migrate them using the migration stream too but it's not implemented in this series. v2: Patches from v1: - patches 4-7 from v1 were pushed already - patch 8 from v1 was dropped This version: - patch 1 was updated to capture the latest capabilities - patch 4 is new, replaces patch 8 from v1 - all other patches apply review feedback from Jirka - patch 14 has one additional change (thus I didn't carry Jirka's R-b): The migration of bitmaps is enabled based on QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING instead of QEMU_CAPS_INCREMENTAL_BACKUP. Peter Krempa (15): qemucapabilitiesdata: Update test data for qemu-6.0 on x86_64 qemu: capabilities: Introduce QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING qemu: Probe whether an image is 'qcow2 v2' from query-named-block-nodes qemu: migration: Create qcow2 v3 images for VIR_MIGRATE_NON_SHARED_DISK qemu: monitor: Introduce qemuMonitorBitmapRemove qemu: blockjob: Use qemuMonitorBitmapRemove for single bitmap removal qemu: migration_params: Add infrastructure for 'dirty-bitmaps' migration feature qemu: migration_cookie: Add XML handling for setting up bitmap migration qemu: migration_cookie: Add helpers for transforming the cookie into migration params qemu: domain: Store list of temporary bitmaps for migration in status XML tests: qemustatusxml2xml: Add status XML from migration with bitmaps tests: qemumigrationcookie: Add testing for block dirty bitmap migration qemu: migration: Clean up temporary bitmaps when cancelling a migration qemu: migration: Migrate block dirty bitmaps corresponding to checkpoints qemu: capabilities: Enable QEMU_CAPS_INCREMENTAL_BACKUP src/qemu/qemu_blockjob.c | 24 +- src/qemu/qemu_capabilities.c | 9 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 87 +- src/qemu/qemu_domain.h | 15 + src/qemu/qemu_migration.c | 369 ++++++++- src/qemu/qemu_migration_cookie.c | 261 ++++++ src/qemu/qemu_migration_cookie.h | 42 + src/qemu/qemu_migration_params.c | 29 + src/qemu/qemu_migration_params.h | 5 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 8 + src/qemu/qemu_monitor_json.c | 35 + src/qemu/qemu_monitor_json.h | 6 + tests/meson.build | 2 +- tests/qemublocktest.c | 2 + tests/qemublocktestdata/bitmap/synthetic.json | 2 +- tests/qemublocktestdata/bitmap/synthetic.out | 1 + .../caps_6.0.0.x86_64.replies | 741 ++++++++++-------- .../caps_6.0.0.x86_64.xml | 23 +- .../nbd-bitmaps-xml2xml-in.xml | 52 ++ .../nbd-bitmaps-xml2xml-migparams.json | 25 + .../nbd-bitmaps-xml2xml-out.xml | 51 ++ tests/qemumigrationcookiexmltest.c | 166 +++- tests/qemumonitorjsontest.c | 2 + .../migration-out-nbd-bitmaps-in.xml | 574 ++++++++++++++ .../migration-out-nbd-bitmaps-out.xml | 1 + tests/qemustatusxml2xmltest.c | 1 + 28 files changed, 2172 insertions(+), 375 deletions(-) create mode 100644 tests/qemumigrationcookiexmldata/nbd-bitmaps-xml2xml-in.xml create mode 100644 tests/qemumigrationcookiexmldata/nbd-bitmaps-xml2xml-migparams.json create mode 100644 tests/qemumigrationcookiexmldata/nbd-bitmaps-xml2xml-out.xml create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-out.xml -- 2.29.2

2 19

[PATCH 0/4] qemuxml2*test: Significantly improve performance by caching qemu capabilities and qapi schema
by Peter Krempa 20 Feb '21

20 Feb '21

This results in 1/3 of the original execution time. Peter Krempa (4): qemuxml2argvtest: Cache QAPI schema between tests testCompareXMLToArgvValidateSchema: Improve and fix helper for testing everything testQemuInfoSetArgs: Use curly braces in else section qemu*xml2*test: Cache capabilities between tests tests/qemustatusxml2xmltest.c | 3 ++- tests/qemuxml2argvtest.c | 26 +++++++++++++++++++------- tests/qemuxml2xmltest.c | 3 ++- tests/testutilsqemu.c | 24 +++++++++++++++++++----- tests/testutilsqemu.h | 2 ++ 5 files changed, 44 insertions(+), 14 deletions(-) -- 2.29.2

2 5

[PATCH v2] qemu: Fix libvirt hang due to early TPM device stop
by Stefan Berger 20 Feb '21

20 Feb '21

This patch partially reverts commit 5cde9dee where the qemuExtDevicesStop() was moved to a location before the QEMU process is stopped. It may be alright to tear down some devices before QEMU is stopped, but it doesn't work for the external TPM (swtpm) which assumes that QEMU sends it a signal to stop it before libvirt may try to clean it up. So this patch moves the virFileDeleteTree() calls after the call to qemuExtDevicesStop() so that the pid file of virtiofsd is not deleted before that call. Afftected libvirt versions are 6.10 and 7.0. Fixes: 5cde9dee8c70b17c458d031ab6cf71dce476eea2 Cc: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu_process.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7feb35e609..d930ff9a74 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7659,11 +7659,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, /* Do this before we delete the tree and remove pidfile. */ qemuProcessKillManagedPRDaemon(vm); - qemuExtDevicesStop(driver, vm); - - virFileDeleteTree(priv->libDir); - virFileDeleteTree(priv->channelTargetDir); - ignore_value(virDomainChrDefForeach(vm->def, false, qemuProcessCleanupChardevDevice, @@ -7677,10 +7672,15 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuDomainCleanupRun(driver, vm); + qemuExtDevicesStop(driver, vm); + qemuDBusStop(driver, vm); vm->def->id = -1; + virFileDeleteTree(priv->libDir); + virFileDeleteTree(priv->channelTargetDir); + /* Stop autodestroy in case guest is restarted */ qemuProcessAutoDestroyRemove(driver, vm); -- 2.26.2

2 1

[PATCH] qemu: Fix libvirt hang due to early TPM device stop
by Stefan Berger 19 Feb '21

19 Feb '21

This patch partially reverts commit 5cde9dee where the qemuExtDevicesStop() was moved to a location before the QEMU process is stopped. It may be alright to tear down some devices before QEMU is stopped, but it doesn't work for the external TPM (swtpm) which assumes that QEMU sends it a signal to stop it before libvirt may try to clean it up. So this patch introduces a function qemuExtDevicesStopEarly() to accommodate those devices that can/must be torn down early, which seems to be the case with virtio and its virtiofsd, and recreates the location of the call to qemuExtDevicesStop() from before the regression for all other devices. Fixes: 5cde9dee8c70b17c458d031ab6cf71dce476eea2 Cc: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu_extdevice.c | 27 ++++++++++++++++++++------- src/qemu/qemu_extdevice.h | 4 ++++ src/qemu/qemu_process.c | 5 ++++- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 8fe7ceaa10..96fdc9a589 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -205,7 +205,27 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, return 0; } +/* qemuExtDevicesStopEarly stops devices that may be stopped + * before QEMU terminates + */ +void +qemuExtDevicesStopEarly(virQEMUDriverPtr driver, + virDomainObjPtr vm) +{ + virDomainDefPtr def = vm->def; + size_t i; + for (i = 0; i < def->nfss; i++) { + virDomainFSDefPtr fs = def->fss[i]; + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) + qemuVirtioFSStop(driver, vm, fs); + } +} + +/* qemuExtDevicesStop stops devices that may only be stopped + * after QEMU terminated + */ void qemuExtDevicesStop(virQEMUDriverPtr driver, virDomainObjPtr vm) @@ -236,13 +256,6 @@ qemuExtDevicesStop(virQEMUDriverPtr driver, if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET && net->downscript) virNetDevRunEthernetScript(net->ifname, net->downscript); } - - for (i = 0; i < def->nfss; i++) { - virDomainFSDefPtr fs = def->fss[i]; - - if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) - qemuVirtioFSStop(driver, vm, fs); - } } diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index 49373a15a1..df0cbd6993 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -51,6 +51,10 @@ int qemuExtDevicesStart(virQEMUDriverPtr driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +void qemuExtDevicesStopEarly(virQEMUDriverPtr driver, + virDomainObjPtr vm) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + void qemuExtDevicesStop(virQEMUDriverPtr driver, virDomainObjPtr vm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7feb35e609..b5b2ddef4c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7659,7 +7659,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, /* Do this before we delete the tree and remove pidfile. */ qemuProcessKillManagedPRDaemon(vm); - qemuExtDevicesStop(driver, vm); + qemuExtDevicesStopEarly(driver, vm); virFileDeleteTree(priv->libDir); virFileDeleteTree(priv->channelTargetDir); @@ -7677,6 +7677,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuDomainCleanupRun(driver, vm); + /* tear down external devices after QEMU is gone */ + qemuExtDevicesStop(driver, vm); + qemuDBusStop(driver, vm); vm->def->id = -1; -- 2.26.2

2 1

[PATCH] event-test: Properly terminate strings printed from callbacks
by Kristina Hanicova 19 Feb '21

19 Feb '21

Stdio was buffering strings in functions: myDomainEventBlockJobCallback, myDomainEventBlockThresholdCallback, myDomainEventMemoryFailureCallback. It caused flushing the printed strings from callbacks at the end of a run, not gradually. The solution is to add \n at the end of each string. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- examples/c/misc/event-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/c/misc/event-test.c b/examples/c/misc/event-test.c index f164e825e1..76d4f3f6e8 100644 --- a/examples/c/misc/event-test.c +++ b/examples/c/misc/event-test.c @@ -938,7 +938,7 @@ myDomainEventBlockJobCallback(virConnectPtr conn G_GNUC_UNUSED, const char *eventName = opaque; printf("%s EVENT: Domain %s(%d) block job callback '%s' disk '%s', " - "type '%s' status '%s'", + "type '%s' status '%s'\n", __func__, virDomainGetName(dom), virDomainGetID(dom), eventName, disk, blockJobTypeToStr(type), blockJobStatusToStr(status)); return 0; @@ -956,7 +956,7 @@ myDomainEventBlockThresholdCallback(virConnectPtr conn G_GNUC_UNUSED, { /* Casts to uint64_t to work around mingw not knowing %lld */ printf("%s EVENT: Domain %s(%d) block threshold callback dev '%s'(%s), " - "threshold: '%" PRIu64 "', excess: '%" PRIu64 "'", + "threshold: '%" PRIu64 "', excess: '%" PRIu64 "'\n", __func__, virDomainGetName(dom), virDomainGetID(dom), dev, NULLSTR(path), (uint64_t)threshold, (uint64_t)excess); return 0; @@ -972,7 +972,7 @@ myDomainEventMemoryFailureCallback(virConnectPtr conn G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) memory failure: recipient '%d', " - "aciont '%d', flags '%d'", __func__, virDomainGetName(dom), + "aciont '%d', flags '%d'\n", __func__, virDomainGetName(dom), virDomainGetID(dom), recipient, action, flags); return 0; } -- 2.29.2

2 1

[libvirt PATCH v2 0/1] Allow kvm hint-dedicated on non-passthrough VMs
by Tim Wiederhake 19 Feb '21

19 Feb '21

V1: https://listman.redhat.com/archives/libvir-list/2021-January/msg00756.html Changes since V1: * rebased * updated commit message Tim Wiederhake (1): qemu_validate: Allow kvm hint-dedicated on non-passthrough VMs src/qemu/qemu_validate.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.26.2

2 2

[PATCH] virsh: Add virshKeycodeNameCompleter
by Kristina Hanicova 19 Feb '21

19 Feb '21

Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- tools/virsh-completer-domain.c | 72 ++++++++++++++++++++++++++++++++++ tools/virsh-completer-domain.h | 8 +++- tools/virsh-domain.c | 1 + 3 files changed, 79 insertions(+), 2 deletions(-) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index fc4d7b2e52..15993064fa 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -32,6 +32,9 @@ #include "virperf.h" #include "virbitmap.h" #include "virkeycode.h" +#include "virkeynametable_linux.h" +#include "virkeynametable_osx.h" +#include "virkeynametable_win32.h" char ** virshDomainNameCompleter(vshControl *ctl, @@ -800,3 +803,72 @@ virshCodesetNameCompleter(vshControl *ctl G_GNUC_UNUSED, return g_steal_pointer(&tmp); } + + +char ** +virshKeycodeNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + g_auto(GStrv) tmp = NULL; + size_t i = 0; + size_t j = 0; + const char *codeset_option; + int codeset; + const char **names = NULL; + size_t len; + + virCheckFlags(0, NULL); + + if (vshCommandOptStringQuiet(ctl, cmd, "codeset", &codeset_option) <= 0) + codeset_option = "linux"; + + if (STREQ(codeset_option, "rfb")) + codeset_option = "qnum"; + + codeset = virKeycodeSetTypeFromString(codeset_option); + + if (codeset < 0) + return NULL; + + switch ((virKeycodeSet) codeset) { + case VIR_KEYCODE_SET_LINUX: + names = virKeyNameTable_linux; + len = virKeyNameTable_linux_len; + break; + case VIR_KEYCODE_SET_OSX: + names = virKeyNameTable_osx; + len = virKeyNameTable_osx_len; + break; + case VIR_KEYCODE_SET_WIN32: + names = virKeyNameTable_win32; + len = virKeyNameTable_win32_len; + break; + case VIR_KEYCODE_SET_XT: + case VIR_KEYCODE_SET_ATSET1: + case VIR_KEYCODE_SET_ATSET2: + case VIR_KEYCODE_SET_ATSET3: + case VIR_KEYCODE_SET_XT_KBD: + case VIR_KEYCODE_SET_USB: + case VIR_KEYCODE_SET_QNUM: + case VIR_KEYCODE_SET_LAST: + break; + } + + if (!names) + return NULL; + + tmp = g_new0(char *, len + 1); + + for (i = 0; i < len; i++) { + if (!names[i]) + continue; + + tmp[j] = g_strdup(names[i]); + j++; + } + + tmp = g_renew(char *, tmp, j + 1); + + return g_steal_pointer(&tmp); +} diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index 4c01b0ca1f..04a3705ff9 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -112,5 +112,9 @@ char ** virshDomainLifecycleActionCompleter(vshControl *ctl, unsigned int flags); char ** virshCodesetNameCompleter(vshControl *ctl, - const vshCmd *cmd, - unsigned int flags); + const vshCmd *cmd, + unsigned int flags); + +char ** virshKeycodeNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d40995f44d..df33467646 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8802,6 +8802,7 @@ static const vshCmdOptDef opts_send_key[] = { {.name = "keycode", .type = VSH_OT_ARGV, .flags = VSH_OFLAG_REQ, + .completer = virshKeycodeNameCompleter, .help = N_("the key code") }, {.name = NULL} -- 2.29.2

2 1