Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

[qemu.git] / nbd.c

diff --git a/nbd.c b/nbd.c
index d4dafc601974213ff35d63465adfb9841816b1e9..153709f628e4d63c2642af15f657a1e8f24d9ddc 100644 (file)
--- a/nbd.c
+++ b/nbd.c
@@ -842,6 +842,15 @@ static void nbd_trip(void *opaque)
     case NBD_CMD_READ:
         TRACE("Request type is READ");
 
+        if (request.type & NBD_CMD_FLAG_FUA) {
+            ret = bdrv_co_flush(exp->bs);
+            if (ret < 0) {
+                LOG("flush failed");
+                reply.error = -ret;
+                goto error_reply;
+            }
+        }
+
         ret = bdrv_read(exp->bs, (request.from + exp->dev_offset) / 512,
                         req->data, request.len / 512);
         if (ret < 0) {