From 5b37115c3c089771b4823e0f1a51d0d2a95daac9 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 20 Feb 2017 18:05:18 +0100 Subject: [PATCH] qemu_process: remove unnecessary iothread check The situation covered by the removed code will not ever happen. This code is called only while starting a new QEMU process where the capabilities where already checked and while attaching to existing QEMU process where we don't even detect the iothreads. Signed-off-by: Pavel Hrdina --- src/qemu/qemu_process.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c5bf692523..522f49d8b7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2101,32 +2101,6 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver, int ret = -1; size_t i; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) { - /* The following check is because at one time a domain could - * define iothreadids and start the domain - only failing the - * capability check when attempting to add a disk. Because the - * iothreads and [n]iothreadids were left untouched other code - * assumed it could use the ->thread_id value to make thread_id - * based adjustments (e.g. pinning, scheduling) which while - * succeeding would execute on the calling thread. - */ - if (vm->def->niothreadids) { - for (i = 0; i < vm->def->niothreadids; i++) { - /* Check if the domain had defined any iothreadid elements - * and supply a VIR_INFO indicating that it's being removed. - */ - if (!vm->def->iothreadids[i]->autofill) - VIR_INFO("IOThreads not supported, remove iothread id '%u'", - vm->def->iothreadids[i]->iothread_id); - virDomainIOThreadIDDefFree(vm->def->iothreadids[i]); - } - /* Remove any trace */ - VIR_FREE(vm->def->iothreadids); - vm->def->niothreadids = 0; - } - return 0; - } - /* Get the list of IOThreads from qemu */ if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; -- GitLab