External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: qemuProcessDetectIOThreadPIDs invert checks

Browse Source 
If we received zero iothreads from the monitor, but were perhaps
expecting to receive something, then the code was skipping the check
to ensure what's in the monitor matches our expectations.  So invert
the checks to check that what we get back matches expectations and
then check there are zero iothreads returned.
This commit is contained in:
John Ferlan 2015-04-27 14:24:34 -04:00
parent 4c2ca5664a
commit 69b16513a5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_process.c
View File

@ -2233,12 +2233,6 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver,
if (niothreads < 0) if (niothreads < 0)
goto cleanup; goto cleanup;
/* Nothing to do */
if (niothreads == 0) {
ret = 0;
goto cleanup;
}
if (niothreads != vm->def->iothreads) { if (niothreads != vm->def->iothreads) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("got wrong number of IOThread pids from QEMU monitor. " _("got wrong number of IOThread pids from QEMU monitor. "
@ -2247,6 +2241,12 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
/* Nothing to do */
if (niothreads == 0) {
ret = 0;
goto cleanup;
}
for (i = 0; i < niothreads; i++) { for (i = 0; i < niothreads; i++) {
virDomainIOThreadIDDefPtr iothrid; virDomainIOThreadIDDefPtr iothrid;