Revision 34b5d2c6 block/vmdk.c

b/block/vmdk.c
697 697
    int64_t flat_offset;
698 698
    char extent_path[PATH_MAX];
699 699
    BlockDriverState *extent_file;
700
    Error *local_err = NULL;
700 701

  
701 702
    while (*p) {
702 703
        /* parse extent line:
......
726 727

  
727 728
        path_combine(extent_path, sizeof(extent_path),
728 729
                desc_file_path, fname);
729
        ret = bdrv_file_open(&extent_file, extent_path, NULL, bs->open_flags);
730
        ret = bdrv_file_open(&extent_file, extent_path, NULL, bs->open_flags,
731
                             &local_err);
730 732
        if (ret) {
733
            qerror_report_err(local_err);
734
            error_free(local_err);
731 735
            return ret;
732 736
        }
733 737

  
......
1591 1595
        "ddb.geometry.heads = \"%d\"\n"
1592 1596
        "ddb.geometry.sectors = \"63\"\n"
1593 1597
        "ddb.adapterType = \"%s\"\n";
1598
    Error *local_err = NULL;
1594 1599

  
1595 1600
    if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) {
1596 1601
        return -EINVAL;
......
1653 1658
    }
1654 1659
    if (backing_file) {
1655 1660
        BlockDriverState *bs = bdrv_new("");
1656
        ret = bdrv_open(bs, backing_file, NULL, 0, NULL);
1661
        ret = bdrv_open(bs, backing_file, NULL, 0, NULL, &local_err);
1657 1662
        if (ret != 0) {
1663
            qerror_report_err(local_err);
1664
            error_free(local_err);
1658 1665
            bdrv_unref(bs);
1659 1666
            return ret;
1660 1667
        }

Also available in: Unified diff