block: Error parameter for open functions

[qemu.git] / block / blkverify.c

diff --git a/block/blkverify.c b/block/blkverify.c
index c4e961eeb11817962f27d2708da5c654f6f81bdb..bff95d2a450057c7bae021ff564d08ca93e97f3c 100644 (file)
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -116,7 +116,8 @@ static QemuOptsList runtime_opts = {
     },
 };
 
     },
 };
 

-static int blkverify_open(BlockDriverState *bs, QDict *options, int flags)
+static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
+                          Error **errp)

 {
     BDRVBlkverifyState *s = bs->opaque;
     QemuOpts *opts;
 {
     BDRVBlkverifyState *s = bs->opaque;
     QemuOpts *opts;


@@ -140,8 +141,10 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags)
         goto fail;
     }
 
         goto fail;
     }
 

-    ret = bdrv_file_open(&bs->file, raw, NULL, flags);
+    ret = bdrv_file_open(&bs->file, raw, NULL, flags, &local_err);

     if (ret < 0) {
     if (ret < 0) {

+        qerror_report_err(local_err);
+        error_free(local_err);

         goto fail;
     }
 
         goto fail;
     }
 


@@ -153,8 +156,10 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags)
     }
 
     s->test_file = bdrv_new("");
     }
 
     s->test_file = bdrv_new("");

-    ret = bdrv_open(s->test_file, filename, NULL, flags, NULL);
+    ret = bdrv_open(s->test_file, filename, NULL, flags, NULL, &local_err);

     if (ret < 0) {
     if (ret < 0) {

+        qerror_report_err(local_err);
+        error_free(local_err);

         bdrv_unref(s->test_file);
         s->test_file = NULL;
         goto fail;
         bdrv_unref(s->test_file);
         s->test_file = NULL;
         goto fail;