[libvirt] [PATCH 11/13] qemu_driver: move iothread existence check into one place
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/qemu/qemu_driver.c | 32 +++++++-------------------------
1 file changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1a7cc12874..03fea2713d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5675,21 +5675,6 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver,
int new_niothreads = 0;
qemuMonitorIOThreadInfoPtr *new_iothreads = NULL;
- /* Normally would use virDomainIOThreadIDFind, but we need the index
- * from whence to delete for later...
- */
- for (idx = 0; idx < vm->def->niothreadids; idx++) {
- if (iothread_id == vm->def->iothreadids[idx]->iothread_id)
- break;
- }
-
- if (idx == vm->def->niothreadids) {
- virReportError(VIR_ERR_INVALID_ARG,
- _("cannot find IOThread '%u' in iothreadids
list"),
- iothread_id);
- return -1;
- }
-
if (virAsprintf(&alias, "iothread%u", iothread_id) < 0)
return -1;
@@ -5745,6 +5730,13 @@ qemuDomainDelIOThreadCheck(virDomainDefPtr def,
{
size_t i;
+ if (!virDomainIOThreadIDFind(def, iothread_id)) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("cannot find IOThread '%u' in iothreadids
list"),
+ iothread_id);
+ return -1;
+ }
+
for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->iothread == iothread_id) {
virReportError(VIR_ERR_INVALID_ARG,
@@ -5809,16 +5801,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
goto endjob;
} else {
- virDomainIOThreadIDDefPtr iothrid;
- if (!(iothrid = virDomainIOThreadIDFind(persistentDef,
- iothread_id))) {
- virReportError(VIR_ERR_INVALID_ARG,
- _("cannot find IOThread '%u' in persistent
"
- "iothreadids"),
- iothread_id);
- goto endjob;
- }
-
if (qemuDomainDelIOThreadCheck(persistentDef, iothread_id) < 0)
goto endjob;
--
2.11.1