From 805da1d5774042d3e7e9b0201edaaf08f76cc679 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 30 May 2018 18:24:26 +0200 Subject: [PATCH] qemu: Convert iothread hotplug to qemuMonitorCreateObjectProps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 09f90320e8..a86b222842 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5806,24 +5806,27 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; char *alias = NULL; size_t idx; - int rc = -1; int ret = -1; unsigned int orig_niothreads = vm->def->niothreadids; unsigned int exp_niothreads = vm->def->niothreadids; int new_niothreads = 0; qemuMonitorIOThreadInfoPtr *new_iothreads = NULL; virDomainIOThreadIDDefPtr iothrid; + virJSONValuePtr props = NULL; if (virAsprintf(&alias, "iothread%u", iothread_id) < 0) return -1; + if (qemuMonitorCreateObjectProps(&props, "iothread", alias, NULL) < 0) + goto cleanup; + qemuDomainObjEnterMonitor(driver, vm); - rc = qemuMonitorAddObjectType(priv->mon, "iothread", alias, NULL); - exp_niothreads++; - if (rc < 0) + if (qemuMonitorAddObject(priv->mon, &props, NULL) < 0) goto exit_monitor; + exp_niothreads++; + /* After hotplugging the IOThreads we need to re-detect the * IOThreads thread_id's, adjust the cgroups, thread affinity, * and add the thread_id to the vm->def->iothreadids list. @@ -5876,8 +5879,9 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, VIR_FREE(new_iothreads); } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, - "update", rc == 0); + "update", ret == 0); VIR_FREE(alias); + virJSONValueFree(props); return ret; exit_monitor: