Revision de9c0cec blockdev.c
| b/blockdev.c | ||
|---|---|---|
| 635 | 635 |
error_report("warning: disabling copy_on_read on readonly drive");
|
| 636 | 636 |
} |
| 637 | 637 |
|
| 638 |
ret = bdrv_open(dinfo->bdrv, file, bdrv_flags, drv); |
|
| 638 |
ret = bdrv_open(dinfo->bdrv, file, NULL, bdrv_flags, drv);
|
|
| 639 | 639 |
if (ret < 0) {
|
| 640 | 640 |
if (ret == -EMEDIUMTYPE) {
|
| 641 | 641 |
error_report("could not open disk image %s: not in %s format",
|
| ... | ... | |
| 820 | 820 |
|
| 821 | 821 |
/* We will manually add the backing_hd field to the bs later */ |
| 822 | 822 |
states->new_bs = bdrv_new("");
|
| 823 |
ret = bdrv_open(states->new_bs, new_image_file, |
|
| 823 |
/* TODO Inherit bs->options or only take explicit options with an |
|
| 824 |
* extended QMP command? */ |
|
| 825 |
ret = bdrv_open(states->new_bs, new_image_file, NULL, |
|
| 824 | 826 |
flags | BDRV_O_NO_BACKING, drv); |
| 825 | 827 |
if (ret != 0) {
|
| 826 | 828 |
error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file); |
| ... | ... | |
| 921 | 923 |
int bdrv_flags, BlockDriver *drv, |
| 922 | 924 |
const char *password, Error **errp) |
| 923 | 925 |
{
|
| 924 |
if (bdrv_open(bs, filename, bdrv_flags, drv) < 0) {
|
|
| 926 |
if (bdrv_open(bs, filename, NULL, bdrv_flags, drv) < 0) {
|
|
| 925 | 927 |
error_set(errp, QERR_OPEN_FILE_FAILED, filename); |
| 926 | 928 |
return; |
| 927 | 929 |
} |
| ... | ... | |
| 1330 | 1332 |
* file. |
| 1331 | 1333 |
*/ |
| 1332 | 1334 |
target_bs = bdrv_new("");
|
| 1333 |
ret = bdrv_open(target_bs, target, flags | BDRV_O_NO_BACKING, drv); |
|
| 1335 |
ret = bdrv_open(target_bs, target, NULL, flags | BDRV_O_NO_BACKING, drv);
|
|
| 1334 | 1336 |
|
| 1335 | 1337 |
if (ret < 0) {
|
| 1336 | 1338 |
bdrv_delete(target_bs); |
Also available in: Unified diff