When watching a job (save, managedsave, dump, migrate) virsh spawns a thread to call the appropriate API and waits for the result while watching for interruption signals (SIGINT, Ctrl-C on the terminal). Whenever such signal is caught, virsh calls virDomainAbortJob, stops waiting for the job, and returns the result of virDomainAbortJob. This is wrong because the job might have finished in the meantime or it might have been cancelled by someone else and virsh would just report the failure to abort the job. However, we are not interested in the virDomainAbortJob's result at all, we need to keep waiting for the main job to finish and report its result instead. https://bugzilla.redhat.com/show_bug.cgi?id=1131755 Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx> --- tools/virsh-domain.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index fc4d1fc..044b088 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4234,12 +4234,9 @@ vshWatchJob(vshControl *ctl, if (ret > 0) { if (pollfd[1].revents & POLLIN && saferead(STDIN_FILENO, &retchar, sizeof(retchar)) > 0) { - if (vshTTYIsInterruptCharacter(ctl, retchar)) { + if (vshTTYIsInterruptCharacter(ctl, retchar)) virDomainAbortJob(dom); - goto cleanup; - } else { - continue; - } + continue; } if (pollfd[0].revents & POLLIN && @@ -4259,9 +4256,8 @@ vshWatchJob(vshControl *ctl, if (intCaught) { virDomainAbortJob(dom); intCaught = 0; - } else { - continue; } + continue; } goto cleanup; } -- 2.4.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list