block.c (cfe4cade054c0e0d00d0185cdc433a9e3ce3e2e4) | block.c (a8b42a1c09e751b9f921a1a73756411fc118020b) |
---|---|
1/* 2 * QEMU System Emulator block driver 3 * 4 * Copyright (c) 2003 Fabrice Bellard 5 * 6 * Permission is hereby granted, free of charge, to any person obtaining a copy 7 * of this software and associated documentation files (the "Software"), to deal 8 * in the Software without restriction, including without limitation the rights --- 4474 unchanged lines hidden (view full) --- 4483 goto out; 4484 } 4485 } 4486 4487 backing_fmt = qemu_opt_get(opts, BLOCK_OPT_BACKING_FMT); 4488 4489 /* The size for the image must always be specified, unless we have a backing 4490 * file and we have not been forbidden from opening it. */ | 1/* 2 * QEMU System Emulator block driver 3 * 4 * Copyright (c) 2003 Fabrice Bellard 5 * 6 * Permission is hereby granted, free of charge, to any person obtaining a copy 7 * of this software and associated documentation files (the "Software"), to deal 8 * in the Software without restriction, including without limitation the rights --- 4474 unchanged lines hidden (view full) --- 4483 goto out; 4484 } 4485 } 4486 4487 backing_fmt = qemu_opt_get(opts, BLOCK_OPT_BACKING_FMT); 4488 4489 /* The size for the image must always be specified, unless we have a backing 4490 * file and we have not been forbidden from opening it. */ |
4491 size = qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 0); | 4491 size = qemu_opt_get_size(opts, BLOCK_OPT_SIZE, img_size); |
4492 if (backing_file && !(flags & BDRV_O_NO_BACKING)) { 4493 BlockDriverState *bs; 4494 char *full_backing = g_new0(char, PATH_MAX); 4495 int back_flags; 4496 QDict *backing_options = NULL; 4497 4498 bdrv_get_full_backing_filename_from_filename(filename, backing_file, 4499 full_backing, PATH_MAX, --- 543 unchanged lines hidden --- | 4492 if (backing_file && !(flags & BDRV_O_NO_BACKING)) { 4493 BlockDriverState *bs; 4494 char *full_backing = g_new0(char, PATH_MAX); 4495 int back_flags; 4496 QDict *backing_options = NULL; 4497 4498 bdrv_get_full_backing_filename_from_filename(filename, backing_file, 4499 full_backing, PATH_MAX, --- 543 unchanged lines hidden --- |