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
This commit is contained in:
		
							parent
							
								
									61fce45f12
								
							
						
					
					
						commit
						e94f3a609e
					
				| @ -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; | ||||
| } | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 aliguori
						aliguori