From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 20 Oct 2010 11:17:30 +0000 (+0200)
Subject: virtio-blk: Respect werror option for flushes
X-Git-Tag: qemu-xen-4.2.0~2153^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8c269b542c5bbbcd74c1664959b223d941a2893b;p=qemu-upstream-4.2-testing.git

virtio-blk: Respect werror option for flushes

The werror option now affects not only write requests, but also flush requests.
Previously, it was not possible to stop a VM on a failed flush.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index a1df26dbc..dbe207070 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -106,7 +106,13 @@ static void virtio_blk_flush_complete(void *opaque, int ret)
 {
     VirtIOBlockReq *req = opaque;
 
-    virtio_blk_req_complete(req, ret ? VIRTIO_BLK_S_IOERR : VIRTIO_BLK_S_OK);
+    if (ret) {
+        if (virtio_blk_handle_rw_error(req, -ret, 0)) {
+            return;
+        }
+    }
+
+    virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
 }
 
 static VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s)