From caf66e0196f447da53145bc916a21f2bd57796fa Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Sun, 12 Feb 2017 02:53:38 +0100 Subject: [PATCH] qemu_driver: check invalid iothread_id before we do anything else Signed-off-by: Pavel Hrdina --- src/qemu/qemu_driver.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 661f6f5d34..a6b9024973 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5754,12 +5754,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, virDomainDefPtr persistentDef; int ret = -1; - if (iothread_id == 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("invalid value of 0 for iothread_id")); - return -1; - } - cfg = virQEMUDriverGetConfig(driver); priv = vm->privateData; @@ -5835,6 +5829,12 @@ qemuDomainAddIOThread(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); + if (iothread_id == 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("invalid value of 0 for iothread_id")); + return -1; + } + if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; @@ -5862,6 +5862,12 @@ qemuDomainDelIOThread(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); + if (iothread_id == 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("invalid value of 0 for iothread_id")); + return -1; + } + if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; -- 2.47.2