summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-08-01 15:04:00 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-08-01 15:04:00 +0000
commite94f3a609eb96471af2e4122ddfa1384b93b4ba8 (patch)
tree373bc53db7a72ddbdc425eb3aff7699b47537df3 /qemu-img.c
parentqemu-img: set encrypted disk image password (Laurent Vivier) (diff)
downloadqemu-kvm-e94f3a609eb96471af2e4122ddfa1384b93b4ba8.tar.gz
qemu-kvm-e94f3a609eb96471af2e4122ddfa1384b93b4ba8.tar.bz2
qemu-kvm-e94f3a609eb96471af2e4122ddfa1384b93b4ba8.zip
Revert 4977. Laurent asked for this not to be applied but I mistakenly applied
it. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4978 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/qemu-img.c b/qemu-img.c
index e2cc92635..f9d8b7d99 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -208,7 +208,6 @@ static int img_create(int argc, char **argv)
uint64_t size;
const char *p;
BlockDriver *drv;
- BlockDriverState *bs;
flags = 0;
for(;;) {
@@ -238,6 +237,7 @@ static int img_create(int argc, char **argv)
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 @@ static int img_create(int argc, char **argv)
error("Error while formatting");
}
}
- /* to set password */
- bs = bdrv_new_open(filename, NULL);
- bdrv_delete(bs);
return 0;
}