block: Error parameter for open functions

[qemu.git] / qemu-io.c

diff --git a/qemu-io.c b/qemu-io.c
index 71f4ff1302107a28e912393dcd8d25542265c164..f4b8efccebd44b284185110097695008ddb83cc4 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -46,21 +46,27 @@ static const cmdinfo_t close_cmd = {
 
 static int openfile(char *name, int flags, int growable)
 {
 
 static int openfile(char *name, int flags, int growable)
 {

+    Error *local_err = NULL;
+

     if (qemuio_bs) {
         fprintf(stderr, "file open already, try 'help close'\n");
         return 1;
     }
 
     if (growable) {
     if (qemuio_bs) {
         fprintf(stderr, "file open already, try 'help close'\n");
         return 1;
     }
 
     if (growable) {

-        if (bdrv_file_open(&qemuio_bs, name, NULL, flags)) {
-            fprintf(stderr, "%s: can't open device %s\n", progname, name);
+        if (bdrv_file_open(&qemuio_bs, name, NULL, flags, &local_err)) {
+            fprintf(stderr, "%s: can't open device %s: %s\n", progname, name,
+                    error_get_pretty(local_err));
+            error_free(local_err);

             return 1;
         }
     } else {
         qemuio_bs = bdrv_new("hda");
 
             return 1;
         }
     } else {
         qemuio_bs = bdrv_new("hda");
 

-        if (bdrv_open(qemuio_bs, name, NULL, flags, NULL) < 0) {
-            fprintf(stderr, "%s: can't open device %s\n", progname, name);
+        if (bdrv_open(qemuio_bs, name, NULL, flags, NULL, &local_err) < 0) {
+            fprintf(stderr, "%s: can't open device %s: %s\n", progname, name,
+                    error_get_pretty(local_err));
+            error_free(local_err);

             bdrv_unref(qemuio_bs);
             qemuio_bs = NULL;
             return 1;
             bdrv_unref(qemuio_bs);
             qemuio_bs = NULL;
             return 1;