From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSMPw-0007a3-CV for qemu-devel@nongnu.org; Wed, 27 Jul 2016 06:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSMPq-0006z0-E6 for qemu-devel@nongnu.org; Wed, 27 Jul 2016 06:50:23 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:34987 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSMPq-0006xL-1U for qemu-devel@nongnu.org; Wed, 27 Jul 2016 06:50:18 -0400 From: Vladimir Sementsov-Ogievskiy Date: Wed, 27 Jul 2016 13:49:50 +0300 Message-Id: <1469616590-38683-4-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1469616590-38683-1-git-send-email-vsementsov@virtuozzo.com> References: <1469616590-38683-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 3/3] blockjob: fix transaction cancel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: vsementsov@virtuozzo.com, stefanha@redhat.com, famz@redhat.com, mreitz@redhat.com, jcody@redhat.com, kwolf@redhat.com, den@openvz.org Prevent a situation, when some jobs from transaction are already finished and user tries to cancel a job from this transaction. Signed-off-by: Vladimir Sementsov-Ogievskiy --- blockdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/blockdev.c b/blockdev.c index 59ae9e4..d1818c2 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3772,6 +3772,17 @@ void qmp_block_job_cancel(const char *device, goto out; } + if (block_job_txn_all_success(job)) { + if (job->txn != NULL) { + error_setg(errp, "All block jobs in transaction for device '%s' are" + "already successed", device); + } else { + error_setg(errp, "The block job for device '%s' is" + "already successed", device); + } + goto out; + } + trace_qmp_block_job_cancel(job); block_job_cancel(job); out: -- 1.8.3.1