commit 6b21b973ab9aa2bfc3ebfe1df4474466ceb4d88b
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Aug 23 21:14:37 2006 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Aug 23 21:14:37 2006 +0000
tree 964ab1307626c7e1737f15164527bf9cfaf09361
parent 2192c33250878c6e9c78820766afe42b73fd1c2f

fixed error handling


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2133 c046a42c-6fe2-441c-8c8c-71466251a162

block.c

diff --git a/block.c b/block.c
index 885b700..3b35500 100644
--- a/block.c
+++ b/block.c
@@ -365,6 +365,8 @@
     }
     if (ret < 0) {
         qemu_free(bs->opaque);
+        bs->opaque = NULL;
+        bs->drv = NULL;
         return ret;
     }
     if (drv->bdrv_getlength) {
@@ -381,7 +383,7 @@
         if (!bs->backing_hd) {
         fail:
             bdrv_close(bs);
-            return -1;
+            return -ENOMEM;
         }
         path_combine(backing_filename, sizeof(backing_filename),
                      filename, bs->backing_file);