From: Kevin Wolf <kwolf@redhat.com>
Date: Fri, 14 Feb 2020 20:08:08 +0000 (+0100)
Subject: commit: Fix argument order for block_job_error_action()
X-Git-Tag: v5.0.0-rc0~85^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5507b4d55f1f2989d3c108be387f62ed092ddc0;p=thirdparty%2Fqemu.git

commit: Fix argument order for block_job_error_action()

The block_job_error_action() error call in the commit job gives the
on_err and is_read arguments in the wrong order. Fix this.

(Of course, hard-coded is_read = false is wrong, too, but that's a
separate problem for a separate patch.)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200214200812.28180-4-kwolf@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/commit.c b/block/commit.c
index cce898a4f33..8189f079d23 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -182,7 +182,7 @@ static int coroutine_fn commit_run(Job *job, Error **errp)
         }
         if (ret < 0) {
             BlockErrorAction action =
-                block_job_error_action(&s->common, false, s->on_error, -ret);
+                block_job_error_action(&s->common, s->on_error, false, -ret);
             if (action == BLOCK_ERROR_ACTION_REPORT) {
                 goto out;
             } else {