From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:55418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwlfl-0006rL-Qv for qemu-devel@nongnu.org; Thu, 21 Feb 2019 05:33:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwlfk-00041a-UX for qemu-devel@nongnu.org; Thu, 21 Feb 2019 05:33:45 -0500 From: Stefano Garzarella Date: Thu, 21 Feb 2019 11:33:05 +0100 Message-Id: <20190221103314.58500-2-sgarzare@redhat.com> In-Reply-To: <20190221103314.58500-1-sgarzare@redhat.com> References: <20190221103314.58500-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 01/10] virtio-blk: add acct_failed param to virtio_blk_handle_rw_error() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Max Reitz , Marcel Apfelbaum , Jason Wang , Stefan Hajnoczi , qemu-block@nongnu.org, Eduardo Habkost , Paolo Bonzini , Laurent Vivier , "Michael S. Tsirkin" , Kevin Wolf , "Dr . David Alan Gilbert" , Thomas Huth We add acct_failed param in order to use virtio_blk_handle_rw_error() also when is not required to call block_acct_failed(). (eg. a discard operation is failed) Reviewed-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi Signed-off-by: Stefano Garzarella --- hw/block/virtio-blk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index cf7f47eaba..afedf48ca6 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -65,7 +65,7 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req= , unsigned char status) } =20 static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, - bool is_read) + bool is_read, bool acct_failed) { VirtIOBlock *s =3D req->dev; BlockErrorAction action =3D blk_get_error_action(s->blk, is_read, er= ror); @@ -78,7 +78,9 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *r= eq, int error, s->rq =3D req; } else if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); - block_acct_failed(blk_get_stats(s->blk), &req->acct); + if (acct_failed) { + block_acct_failed(blk_get_stats(s->blk), &req->acct); + } virtio_blk_free_request(req); } =20 @@ -116,7 +118,7 @@ static void virtio_blk_rw_complete(void *opaque, int = ret) * the memory until the request is completed (which will * happen on the other side of the migration). */ - if (virtio_blk_handle_rw_error(req, -ret, is_read)) { + if (virtio_blk_handle_rw_error(req, -ret, is_read, true)) { continue; } } @@ -135,7 +137,7 @@ static void virtio_blk_flush_complete(void *opaque, i= nt ret) =20 aio_context_acquire(blk_get_aio_context(s->conf.conf.blk)); if (ret) { - if (virtio_blk_handle_rw_error(req, -ret, 0)) { + if (virtio_blk_handle_rw_error(req, -ret, 0, true)) { goto out; } } --=20 2.20.1