Re: [libvirt] [PATCH 5/7] qemu: Wire up PR_MANAGER_STATUS_CHANGED event

This event is emitted on the monitor if one of pr-managers lost connection to its pr-helper process. What libvirt needs to do is restart the pr-helper process iff it corresponds to managed pr-manager. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_monitor.c | 15 +++++++++++++ src/qemu/qemu_monitor.h | 11 +++++++++ src/qemu/qemu_monitor_json.c | 23 +++++++++++++++++++ src/qemu/qemu_process.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f200729cb1..94b7de76d7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1615,6 +1615,58 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } +static int +qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + const char *prManager, + bool connected, + void *opaque ATTRIBUTE_UNUSED) +{ + qemuDomainObjPrivatePtr priv; + size_t i; + int ret = -1; + + virObjectLock(vm); + + VIR_DEBUG("pr-manager %s status changed for domain %p %s connected=%d", + prManager, vm, vm->def->name, connected); + + if (connected) { + /* Connect events are boring. */ + ret = 0; + goto cleanup; + } + /* Disconnect events are more interesting. */ + + for (i = 0; i < vm->def->ndisks; i++) { + const char *mgralias; + + mgralias = virStorageSourceChainGetManagedPRAlias(vm->def->disks[i]->src); + + if (STREQ_NULLABLE(prManager, mgralias)) + break;

+ } + + if (i == vm->def->ndisks) { + VIR_DEBUG("pr-manager %s not managed, ignoring event", + prManager); + ret = 0; + goto cleanup; + } + + priv = vm->privateData; + priv->prDaemonRunning = false; + + if (qemuProcessStartManagedPRDaemon(vm) < 0)

+ goto cleanup; + + ret = 0;