Revision 0fea6b79

b/block/qed.c
398 398
        char buf[64];
399 399
        snprintf(buf, sizeof(buf), "%" PRIx64,
400 400
            s->header.features & ~QED_FEATURE_MASK);
401
        qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
401
        error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
402 402
            bs->device_name, "QED", buf);
403 403
        return -ENOTSUP;
404 404
    }
......
545 545

  
546 546
static int qed_create(const char *filename, uint32_t cluster_size,
547 547
                      uint64_t image_size, uint32_t table_size,
548
                      const char *backing_file, const char *backing_fmt)
548
                      const char *backing_file, const char *backing_fmt,
549
                      Error **errp)
549 550
{
550 551
    QEDHeader header = {
551 552
        .magic = QED_MAGIC,
......
566 567

  
567 568
    ret = bdrv_create_file(filename, NULL, &local_err);
568 569
    if (ret < 0) {
569
        qerror_report_err(local_err);
570
        error_free(local_err);
570
        error_propagate(errp, local_err);
571 571
        return ret;
572 572
    }
573 573

  
......
576 576
                    BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, NULL,
577 577
                    &local_err);
578 578
    if (ret < 0) {
579
        qerror_report_err(local_err);
580
        error_free(local_err);
579
        error_propagate(errp, local_err);
581 580
        return ret;
582 581
    }
583 582

  
......
667 666
    }
668 667

  
669 668
    return qed_create(filename, cluster_size, image_size, table_size,
670
                      backing_file, backing_fmt);
669
                      backing_file, backing_fmt, errp);
671 670
}
672 671

  
673 672
typedef struct {

Also available in: Unified diff