Revision 765003db block.c

b/block.c
832 832
        filename = qdict_get_try_str(options, "filename");
833 833
    }
834 834

  
835
    if (drv->bdrv_needs_filename && !filename) {
836
        error_setg(errp, "The '%s' block driver requires a file name",
837
                   drv->format_name);
838
        return -EINVAL;
839
    }
840

  
835 841
    trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name);
836 842

  
837 843
    node_name = qdict_get_try_str(options, "node-name");
......
1031 1037
            goto fail;
1032 1038
        }
1033 1039
        qdict_del(options, "filename");
1034
    } else if (drv->bdrv_needs_filename && !filename) {
1035
        error_setg(errp, "The '%s' block driver requires a file name",
1036
                   drv->format_name);
1037
        ret = -EINVAL;
1038
        goto fail;
1039 1040
    }
1040 1041

  
1041 1042
    if (!drv->bdrv_file_open) {

Also available in: Unified diff