gwj / at91sam9263 · Commits

Commit 61fce45f12964d8775313e3c7f56318bac913902

Authored by aliguori
1 parent 396f9297

qemu-img: set encrypted disk image password (Laurent Vivier) 

This patch modify qemu-img to ask and set a password when an encrypted
disk image is created.

Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4977 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
qemu-img.c
  View file @61fce45
@@ -208,6 +208,7 @@ static int img_create(int argc, char **argv) @@ -208,6 +208,7 @@ static int img_create(int argc, char **argv)
208 uint64_t size; 208 uint64_t size;
209 const char *p; 209 const char *p;
210 BlockDriver *drv; 210 BlockDriver *drv;
  211 + BlockDriverState *bs;
211 212
212 flags = 0; 213 flags = 0;
213 for(;;) { 214 for(;;) {
@@ -237,7 +238,6 @@ static int img_create(int argc, char **argv) @@ -237,7 +238,6 @@ static int img_create(int argc, char **argv)
237 filename = argv[optind++]; 238 filename = argv[optind++];
238 size = 0; 239 size = 0;
239 if (base_filename) { 240 if (base_filename) {
240 - BlockDriverState *bs;  
241 bs = bdrv_new_open(base_filename, NULL); 241 bs = bdrv_new_open(base_filename, NULL);
242 bdrv_get_geometry(bs, &size); 242 bdrv_get_geometry(bs, &size);
243 size *= 512; 243 size *= 512;
@@ -279,6 +279,9 @@ static int img_create(int argc, char **argv) @@ -279,6 +279,9 @@ static int img_create(int argc, char **argv)
279 error("Error while formatting"); 279 error("Error while formatting");
280 } 280 }
281 } 281 }
  282 + /* to set password */
  283 + bs = bdrv_new_open(filename, NULL);
  284 + bdrv_delete(bs);
282 return 0; 285 return 0;
283 } 286 }
284 287