[Qemu-devel] [4978] Revert 4977.

[Qemu-devel] [4978] Revert 4977.

[Anthony Liguori]

Revision: 4978
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4978
Author:   aliguori
Date:     2008-08-01 15:04:00 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Revert 4977.  Laurent asked for this not to be applied but I mistakenly applied
it.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/qemu-img.c

Modified: trunk/qemu-img.c
===================================================================
--- trunk/qemu-img.c	2008-08-01 15:00:04 UTC (rev 4977)
+++ trunk/qemu-img.c	2008-08-01 15:04:00 UTC (rev 4978)
@@ -208,7 +208,6 @@
     uint64_t size;
     const char *p;
     BlockDriver *drv;
-    BlockDriverState *bs;
 
     flags = 0;
     for(;;) {
@@ -238,6 +237,7 @@
     filename = argv[optind++];
     size = 0;
     if (base_filename) {
+        BlockDriverState *bs;
         bs = bdrv_new_open(base_filename, NULL);
         bdrv_get_geometry(bs, &size);
         size *= 512;
@@ -279,9 +279,6 @@
             error("Error while formatting");
         }
     }
-    /* to set password */
-    bs = bdrv_new_open(filename, NULL);
-    bdrv_delete(bs);
     return 0;
 }