- Devel - libvirt List Archives

[libvirt PATCH] qemu: fix detection of vCPU pids when multiple dies are present
by Daniel P. Berrangé 16 Mar '20

16 Mar '20

The logic for querying hotpluggable CPUs needs to sort the list of CPUs returned by QEMU. Unfortunately our sorting method failed to use the die_id field, so CPUs were not correctly sorted. This is seen when configuring a guest with partially populated CPUs <vcpu placement='static' current='1'>16</vcpu> <cpu...> <topology sockets='4' dies='2' cores='1' threads='2'/> </cpu> Then trying to start it would fail: # virsh -c qemu:///system start demo error: Failed to start domain demo error: internal error: qemu didn't report thread id for vcpu '0' Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_domain.c | 10 ++++++++-- src/qemu/qemu_monitor.c | 2 ++ src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4b467afa81..acb93d24ae 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13537,8 +13537,14 @@ qemuDomainRefreshVcpuInfo(virQEMUDriverPtr driver, } if (validTIDs) - VIR_DEBUG("vCPU[%zu] PID %llu is valid", - i, (unsigned long long)info[i].tid); + VIR_DEBUG("vCPU[%zu] PID %llu is valid " + "(node=%d socket=%d die=%d core=%d thread=%d)", + i, (unsigned long long)info[i].tid, + info[i].node_id, + info[i].socket_id, + info[i].die_id, + info[i].core_id, + info[i].thread_id); } VIR_DEBUG("Extracting vCPU information validTIDs=%d", validTIDs); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index e3d621f038..017b818f73 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1615,6 +1615,7 @@ qemuMonitorCPUInfoClear(qemuMonitorCPUInfoPtr cpus, cpus[i].id = 0; cpus[i].qemu_id = -1; cpus[i].socket_id = -1; + cpus[i].die_id = -1; cpus[i].core_id = -1; cpus[i].thread_id = -1; cpus[i].node_id = -1; @@ -1770,6 +1771,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl vcpus[mastervcpu].hotpluggable = !!hotplugvcpus[i].alias || !vcpus[mastervcpu].online; vcpus[mastervcpu].socket_id = hotplugvcpus[i].socket_id; + vcpus[mastervcpu].die_id = hotplugvcpus[i].die_id; vcpus[mastervcpu].core_id = hotplugvcpus[i].core_id; vcpus[mastervcpu].thread_id = hotplugvcpus[i].thread_id; vcpus[mastervcpu].node_id = hotplugvcpus[i].node_id; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6ccea909e9..be4195e734 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -561,6 +561,7 @@ struct qemuMonitorQueryHotpluggableCpusEntry { /* topology information -1 if qemu didn't report given parameter */ int node_id; int socket_id; + int die_id; int core_id; int thread_id; @@ -583,6 +584,7 @@ struct _qemuMonitorCPUInfo { /* topology info for hotplug purposes. Hotplug of given vcpu impossible if * all entries are -1 */ int socket_id; + int die_id; int core_id; int thread_id; int node_id; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3eac80c060..04affb851f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8565,6 +8565,7 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONValuePtr vcpu, ignore_value(virJSONValueObjectGetNumberInt(props, "node-id", &entry->node_id)); ignore_value(virJSONValueObjectGetNumberInt(props, "socket-id", &entry->socket_id)); + ignore_value(virJSONValueObjectGetNumberInt(props, "die-id", &entry->die_id)); ignore_value(virJSONValueObjectGetNumberInt(props, "core-id", &entry->core_id)); ignore_value(virJSONValueObjectGetNumberInt(props, "thread-id", &entry->thread_id)); @@ -8599,6 +8600,9 @@ qemuMonitorQueryHotpluggableCpusEntrySort(const void *p1, if (a->socket_id != b->socket_id) return a->socket_id - b->socket_id; + if (a->die_id != b->die_id) + return a->die_id - b->die_id; + if (a->core_id != b->core_id) return a->core_id - b->core_id; -- 2.24.1

2 3

[PATCH v2 0/5] Refactor qemuDomainSecretAESSetup
by Peter Krempa 16 Mar '20

16 Mar '20

As requested in: https://www.redhat.com/archives/libvir-list/2020-March/msg00377.html this is an incremental refactor of qemuDomainSecretAESSetup. Posted only as an individual refactor to omit re-sending the 26 other patches from the original series. Peter Krempa (5): qemuDomainSecretInfo: Register autoptr cleanup function qemuDomainSecretAESSetup: Automatically free non-secret locals qemuDomainSecretAESSetup: Allocate and return 'secinfo' here qemuDomainSecretAESSetup: Split out lookup of secret data Remove qemuDomainSecretInfoNew src/qemu/qemu_domain.c | 178 ++++++++++++++++++----------------------- src/qemu/qemu_domain.h | 2 + 2 files changed, 82 insertions(+), 98 deletions(-) -- 2.24.1

2 6

[libvirt PATCH 0/3] cpu: Honor check='full' for host-passthrough CPUs
by Jiri Denemark 16 Mar '20

16 Mar '20

See patch 3/3 for explanation. Jiri Denemark (3): cpu: Change control flow in virCPUUpdateLive cpu_x86: Prepare virCPUx86UpdateLive for easier extension cpu: Honor check='full' for host-passthrough CPUs src/cpu/cpu.c | 12 +++++++----- src/cpu/cpu_x86.c | 20 +++++++++++++++++--- 2 files changed, 24 insertions(+), 8 deletions(-) -- 2.25.1

2 4

[PATCH] qemu: convert DomainLogContext class to use GObject
by Gaurav Agrawal 16 Mar '20

16 Mar '20

--- src/qemu/qemu_domain.c | 35 +++++++++++++++++++---------------- src/qemu/qemu_domain.h | 5 +++-- src/qemu/qemu_process.c | 4 ++-- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4b467afa81..b91364b1a8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -151,7 +151,7 @@ qemuDomainObjFromDomain(virDomainPtr domain) struct _qemuDomainLogContext { - virObject parent; + GObject parent; int writefd; int readfd; /* Only used if manager == NULL */ @@ -161,37 +161,46 @@ struct _qemuDomainLogContext { virLogManagerPtr manager; }; -static virClassPtr qemuDomainLogContextClass; +G_DEFINE_TYPE(qemuDomainLogContext, qemu_domain_log_context, G_TYPE_OBJECT); static virClassPtr qemuDomainSaveCookieClass; -static void qemuDomainLogContextDispose(void *obj); +static void qemuDomainLogContextFinalize(GObject *obj); static void qemuDomainSaveCookieDispose(void *obj); static int qemuDomainOnceInit(void) { - if (!VIR_CLASS_NEW(qemuDomainLogContext, virClassForObject())) - return -1; - if (!VIR_CLASS_NEW(qemuDomainSaveCookie, virClassForObject())) return -1; return 0; } +static void qemu_domain_log_context_init(qemuDomainLogContext *logctxt G_GNUC_UNUSED) +{ +} + +static void qemu_domain_log_context_class_init(qemuDomainLogContextClass *klass) +{ + GObjectClass *obj = G_OBJECT_CLASS(klass); + + obj->finalize = qemuDomainLogContextFinalize; +} + VIR_ONCE_GLOBAL_INIT(qemuDomain); static void -qemuDomainLogContextDispose(void *obj) +qemuDomainLogContextFinalize(GObject *object) { - qemuDomainLogContextPtr ctxt = obj; + qemuDomainLogContextPtr ctxt = QEMU_DOMAIN_LOG_CONTEXT(object); VIR_DEBUG("ctxt=%p", ctxt); virLogManagerFree(ctxt->manager); VIR_FREE(ctxt->path); VIR_FORCE_CLOSE(ctxt->writefd); VIR_FORCE_CLOSE(ctxt->readfd); + G_OBJECT_CLASS(qemu_domain_log_context_parent_class)->finalize(object); } const char * @@ -10591,13 +10600,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr driver, qemuDomainLogContextMode mode) { g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - qemuDomainLogContextPtr ctxt = NULL; - - if (qemuDomainInitialize() < 0) - return NULL; - - if (!(ctxt = virObjectNew(qemuDomainLogContextClass))) - return NULL; + qemuDomainLogContextPtr ctxt = QEMU_DOMAIN_LOG_CONTEXT(g_object_new(QEMU_TYPE_DOMAIN_LOG_CONTEXT, NULL)); VIR_DEBUG("Context new %p stdioLogD=%d", ctxt, cfg->stdioLogD); ctxt->writefd = -1; @@ -10666,7 +10669,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr driver, return ctxt; error: - virObjectUnref(ctxt); + g_clear_object(&ctxt); return NULL; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 099ee59772..ab4206177c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -21,6 +21,7 @@ #pragma once +#include <glib-object.h> #include "virthread.h" #include "vircgroup.h" #include "virperf.h" @@ -601,9 +602,9 @@ struct qemuProcessEvent { void qemuProcessEventFree(struct qemuProcessEvent *event); -typedef struct _qemuDomainLogContext qemuDomainLogContext; +#define QEMU_TYPE_DOMAIN_LOG_CONTEXT qemu_domain_log_context_get_type() +G_DECLARE_FINAL_TYPE(qemuDomainLogContext, qemu_domain_log_context, QEMU, DOMAIN_LOG_CONTEXT, GObject); typedef qemuDomainLogContext *qemuDomainLogContextPtr; -G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuDomainLogContext, virObjectUnref); typedef struct _qemuDomainSaveCookie qemuDomainSaveCookie; typedef qemuDomainSaveCookie *qemuDomainSaveCookiePtr; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 454db21b31..e8401030a2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1929,7 +1929,7 @@ static void qemuProcessMonitorLogFree(void *opaque) { qemuDomainLogContextPtr logCtxt = opaque; - virObjectUnref(logCtxt); + g_clear_object(&logCtxt); } @@ -1983,7 +1983,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, driver); if (mon && logCtxt) { - virObjectRef(logCtxt); + g_object_ref(logCtxt); qemuMonitorSetDomainLog(mon, qemuProcessMonitorReportLogError, logCtxt, -- 2.24.1

2 1

[PATCH v2 0/1] virt-host-validate: Power hosts support
by Daniel Henrique Barboza 16 Mar '20

16 Mar '20

changes in v2: - simplified the whole logic v1: https://www.redhat.com/archives/libvir-list/2019-December/msg00925.html Daniel Henrique Barboza (1): virt-host-validate: warn if kvm_hv is not loaded for POWER hosts tools/virt-host-validate-common.c | 27 +++++++++++++++++++++++++++ tools/virt-host-validate-common.h | 2 ++ tools/virt-host-validate-qemu.c | 15 +++++++++++++++ 3 files changed, 44 insertions(+) -- 2.24.1

2 2

[PATCH 0/8] qemu: support renaming domains with snapshots/checkpoints
by Nikolay Shirokovskiy 16 Mar '20

16 Mar '20

Nikolay Shirokovskiy (8): qemu: remove duplicate code for removing remnant files qemu: qemuDomainRenameCallback: fix sending false undefined event qemu: rename: support renaming snapshots directory qemu: rename: support renaming checkpoints directory qemu: update name on reverting from snapshot qemu: rename: remove snapshot/checkpoint restriction qemu: refactor qemuDomainDefineXMLFlags qemu: qemu: remove remnant files on define src/qemu/qemu_checkpoint.c | 2 +- src/qemu/qemu_checkpoint.h | 6 ++ src/qemu/qemu_domain.c | 41 ++++++++++ src/qemu/qemu_domain.h | 5 ++ src/qemu/qemu_driver.c | 161 ++++++++++++++++++++++--------------- src/qemu/qemu_migration.c | 3 + 6 files changed, 153 insertions(+), 65 deletions(-) -- 2.23.0

2 10

[PATCH v3 00/34] Configurable policy for handling deprecated interfaces
by Markus Armbruster 15 Mar '20

15 Mar '20

This series extends QMP introspection to cover deprecation. Additionally, new option -compat lets you configure what to do when deprecated interfaces get used. This is intended for testing users of the management interfaces. It is experimental. -compat deprecated-input=<in-policy> configures what to do when deprecated input is received. Available policies: * accept: Accept deprecated commands and arguments (default) * reject: Reject them * crash: Crash -compat deprecated-output=<out-policy> configures what to do when deprecated output is sent. Available output policies: * accept: Emit deprecated command results and events (default) * hide: Suppress them For now, -compat covers only deprecated syntactic aspects of QMP. We may want to extend it to cover semantic aspects, CLI, and experimental features. PATCH 01-04: Documentation fixes PATCH 05-10: Test improvements PATCH 11-24: Add feature flags to remaining user-defined types and to struct members PATCH 25-26: New special feature 'deprecated', visible in introspection PATCH 27-34: New -compat to set policy for handling stuff marked with feature 'deprecated' v3: * Rebased, non-trivial conflicts in PATCH 01+26+27+34 due to RST conversion and code motion * PATCH 28-29: Old PATCH 28 split up to ease review * PATCH 30-31: New * PATCH 32-33: Old PATCH 29 split up to ease review Comparison to RFC (24 Oct 2019): * Cover arguments and results in addition to commands and events * Half-baked "[RFC PATCH 18/19] qapi: Include a warning in the response to a deprecated command" dropped See also last item of Subject: Minutes of KVM Forum BoF on deprecating stuff Date: Fri, 26 Oct 2018 16:03:51 +0200 Message-ID: <87mur0ls8o.fsf(a)dusky.pond.sub.org> https://lists.nongnu.org/archive/html/qemu-devel/2018-10/msg05828.html Cc: Lukáš Doktor <ldoktor(a)redhat.com> Cc: libguestfs(a)redhat.com Cc: libvir-list(a)redhat.com Cc: Daniel P. Berrange <berrange(a)redhat.com> Cc: Peter Krempa <pkrempa(a)redhat.com> Markus Armbruster (34): qemu-doc: Belatedly document QMP command arg & result deprecation qapi: Belatedly update doc comment for @wait deprecation docs/devel/qapi-code-gen: Clarify allow-oob introspection docs/devel/qapi-code-gen: Document 'features' introspection tests/test-qmp-cmds: Factor out qmp_dispatch() test helpers tests/test-qmp-cmds: Check responses more thoroughly tests/test-qmp-cmds: Simplify test data setup tests/test-qmp-event: Simplify test data setup tests/test-qmp-event: Use qobject_is_equal() tests/test-qmp-event: Check event is actually emitted qapi/schema: Clean up around QAPISchemaEntity.connect_doc() qapi: Add feature flags to remaining definitions qapi: Consistently put @features parameter right after @ifcond qapi/introspect: Rename *qlit* to reduce confusion qapi/introspect: Factor out _make_tree() qapi/schema: Change _make_features() to a take feature list qapi/schema: Reorder classes so related ones are together qapi/schema: Rename QAPISchemaObjectType{Variant,Variants} qapi/schema: Call QAPIDoc.connect_member() in just one place qapi: Add feature flags to struct members qapi: Inline do_qmp_dispatch() into qmp_dispatch() qapi: Simplify how qmp_dispatch() deals with QCO_NO_SUCCESS_RESP qapi: Simplify how qmp_dispatch() gets the request ID qapi: Replace qmp_dispatch()'s TODO comment by an explanation qapi: New special feature flag "deprecated" qapi: Mark deprecated QMP parts with feature 'deprecated' qemu-options: New -compat to set policy for deprecated interfaces qapi: Implement deprecated-output=hide for QMP command results qapi: Implement deprecated-output=hide for QMP events qapi: Implement deprecated-output=hide for QMP event data qapi: Implement deprecated-output=hide for QMP introspection qapi: Implement deprecated-input=reject for QMP commands qapi: Implement deprecated-input=reject for QMP command arguments qapi: New -compat deprecated-input=crash docs/devel/qapi-code-gen.txt | 79 ++- docs/system/deprecated.rst | 48 +- tests/qapi-schema/doc-good.texi | 32 ++ qapi/block-core.json | 48 +- qapi/block.json | 30 +- qapi/char.json | 1 + qapi/compat.json | 52 ++ qapi/control.json | 11 +- qapi/introspect.json | 28 +- qapi/machine.json | 34 +- qapi/migration.json | 36 +- qapi/misc.json | 13 +- qapi/qapi-schema.json | 1 + include/qapi/compat-policy.h | 20 + include/qapi/qmp/dispatch.h | 1 + include/qapi/qobject-input-visitor.h | 9 + include/qapi/qobject-output-visitor.h | 9 + include/qapi/visitor-impl.h | 3 + include/qapi/visitor.h | 9 + monitor/monitor-internal.h | 3 - monitor/misc.c | 2 - monitor/qmp-cmds-control.c | 102 +++- qapi/qapi-visit-core.c | 9 + qapi/qmp-dispatch.c | 137 ++--- qapi/qobject-input-visitor.c | 29 ++ qapi/qobject-output-visitor.c | 20 + qemu-storage-daemon.c | 2 - softmmu/vl.c | 17 + tests/test-qmp-cmds.c | 249 +++++---- tests/test-qmp-event.c | 201 +++----- qapi/Makefile.objs | 8 +- qapi/trace-events | 1 + qemu-options.hx | 22 + scripts/qapi/commands.py | 20 +- scripts/qapi/doc.py | 16 +- scripts/qapi/events.py | 22 +- scripts/qapi/expr.py | 14 +- scripts/qapi/introspect.py | 104 ++-- scripts/qapi/schema.py | 488 ++++++++++-------- scripts/qapi/types.py | 8 +- scripts/qapi/visit.py | 28 +- tests/Makefile.include | 1 + tests/qapi-schema/alternate-base.err | 2 +- tests/qapi-schema/doc-good.json | 22 +- tests/qapi-schema/doc-good.out | 18 + .../qapi-schema/features-deprecated-type.err | 2 + .../qapi-schema/features-deprecated-type.json | 3 + .../qapi-schema/features-deprecated-type.out | 0 tests/qapi-schema/qapi-schema-test.json | 51 +- tests/qapi-schema/qapi-schema-test.out | 48 +- tests/qapi-schema/test-qapi.py | 26 +- 51 files changed, 1384 insertions(+), 755 deletions(-) create mode 100644 qapi/compat.json create mode 100644 include/qapi/compat-policy.h create mode 100644 tests/qapi-schema/features-deprecated-type.err create mode 100644 tests/qapi-schema/features-deprecated-type.json create mode 100644 tests/qapi-schema/features-deprecated-type.out -- 2.21.1

1 0

[libvirt PATCH] build: workaround behaviour regression in gnu make 4.3
by Daniel P. Berrangé 13 Mar '20

13 Mar '20

We need the "$(space)" variable to contain a single whitespace character. We do this by assigning and then appending an empty string to the variable. Variable appends get separated by a single whitespace historically, but GNU make 4.3 introduced a behaviour regression. https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html [quote] * WARNING: Backward-incompatibility! Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. [/quote] This patch tries a new trick to get a single whitespace by getting make to expand two non-existant variables separated by a space. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- build-aux/syntax-check.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index b829c8a18b..3020921be8 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -687,8 +687,7 @@ msg_gen_function += virLastErrorPrefixMessage # msg_gen_function += vshPrint # msg_gen_function += vshError -space = -space += +space = $(null) $(null) func_re= ($(subst $(space),|,$(msg_gen_function))) # Look for diagnostics that aren't marked for translation. -- 2.24.1

2 1

[PATCH v3 0/4] Tighten qemu-img rules on missing backing format
by Eric Blake 13 Mar '20

13 Mar '20

4 23

[libvirt PATCH v2 0/9] Second take on slirp-helper & dbus-vmstate
by marcandre.lureau＠redhat.com 13 Mar '20

13 Mar '20

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, The series "[libvirt] [PATCH v2 00/23] Use a slirp helper process" has been merged and partially reverted. Meanwhile, qemu dbus-vmstate design has been changed and merged upstream. This new series fixes the slirp-helper support. The significant change is that dbus-vmstate now requires a bus (instead of the earlier peer-to-peer connection). The current series doesn't attempt to enforce strict policies on the bus. As long as you can connect to the bus, you can send/receive from/to anyone. A follow-up series should implement the recommendations from https://qemu.readthedocs.io/en/latest/interop/dbus.html#security. The libslirp-rs slirp-helper hasn't yet received an official release. For testing, you may: $ cargo install --features=all --git https://gitlab.freedesktop.org/slirp/libslirp-rs The resulting binary should be ~/.cargo/bin/slirp-helper, so qemu.conf slirp_helper location should be adjusted. With that in place, a VM with user networking (slirp) should now start with the helper process. thanks v2: - merge most suggestions/changes from Michal Privoznik review of v1. - added "WIP: qemu_slirp: update to follow current spec" Marc-André Lureau (9): qemu: remove dbus-vmstate code qemu-conf: add configurable dbus-daemon location qemu-conf: add dbusStateDir qemu: add a DBus daemon helper unit domain: save/restore the state of dbus-daemon running qemu: prepare and stop the dbus daemon qemu: add dbus-vmstate helper migration support qemu-slirp: register helper for migration WIP: qemu-slirp: update to follow current spec m4/virt-driver-qemu.m4 | 6 + 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_command.c | 81 +++------ src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 7 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_dbus.c | 264 +++++++++++++++++++++++++---- src/qemu/qemu_dbus.h | 25 ++- src/qemu/qemu_domain.c | 30 ++-- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_extdevice.c | 4 +- src/qemu/qemu_hotplug.c | 165 +++++++++--------- src/qemu/qemu_hotplug.h | 17 +- src/qemu/qemu_migration.c | 57 ++++++- src/qemu/qemu_monitor.c | 21 +++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 15 ++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 6 + src/qemu/qemu_slirp.c | 157 +++-------------- src/qemu/qemu_slirp.h | 4 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + 25 files changed, 544 insertions(+), 364 deletions(-) -- 2.25.0.rc2.1.g09a9a1a997

5 15

[PATCH 0/5] virCommand: fix approach to pidfiles
by Michal Privoznik 13 Mar '20

13 Mar '20

This was inspired by reviewing Marc-Andre's patchset [2]. I was wondering why the dbus-daemon is not being killed even though the corresponding function was called. The problem is, the dbus-daemon doesn't have the pidfile locked and therefore virPidFileForceCleanupPath() can't be used. This got me thinking, what is the pidfile good for if the daemon doesn't own it. Sure, we have virPidFileReadPathIfAlive() but that won't work if the daemon binary gets updated meanwhile. Michal Prívozník (5): virCommand: Actually acquire pidfile instead of just writing it qemuProcessStartManagedPRDaemon: Don't pass -f pidfile to the daemon qemuSlirpStop: Simplify helper kill qemuVirtioFSStop: Simplify daemon kill bridge_driver: Replace and drop networkKillDaemon docs/internals/command.html.in | 4 +- src/network/bridge_driver.c | 107 ++++++--------------------------- src/qemu/qemu_process.c | 9 --- src/qemu/qemu_slirp.c | 16 ++--- src/qemu/qemu_virtiofs.c | 21 +++---- src/util/vircommand.c | 56 ++++++++++++++--- tests/commanddata/test4.log | 1 + 7 files changed, 81 insertions(+), 133 deletions(-) -- 2.24.1

1 5

[libvirt] [PATCH] virt-host-validate: warn if kvm_hv is not loaded for POWER hosts
by Daniel Henrique Barboza 13 Mar '20

13 Mar '20

POWER hosts does not implement CPU virtualization extensions like x86 or s390x. Instead, all bare-metal POWER hosts are considered to be virtualization ready. For POWER, the validation is done by checking the virtualization kernel modules, kvm_hv and kvm_pr, to see if they are either not installed or not loaded in the host. If the KVM modules aren't present, we should not just warn but fail to validate. This patch implements this support. If kvm_hv is not installed, which can be determined by 'modinfo' returning not-zero return code, fail the verification. If kvm_hv is installed but not loaded, show a warning. The exception are POWER8 hosts, which can work with kvm_pr. In its case, ACK the use of kvm_pr if kvm_hv is not loaded/present. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- tools/virt-host-validate-common.c | 136 ++++++++++++++++++++++++++++++ tools/virt-host-validate-common.h | 2 + tools/virt-host-validate-qemu.c | 6 ++ 3 files changed, 144 insertions(+) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index bce0f14917..e6d7986758 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -411,3 +411,139 @@ int virHostValidateIOMMU(const char *hvname, virHostMsgPass(); return 0; } + + +static bool virHostCPUIsPower8(void) +{ + FILE *fp; + bool ret = false; + + if (!(fp = fopen("/proc/cpuinfo", "r"))) + return false; + + do { + char line[1024]; + + if (!fgets(line, sizeof(line), fp)) + break; + + /* Looks for the 'model name' line. This is more common for + * Intel /proc/cpuinfo formats, but let's account for it + * too. */ + if (STRPREFIX(line, "model name")) { + if (strstr(line, "POWER8")) + ret = true; + break; + } + + /* Looks for the 'cpu:' line which is more commonly present + * in /proc/cpuinfo Power systems. To ensure this is not + * 'cpu id' or any other cpu attribute, peek at the next char + * after the first whitespace. A tab, whitespace or ':' + * indicates we're on the right line */ + if (STRPREFIX(line, "cpu") && + (line[3] == '\t' || line[3] == ':' || line[3] == ' ')) { + if (strstr(line, "POWER8")) + ret = true; + break; + } + + } while (1); + + VIR_FORCE_FCLOSE(fp); + + return ret; +} + + +static bool virHostKernelModuleExists(const char *module) +{ + g_autofree char *cmd = g_strdup_printf("modinfo %s", module); + g_autofree char *stdout = NULL; + g_autofree char *stderr = NULL; + g_autoptr(GError) err = NULL; + int errStatus; + + if (g_spawn_command_line_sync(cmd, &stdout, &stderr, &errStatus, &err)) + return true; + + return false; +} + + +static bool virHostKernelModuleIsLoaded(const char *module) +{ + FILE *fp; + bool ret = false; + + if (!(fp = fopen("/proc/modules", "r"))) + return false; + + do { + char line[1024]; + + if (!fgets(line, sizeof(line), fp)) + break; + + if (STRPREFIX(line, module)) { + ret = true; + break; + } + + } while (1); + + VIR_FORCE_FCLOSE(fp); + + return ret; +} + + +int virHostValidatePowerPCModules(void) +{ + bool kvm_pr_exists = virHostKernelModuleExists("kvm_pr"); + bool kvm_pr_loaded = kvm_pr_exists && virHostKernelModuleIsLoaded("kvm_pr"); + bool kvm_hv_exists = virHostKernelModuleExists("kvm_hv"); + bool kvm_hv_loaded = kvm_hv_exists && virHostKernelModuleIsLoaded("kvm_hv"); + bool hostIsP8 = virHostCPUIsPower8(); + + virHostMsgCheck("QEMU", "%s", _("for PowerPC KVM modules loaded")); + + /* No Power KVM virtualization modules present on the host. */ + if (!kvm_hv_exists && !kvm_pr_exists) { + virHostMsgFail(VIR_HOST_VALIDATE_FAIL, + _("No kvm_hv or kvm_pr module present in " + "the host")); + return -1; + } + + /* Bail out for all non-Power8 CPUs if kvm_hv is not present. */ + if (!kvm_hv_exists && !hostIsP8) { + virHostMsgFail(VIR_HOST_VALIDATE_FAIL, + _("No kvm_hv module present in the host")); + return -1; + } + + /* Power8 CPUs virtualization works with any of kvm_hv and kvm_pr. + * Issue a warning if none are loaded. */ + if (hostIsP8) { + if (!kvm_hv_loaded && !kvm_pr_loaded) { + virHostMsgFail(VIR_HOST_VALIDATE_WARN, + _("Load kvm_hv or kvm_pr module " + "for better performance")); + return 0; + } + + virHostMsgPass(); + return 0; + } + + /* For non-Power8 hosts, show a warning if kvm_hv is not loaded. */ + if (!kvm_hv_loaded) { + virHostMsgFail(VIR_HOST_VALIDATE_WARN, + _("Load kvm_hv for better performance")); + return 0; + } + + virHostMsgPass(); + return 0; +} diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index 1b7e93e520..7a2933c8fd 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -83,3 +83,5 @@ int virHostValidateCGroupControllers(const char *hvname, int virHostValidateIOMMU(const char *hvname, virHostValidateLevel level); + +int virHostValidatePowerPCModules(void); \ No newline at end of file diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index ff3c1f0231..8753c6a31d 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -57,6 +57,12 @@ int virHostValidateQEMU(void) if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SIE)) hasHwVirt = true; break; + case VIR_ARCH_PPC64: + case VIR_ARCH_PPC64LE: + hasVirtFlag = true; + if (virHostValidatePowerPCModules() == 0) + hasHwVirt = true; + break; default: hasHwVirt = false; } -- 2.23.0

2 3

[PATCH] news: Mention regression in virDomainBlockCopy with shallow/reuse flags
by Peter Krempa 13 Mar '20

13 Mar '20

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/news.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 7fd88f9998..92103ec308 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -48,6 +48,23 @@ <section title="Improvements"> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: Open backing chain late for shallow block copy reusing external images + </summary> + <description> + With introduction of -blockdev specification of storage for qemu VMs + in libvirt-5.10 we've started opening the backing chain of the + destination/mirror of a virDomainBlockcopy started with + VIR_DOMAIN_BLOCK_COPY_REUSE_EXT | VIR_DOMAIN_BLOCK_COPY_SHALLOW flags + when starting the job rather than when virDomainBlockJobAbort with + VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT is issued. For users depending on + this undocumented quirk this caused a regression in behaviour as + the backing chain could not be modified while the copy of the top + image was progressing. Note that this fix also requires qemu-5.0 while + -blockdev is used starting from qemu-4.2. + </description> + </change> </section> </release> <release version="v6.1.0" date="2020-03-03"> -- 2.24.1

2 1

[PATCH 0/5] qemu: Allow late opening of backing chain on a shallow block-copy
by Peter Krempa 13 Mar '20

13 Mar '20

See patch 5/5 for explanation. As described in patch 1/5 this is based on patches which are not yet pushed in qemu. Peter Krempa (5): qemu: capabilities: Update qemu-5.0.0 capabilities for x86_64 qemuDomainBlockPivot: Move check prior to executing the pivot steps qemuDomainBlockCopyCommon: Record updated flags to block job qemu: capabilities: Introduce QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY qemu: blockcopy: Allow late opening of the backing chain of a shallow copy src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 75 +- .../caps_5.0.0.x86_64.replies | 2668 +++++++++-------- .../caps_5.0.0.x86_64.xml | 3 +- 5 files changed, 1435 insertions(+), 1314 deletions(-) -- 2.24.1

3 14

[libvirt PATCH] docs: Fix blockCopy's documentation on --pivot & --abort flags
by Kashyap Chamarthy 13 Mar '20

13 Mar '20

The --abort and --pivot flags for ``blockjob`` are mutually exclusive — you either abort and keep the destination copy as a point-in-time "snapshot"; or pivot to the new copy. But you cannot specify both flags at once. Rephrase blockCopy's doc fragment to that effect. Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- docs/manpages/virsh.rst | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index dc404ddfe8..e7d4933c93 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -1254,18 +1254,19 @@ phases. Initially, the job must copy all data from the source, and during this phase, the job can only be canceled to revert back to the source disk, with no guarantees about the destination. After this phase completes, both the source and the destination remain mirrored until a -call to ``blockjob`` with the *--abort* and *--pivot* flags pivots over -to the copy, or a call without *--pivot* leaves the destination as a -faithful copy of that point in time. However, if *--wait* is specified, -then this command will block until the mirroring phase begins, or cancel -the operation if the optional *timeout* in seconds elapses or SIGINT is -sent (usually with ``Ctrl-C``). Using *--verbose* along with *--wait* -will produce periodic status updates. Using *--pivot* (similar to -``blockjob`` *--pivot*) or *--finish* (similar to ``blockjob`` *--abort*) -implies *--wait*, and will additionally end the job cleanly rather than -leaving things in the mirroring phase. If job cancellation is triggered -by timeout or by *--finish*, *--async* will return control to the user -as fast as possible, otherwise the command may continue to block a little +call is issued to ``blockjob`` with either the *--abort* flag, which +leaves the destination as a faithful copy of that point in time; or the +*--pivot* flag, which pivots over to the copy on the destination. +However, if *--wait* is specified, then this command will block until +the mirroring phase begins, or cancel the operation if the optional +*--timeout* in seconds elapses or SIGINT is sent (usually with +``Ctrl-C``). Using *--verbose* along with *--wait* will produce +periodic status updates. Using *--pivot* (similar to ``blockjob`` +*--pivot*) or *--finish* (similar to ``blockjob`` *--abort*) implies +*--wait*, and will additionally end the job cleanly rather than leaving +things in the mirroring phase. If job cancellation is triggered by +timeout or by *--finish*, *--async* will return control to the user as +fast as possible, otherwise the command may continue to block a little while longer until the job has actually cancelled. *path* specifies fully-qualified path of the disk. -- 2.21.0

1 0

[PATCH] apparmor: qemu load old shared objects
by Christian Ehrhardt 13 Mar '20

13 Mar '20

On qemu upgrades the old .so files usually are replaced. But on the other hand since a qemu process represents a guest instance it is usually kept around. That makes late addition of dynamic features e.g. 'hot-attach of a ceph disk' fail by trying to load a new version of e.f. block-rbd.so into an old still running qemu binary. Qemu adds a fallback to also load modules from a versioned directory in the temporary /var/run path. That way qemu is providing a way for packaging to store modules of an upgraded qemu package as needed until the next reboot. This change is allowing the qemu process access to these paths. Background: This is a continuation of a discussion at KVM Forum 2019 eventually becoming [1] and recently this change is queued to get into qemu properly [2]. [1]: https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg00005.html [2]: https://lists.nongnu.org/archive/html/qemu-devel/2020-03/msg03313.html Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/apparmor/libvirt-qemu | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index 80986aec61..22415c9dfd 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -164,6 +164,11 @@ /usr/{lib,lib64}/qemu/*.so mr, /usr/lib/(a){multiarch}/qemu/*.so mr, + # let qemu load old shared objects after upgrades (LP: #1847361) + /{var/,}run/qemu/*/*.so mr, + # but explicitly deny with auditing writing to these files + audit deny /{var/,}run/qemu/*/*.so w, + # swtpm /{usr/,}bin/swtpm rmix, /usr/{lib,lib64}/libswtpm_libtpms.so mr, -- 2.25.1

2 1

[PATCH v2] conf: Don't generate machine names with a dot
by Michal Privoznik 13 Mar '20

13 Mar '20

According to the linked BZ, machined expects either valid hostname or valid FQDN (see systemd commit v239-3092-gd65652f1f2). While in case of multiple dots, a trailing one doesn't violate FQDN, it does violate the rule in case of something simple, like "domain.". But it's safe to remove it in both cases. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1808499 Fixes: 45464db8ba502764cf37ec9335770248bdb3d9a8 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://www.redhat.com/archives/libvir-list/2020-February/msg01138.html diff to v1: - Adjusted commit message as suggested by Jano - Fixed ".-" and "-." occurrences too, again suggested by Jano src/conf/domain_conf.c | 6 +++--- tests/virsystemdtest.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d2d97daf80..246a78d39b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30933,7 +30933,7 @@ virDomainMachineNameAppendValid(virBufferPtr buf, if (strlen(virBufferCurrentContent(buf)) >= 64) break; - if (*name == '.') { + if (*name == '.' || *name == '-') { if (!skip_dot) virBufferAddChar(buf, *name); skip_dot = true; @@ -30948,8 +30948,8 @@ virDomainMachineNameAppendValid(virBufferPtr buf, virBufferAddChar(buf, *name); } - /* trailing dashes are not allowed */ - virBufferTrimChars(buf, "-"); + /* trailing dashes or dots are not allowed */ + virBufferTrimChars(buf, "-."); } #undef HOSTNAME_CHARS diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 1e36298189..f48a714cca 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -746,7 +746,8 @@ mymain(void) TEST_MACHINE("kstest-network-device-default-httpks_(c9eed63e-981e-48ec-acdc-56b3f8c5f678)", 100, "qemu-100-kstest-network-device-default-httpksc9eed63e-981e-48ec"); TEST_MACHINE("kstest-network-device-default-httpks_(c9eed63e-981e-48ec--cdc-56b3f8c5f678)", 10, - "qemu-10-kstest-network-device-default-httpksc9eed63e-981e-48ec"); + "qemu-10-kstest-network-device-default-httpksc9eed63e-981e-48ec-c"); + TEST_MACHINE("demo.-.test.", 11, "qemu-11-demo.test"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ do { \ -- 2.24.1

2 1

[PATCH 0/2] qemu: fix crash in qemuDomainGetGuestInfo
by Peter Krempa 13 Mar '20

13 Mar '20

See patch 2/2 Peter Krempa (2): qemuAgentFSInfoFormatParams: Remove pointless returned value qemuDomainGetGuestInfo: Don't try to free a negative number of entries src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_driver.c | 43 ++++++++++++++++++++---------------------- 2 files changed, 21 insertions(+), 24 deletions(-) -- 2.24.1

3 6

[libvirt PATCH 0/4] Use g_strerror instead of virStrerror (glib chronicles)
by Ján Tomko 13 Mar '20

13 Mar '20

2 5

[libvirt PATCH] tests: fix double-lock of monitor in hotplug test
by Daniel P. Berrangé 13 Mar '20

13 Mar '20

The qemuMonitorTestNew() function returns with the monitor object locked, and expects it to still be locked when qemuMonitorTestFree is called. The qemuhotplug test, however, explicitly unlocks the monitor, but then forgets to lock it again. As a result the qemuMonitorTestFree function is unlocking a mutex it doesn't own. This bug has existed forever, but since we use normal POSIX mutexes and don't check the return value of pthread_mutex_lock/unlock we didn't see the error. It was harmless until the switch to the per monitor event loop which requires the thread synchronization to work reliably, whereupon it started crashing. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/qemuhotplugtest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 8b411d63f0..d9244dca44 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -337,6 +337,8 @@ testQemuHotplug(const void *data) ret = testQemuHotplugUpdate(vm, dev); } + virObjectLock(priv->mon); + cleanup: VIR_FREE(domain_filename); VIR_FREE(device_filename); @@ -378,6 +380,7 @@ static void testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data) { qemuDomainObjPrivatePtr priv; + qemuMonitorPtr mon; if (!data) return; @@ -396,6 +399,8 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data) virObjectUnref(data->vm); } + mon = qemuMonitorTestGetMonitor(data->mon); + virObjectLock(mon); qemuMonitorTestFree(data->mon); VIR_FREE(data); } -- 2.24.1

2 1

[PATCH v2 00/19] incremental backup: Handle bitmaps during block-commit
by Peter Krempa 13 Mar '20

13 Mar '20

This is now based on top of a different implementation of the fix for late opening of backing chain during block-copy: https://www.redhat.com/archives/libvir-list/2020-March/msg00317.html Changes: - fixes suggested by Pavel - changes to capability use - rebased on master This series uses blockdev-reopen which was not yet stabilized in qemu, thus is experimental for now, but since incremental backup is experimental there's no problem with that. You can fetch the full branch along with patches for enabling the bits at: git fetch https://gitlab.com/pipo.sk/libvirt.git backup-commit You also need to use patched qemu which you can fetch from: git fetch https://gitlab.com/pipo.sk/qemu.git reopen-fixes Peter Krempa (19): qemu: capabilities: Add QEMU_CAPS_BLOCKDEV_REOPEN qemu: monitor: Add handler for blockdev-reopen qemu: block: implement helpers for blockdev-reopen qemuCheckpointDiscardBitmaps: Reopen images for bitmap modifications qemuCheckpointDiscardBitmaps: Use correct field for checkpoint bitmap name qemuDomainBlockCommit: Move checks depending on capabilities after liveness check qemu: domain: Extract formatting of 'commit' blockjob data into a function qemu: domain: Extract parsing of 'commit' blockjob data into a function qemu: blockjob: Store list of bitmaps disabled prior to commit qemublocktest: Fix and optimize fake image chain qemu: block: Implement helpers for dealing with bitmaps during block commit qemublocktest: Add tests for handling of bitmaps during block-commit qemublocktest: Add more tests for block-commit bitmap handling with snapshots qemublocktest: Add tests of broken bitmap chain handling during block-commit qemuBlockJobDiskNewCommit: Propagate 'disabledBitmapsBase' qemuDomainBlockCommit: Handle bitmaps on start of commit qemuDomainBlockPivot: Handle merging of bitmaps when pivoting an active block-commit qemu: blockjob: Handle bitmaps after finish of normal block-commit qemu: blockjob: Re-enable bitmaps after failed block-copy src/qemu/qemu_block.c | 320 ++++++++++++++++++ src/qemu/qemu_block.h | 23 ++ src/qemu/qemu_blockjob.c | 97 +++++- src/qemu/qemu_blockjob.h | 3 + src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_checkpoint.c | 9 +- src/qemu/qemu_domain.c | 110 ++++-- src/qemu/qemu_driver.c | 78 ++++- src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 21 ++ src/qemu/qemu_monitor_json.h | 4 + tests/qemublocktest.c | 126 ++++++- .../bitmapblockcommit/basic-1-2 | 119 +++++++ .../bitmapblockcommit/basic-1-3 | 119 +++++++ .../bitmapblockcommit/basic-2-3 | 2 + .../bitmapblockcommit/snapshots-1-2 | 49 +++ .../bitmapblockcommit/snapshots-1-3 | 76 +++++ .../bitmapblockcommit/snapshots-1-4 | 126 +++++++ .../bitmapblockcommit/snapshots-1-5 | 130 +++++++ .../bitmapblockcommit/snapshots-2-3 | 49 +++ .../bitmapblockcommit/snapshots-2-4 | 99 ++++++ .../bitmapblockcommit/snapshots-2-5 | 103 ++++++ .../bitmapblockcommit/snapshots-3-4 | 72 ++++ .../bitmapblockcommit/snapshots-3-5 | 76 +++++ .../bitmapblockcommit/snapshots-4-4 | 11 + .../bitmapblockcommit/snapshots-4-5 | 33 ++ .../snapshots-synthetic-broken-1-2 | 27 ++ .../snapshots-synthetic-broken-1-3 | 66 ++++ .../snapshots-synthetic-broken-1-4 | 73 ++++ .../snapshots-synthetic-broken-1-5 | 73 ++++ .../snapshots-synthetic-broken-2-3 | 43 +++ .../snapshots-synthetic-broken-2-4 | 50 +++ .../snapshots-synthetic-broken-2-5 | 50 +++ .../snapshots-synthetic-broken-3-4 | 27 ++ .../snapshots-synthetic-broken-3-5 | 27 ++ .../snapshots-synthetic-broken-4-5 | 20 ++ .../blockjob-blockdev-in.xml | 4 + 39 files changed, 2290 insertions(+), 43 deletions(-) create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-2 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-3 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-2-3 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-4 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5 create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5 -- 2.24.1

2 39

[libvirt PATCH] util: ensure min/maj are initialized in virGetDeviceID
by Daniel P. Berrangé 13 Mar '20

13 Mar '20

The stub impl of virGetDeviceID just returns ENOSYS and does not initialize the min/maj output parameters. This lead to a false positive warning on mingw about possible use of uninitialized variables. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virutil.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index f77ee05dbf..ddd8805101 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1407,9 +1407,10 @@ virGetDeviceID(const char *path, int *maj, int *min) #else int virGetDeviceID(const char *path G_GNUC_UNUSED, - int *maj G_GNUC_UNUSED, - int *min G_GNUC_UNUSED) + int *maj, + int *min) { + *maj = *min = 0; return -ENOSYS; } #endif -- 2.24.1

2 1

[PATCH 00/30] Support more 'curl' and 'ssh' driver options (mostly for unbreaking libguestfs)
by Peter Krempa 13 Mar '20

13 Mar '20

With blockdev we need to interpret the fields in order to actually use them in qemu. Unfortunately we didn't do that for some and libguestfs was using them in backing store strings. Model all known curl driver options and pass-through ssh driver options as we don't model the ssh driver. Changes can be fetched from: git fetch https://gitlab.com/pipo.sk/libvirt.git json-props https://gitlab.com/pipo.sk/libvirt/-/commits/json-props Peter Krempa (30): qemuBlockStorageSourceDetachPrepare: Get rid of cleanup section qemu: Don't take double pointer in qemuDomainSecretInfoFree qemuMigrationParamsResetTLS: Adapt to modern memory management qemuMigrationParamsResetTLS: Fix comment qemu: domain: Split out encryption of secret object data qemu: Introduce another helper for creating alias for a 'secret' object qemuDomainSecretStorageSourcePrepare: Fix naming of alias variables qemuDomainDeviceDiskDefPostParseRestoreSecAlias: Hardcode restored aliases qemu: Split out initialization of secrets for 'iscsi' hostdevs qemuDomainSecretAESSetupFromSecret: Use 'qemuAliasForSecret' qemuDomainSecretStorageSourcePrepare: Change aliases for disk secrets qemuDomainGetSecretAESAlias: Replace outstanding uses with qemuAliasForSecret conf: Add support for modifying ssl validation for https/ftps disks conf: Add support for cookies for HTTP based disks conf: Add support for setting timeout and readahead size for network disks qemuDomainValidateStorageSource: Validate new network storage parameters qemuxml2argvtest: Add test case for disks with http(s) source qemu: block: Implement ssl verification configuration qemu: domain: Store data for 'secret' object representing http cookies qemuDomainSecretStorageSourcePrepare: Setup secret for http cookies qemu: Handle hotplug and commandline for secret objects for http cookies qemu: block: Add support for HTTP cookies qemu: block: Implement readahead and timeout properties for 'curl' driver virstoragefile: Add JSON parser for 'sslverify', 'readahead', 'cookies' and 'timeout' virStorageSourceParseBackingJSONUri: Handle undocumented value 'off' for sslverify qemublocktest: Load QMP schema earlier qemublocktest: Extract schema root for blockdev-add validation qemublocktest: XMLjsonXML: Test formatting/parsing of modern JSON qemublocktest: Add JSON->JSON test cases for block device backends qemu: Pass through arguments of 'ssh' block driver used by libguestfs docs/formatdomain.html.in | 35 ++ docs/schemas/domaincommon.rng | 98 ++++- src/conf/domain_conf.c | 119 +++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 32 +- src/qemu/qemu_alias.h | 4 +- src/qemu/qemu_block.c | 50 ++- src/qemu/qemu_block.h | 3 + src/qemu/qemu_command.c | 5 + src/qemu/qemu_domain.c | 337 +++++++++++------- src/qemu/qemu_domain.h | 7 +- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_migration_params.c | 16 +- src/util/virstoragefile.c | 229 +++++++++++- src/util/virstoragefile.h | 24 ++ .../disk-network-http.xml | 19 + tests/qemublocktest.c | 136 ++++++- .../jsontojson/curl-libguestfs-in.json | 1 + .../jsontojson/curl-libguestfs-out.json | 9 + .../ssh-passthrough-libguestfs-in.json | 1 + .../ssh-passthrough-libguestfs-out.json | 14 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + ...-backing-chains-noindex.x86_64-2.12.0.args | 4 +- ...-backing-chains-noindex.x86_64-latest.args | 6 +- ...sk-hostdev-scsi-virtio-iscsi-auth-AES.args | 6 +- .../disk-network-http.x86_64-latest.args | 67 ++++ tests/qemuxml2argvdata/disk-network-http.xml | 61 ++++ .../disk-network-iscsi.x86_64-2.12.0.args | 12 +- .../disk-network-iscsi.x86_64-latest.args | 8 +- .../disk-network-rbd.x86_64-2.12.0.args | 4 +- .../disk-network-rbd.x86_64-latest.args | 4 +- ...isk-network-source-auth.x86_64-2.12.0.args | 10 +- ...isk-network-source-auth.x86_64-latest.args | 8 +- .../disk-nvme.x86_64-latest.args | 4 +- .../encrypted-disk-usage.args | 4 +- tests/qemuxml2argvdata/encrypted-disk.args | 4 +- .../luks-disks-source-qcow2.args | 24 +- ...luks-disks-source-qcow2.x86_64-latest.args | 32 +- tests/qemuxml2argvdata/luks-disks-source.args | 26 +- tests/qemuxml2argvdata/luks-disks.args | 10 +- tests/qemuxml2argvdata/user-aliases.args | 4 +- tests/qemuxml2argvtest.c | 1 + tests/virstoragetest.c | 30 ++ 43 files changed, 1197 insertions(+), 277 deletions(-) create mode 100644 tests/qemublocktestdata/jsontojson/curl-libguestfs-in.json create mode 100644 tests/qemublocktestdata/jsontojson/curl-libguestfs-out.json create mode 100644 tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-in.json create mode 100644 tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-out.json create mode 100644 tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-http.xml -- 2.24.1

3 61

[PATCH] virQEMUCaps: Drop unused usedQMP member
by Michal Privoznik 12 Mar '20

12 Mar '20

The virQEMUCaps structure has usedQMP member which in the past used to tell if qemu we are dealing with is capable of QMP. Well, we don't support HMP anymore (minus a few HMP passthrough commands, which are wrapped into QMP anyways) and the member is not used really. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a75ca0574d..1395549b2b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -638,7 +638,6 @@ static void virQEMUDomainCapsCacheDispose(void *obj) struct _virQEMUCaps { virObject parent; - bool usedQMP; bool kvmSupportsNesting; char *binary; @@ -1825,7 +1824,6 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) return NULL; ret->invalidation = qemuCaps->invalidation; - ret->usedQMP = qemuCaps->usedQMP; ret->kvmSupportsNesting = qemuCaps->kvmSupportsNesting; ret->ctime = qemuCaps->ctime; @@ -4980,7 +4978,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, qemuCaps->version = major * 1000000 + minor * 1000 + micro; qemuCaps->package = g_steal_pointer(&package); - qemuCaps->usedQMP = true; if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0) return -1; -- 2.24.1

2 1

[RFCv2] qemu: convert DomainLogContext class to use GObject
by Gaurav Agrawal 12 Mar '20

12 Mar '20

--- src/qemu/qemu_domain.c | 35 +++++++++++++++++++---------------- src/qemu/qemu_domain.h | 6 +++--- src/qemu/qemu_process.c | 4 ++-- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4b467afa81..b3f17b8382 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -151,7 +151,7 @@ qemuDomainObjFromDomain(virDomainPtr domain) struct _qemuDomainLogContext { - virObject parent; + GObject parent; int writefd; int readfd; /* Only used if manager == NULL */ @@ -161,37 +161,46 @@ struct _qemuDomainLogContext { virLogManagerPtr manager; }; -static virClassPtr qemuDomainLogContextClass; +G_DEFINE_TYPE(qemuDomainLogContext, qemu_domain_log_context, G_TYPE_OBJECT); static virClassPtr qemuDomainSaveCookieClass; -static void qemuDomainLogContextDispose(void *obj); +static void qemuDomainLogContextFinalize(GObject *obj); static void qemuDomainSaveCookieDispose(void *obj); static int qemuDomainOnceInit(void) { - if (!VIR_CLASS_NEW(qemuDomainLogContext, virClassForObject())) - return -1; - if (!VIR_CLASS_NEW(qemuDomainSaveCookie, virClassForObject())) return -1; return 0; } +static void qemu_domain_log_context_init(qemuDomainLogContext *logctxt G_GNUC_UNUSED) +{ +} + +static void qemu_domain_log_context_class_init(qemuDomainLogContextClass *klass) +{ + GObjectClass *obj = G_OBJECT_CLASS(klass); + + obj->finalize = qemuDomainLogContextFinalize; +} + VIR_ONCE_GLOBAL_INIT(qemuDomain); static void -qemuDomainLogContextDispose(void *obj) +qemuDomainLogContextFinalize(GObject *object) { - qemuDomainLogContextPtr ctxt = obj; + qemuDomainLogContextPtr ctxt = QEMU_DOMAIN_LOG_CONTEXT(object); VIR_DEBUG("ctxt=%p", ctxt); virLogManagerFree(ctxt->manager); VIR_FREE(ctxt->path); VIR_FORCE_CLOSE(ctxt->writefd); VIR_FORCE_CLOSE(ctxt->readfd); + G_OBJECT_CLASS(qemu_domain_log_context_parent_class)->finalize(object); } const char * @@ -10591,13 +10600,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr driver, qemuDomainLogContextMode mode) { g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - qemuDomainLogContextPtr ctxt = NULL; - - if (qemuDomainInitialize() < 0) - return NULL; - - if (!(ctxt = virObjectNew(qemuDomainLogContextClass))) - return NULL; + qemuDomainLogContextPtr ctxt = QEMU_DOMAIN_LOG_CONTEXT(g_object_new(QEMU_TYPE_DOMAIN_LOG_CONTEXT, NULL)); VIR_DEBUG("Context new %p stdioLogD=%d", ctxt, cfg->stdioLogD); ctxt->writefd = -1; @@ -10666,7 +10669,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr driver, return ctxt; error: - virObjectUnref(ctxt); + g_object_unref(ctxt); return NULL; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 099ee59772..9e2cec5779 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -20,7 +20,7 @@ */ #pragma once - +#include <glib-object.h> #include "virthread.h" #include "vircgroup.h" #include "virperf.h" @@ -601,9 +601,9 @@ struct qemuProcessEvent { void qemuProcessEventFree(struct qemuProcessEvent *event); -typedef struct _qemuDomainLogContext qemuDomainLogContext; +#define QEMU_TYPE_DOMAIN_LOG_CONTEXT qemu_domain_log_context_get_type() +G_DECLARE_FINAL_TYPE(qemuDomainLogContext, qemu_domain_log_context, QEMU, DOMAIN_LOG_CONTEXT, GObject); typedef qemuDomainLogContext *qemuDomainLogContextPtr; -G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuDomainLogContext, virObjectUnref); typedef struct _qemuDomainSaveCookie qemuDomainSaveCookie; typedef qemuDomainSaveCookie *qemuDomainSaveCookiePtr; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 67dad9841a..e7f5991b23 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1929,7 +1929,7 @@ static void qemuProcessMonitorLogFree(void *opaque) { qemuDomainLogContextPtr logCtxt = opaque; - virObjectUnref(logCtxt); + g_clear_object(&logCtxt); } @@ -1983,7 +1983,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, driver); if (mon && logCtxt) { - virObjectRef(logCtxt); + g_object_ref(logCtxt); qemuMonitorSetDomainLog(mon, qemuProcessMonitorReportLogError, logCtxt, -- 2.24.1

1 0