Revision 5eb45639 block.c
| b/block.c | ||
|---|---|---|
| 181 | 181 |
return NULL; |
| 182 | 182 |
} |
| 183 | 183 |
|
| 184 |
int bdrv_create2(BlockDriver *drv, |
|
| 185 |
const char *filename, int64_t size_in_sectors, |
|
| 186 |
const char *backing_file, const char *backing_format, |
|
| 187 |
int flags) |
|
| 188 |
{
|
|
| 189 |
if (drv->bdrv_create2) |
|
| 190 |
return drv->bdrv_create2(filename, size_in_sectors, backing_file, |
|
| 191 |
backing_format, flags); |
|
| 192 |
if (drv->bdrv_create) |
|
| 193 |
return drv->bdrv_create(filename, size_in_sectors, backing_file, |
|
| 194 |
flags); |
|
| 195 |
return -ENOTSUP; |
|
| 196 |
} |
|
| 197 |
|
|
| 184 | 198 |
int bdrv_create(BlockDriver *drv, |
| 185 | 199 |
const char *filename, int64_t size_in_sectors, |
| 186 | 200 |
const char *backing_file, int flags) |
| ... | ... | |
| 357 | 371 |
|
| 358 | 372 |
/* if there is a backing file, use it */ |
| 359 | 373 |
bs1 = bdrv_new("");
|
| 360 |
ret = bdrv_open(bs1, filename, 0);
|
|
| 374 |
ret = bdrv_open2(bs1, filename, 0, drv);
|
|
| 361 | 375 |
if (ret < 0) {
|
| 362 | 376 |
bdrv_delete(bs1); |
| 363 | 377 |
return ret; |
| ... | ... | |
| 378 | 392 |
else |
| 379 | 393 |
realpath(filename, backing_filename); |
| 380 | 394 |
|
| 381 |
ret = bdrv_create(&bdrv_qcow2, tmp_filename, |
|
| 382 |
total_size, backing_filename, 0); |
|
| 395 |
ret = bdrv_create2(&bdrv_qcow2, tmp_filename, |
|
| 396 |
total_size, backing_filename, |
|
| 397 |
(drv ? drv->format_name : NULL), 0); |
|
| 383 | 398 |
if (ret < 0) {
|
| 384 | 399 |
return ret; |
| 385 | 400 |
} |
| 386 | 401 |
filename = tmp_filename; |
| 402 |
drv = &bdrv_qcow2; |
|
| 387 | 403 |
bs->is_temporary = 1; |
| 388 | 404 |
} |
| 389 | 405 |
|
| ... | ... | |
| 429 | 445 |
#endif |
| 430 | 446 |
if (bs->backing_file[0] != '\0') {
|
| 431 | 447 |
/* if there is a backing file, use it */ |
| 448 |
BlockDriver *back_drv = NULL; |
|
| 432 | 449 |
bs->backing_hd = bdrv_new("");
|
| 433 | 450 |
path_combine(backing_filename, sizeof(backing_filename), |
| 434 | 451 |
filename, bs->backing_file); |
| 435 |
ret = bdrv_open(bs->backing_hd, backing_filename, open_flags); |
|
| 452 |
if (bs->backing_format[0] != '\0') |
|
| 453 |
back_drv = bdrv_find_format(bs->backing_format); |
|
| 454 |
ret = bdrv_open2(bs->backing_hd, backing_filename, open_flags, |
|
| 455 |
back_drv); |
|
| 436 | 456 |
if (ret < 0) {
|
| 437 | 457 |
bdrv_close(bs); |
| 438 | 458 |
return ret; |
Also available in: Unified diff