mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
qemu_driver: move iothread existence check into one place
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
ae27cb9add
commit
c6d2fba69c
@ -5677,21 +5677,6 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver,
|
|||||||
int new_niothreads = 0;
|
int new_niothreads = 0;
|
||||||
qemuMonitorIOThreadInfoPtr *new_iothreads = NULL;
|
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)
|
if (virAsprintf(&alias, "iothread%u", iothread_id) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
@ -5747,6 +5732,13 @@ qemuDomainDelIOThreadCheck(virDomainDefPtr def,
|
|||||||
{
|
{
|
||||||
size_t i;
|
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++) {
|
for (i = 0; i < def->ndisks; i++) {
|
||||||
if (def->disks[i]->iothread == iothread_id) {
|
if (def->disks[i]->iothread == iothread_id) {
|
||||||
virReportError(VIR_ERR_INVALID_ARG,
|
virReportError(VIR_ERR_INVALID_ARG,
|
||||||
@ -5811,16 +5803,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
|
|||||||
goto endjob;
|
goto endjob;
|
||||||
|
|
||||||
} else {
|
} 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)
|
if (qemuDomainDelIOThreadCheck(persistentDef, iothread_id) < 0)
|
||||||
goto endjob;
|
goto endjob;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user