From: Alberto Faria <afaria@redhat.com>
Date: Thu, 9 Jun 2022 15:27:44 +0000 (+0100)
Subject: block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty()
X-Git-Tag: v7.1.0-rc0~24^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86da43220c610321f31fad4be7f1b52554f4e7a4;p=thirdparty%2Fqemu.git

block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty()

Use bdrv_pwrite_sync() instead of calling bdrv_pwrite() and bdrv_flush()
separately.

Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220609152744.3891847-11-afaria@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---

diff --git a/block/qcow2.c b/block/qcow2.c
index f2fb54c51f9..90a2dd406b8 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -516,12 +516,9 @@ int qcow2_mark_dirty(BlockDriverState *bs)
     }
 
     val = cpu_to_be64(s->incompatible_features | QCOW2_INCOMPAT_DIRTY);
-    ret = bdrv_pwrite(bs->file, offsetof(QCowHeader, incompatible_features),
-                      sizeof(val), &val, 0);
-    if (ret < 0) {
-        return ret;
-    }
-    ret = bdrv_flush(bs->file->bs);
+    ret = bdrv_pwrite_sync(bs->file,
+                           offsetof(QCowHeader, incompatible_features),
+                           sizeof(val), &val, 0);
     if (ret < 0) {
         return ret;
     }