Revision d5124c00

b/block.c
401 401
    CreateCo *cco = opaque;
402 402
    assert(cco->drv);
403 403

  
404
    cco->ret = cco->drv->bdrv_create(cco->filename, cco->options);
404
    cco->ret = cco->drv->bdrv_create(cco->filename, cco->options, NULL);
405 405
}
406 406

  
407 407
int bdrv_create(BlockDriver *drv, const char* filename,
b/block/cow.c
295 295
{
296 296
}
297 297

  
298
static int cow_create(const char *filename, QEMUOptionParameter *options)
298
static int cow_create(const char *filename, QEMUOptionParameter *options,
299
                      Error **errp)
299 300
{
300 301
    struct cow_header_v2 cow_header;
301 302
    struct stat st;
b/block/gluster.c
357 357
}
358 358

  
359 359
static int qemu_gluster_create(const char *filename,
360
        QEMUOptionParameter *options)
360
        QEMUOptionParameter *options, Error **errp)
361 361
{
362 362
    struct glfs *glfs;
363 363
    struct glfs_fd *fd;
b/block/iscsi.c
1238 1238
    return 0;
1239 1239
}
1240 1240

  
1241
static int iscsi_create(const char *filename, QEMUOptionParameter *options)
1241
static int iscsi_create(const char *filename, QEMUOptionParameter *options,
1242
                        Error **errp)
1242 1243
{
1243 1244
    int ret = 0;
1244 1245
    int64_t total_size = 0;
b/block/qcow.c
659 659
    error_free(s->migration_blocker);
660 660
}
661 661

  
662
static int qcow_create(const char *filename, QEMUOptionParameter *options)
662
static int qcow_create(const char *filename, QEMUOptionParameter *options,
663
                       Error **errp)
663 664
{
664 665
    int header_size, backing_filename_len, l1_size, shift, i;
665 666
    QCowHeader header;
b/block/qcow2.c
1468 1468
    return ret;
1469 1469
}
1470 1470

  
1471
static int qcow2_create(const char *filename, QEMUOptionParameter *options)
1471
static int qcow2_create(const char *filename, QEMUOptionParameter *options,
1472
                        Error **errp)
1472 1473
{
1473 1474
    const char *backing_file = NULL;
1474 1475
    const char *backing_fmt = NULL;
b/block/qed.c
604 604
    return ret;
605 605
}
606 606

  
607
static int bdrv_qed_create(const char *filename, QEMUOptionParameter *options)
607
static int bdrv_qed_create(const char *filename, QEMUOptionParameter *options,
608
                           Error **errp)
608 609
{
609 610
    uint64_t image_size = 0;
610 611
    uint32_t cluster_size = QED_DEFAULT_CLUSTER_SIZE;
b/block/raw-posix.c
1041 1041
    return (int64_t)st.st_blocks * 512;
1042 1042
}
1043 1043

  
1044
static int raw_create(const char *filename, QEMUOptionParameter *options)
1044
static int raw_create(const char *filename, QEMUOptionParameter *options,
1045
                      Error **errp)
1045 1046
{
1046 1047
    int fd;
1047 1048
    int result = 0;
......
1506 1507
                       cb, opaque, QEMU_AIO_DISCARD|QEMU_AIO_BLKDEV);
1507 1508
}
1508 1509

  
1509
static int hdev_create(const char *filename, QEMUOptionParameter *options)
1510
static int hdev_create(const char *filename, QEMUOptionParameter *options,
1511
                       Error **errp)
1510 1512
{
1511 1513
    int fd;
1512 1514
    int ret = 0;
b/block/raw-win32.c
422 422
    return st.st_size;
423 423
}
424 424

  
425
static int raw_create(const char *filename, QEMUOptionParameter *options)
425
static int raw_create(const char *filename, QEMUOptionParameter *options,
426
                      Error **errp)
426 427
{
427 428
    int fd;
428 429
    int64_t total_size = 0;
b/block/raw_bsd.c
130 130
    return bdrv_has_zero_init(bs->file);
131 131
}
132 132

  
133
static int raw_create(const char *filename, QEMUOptionParameter *options)
133
static int raw_create(const char *filename, QEMUOptionParameter *options,
134
                      Error **errp)
134 135
{
135 136
    return bdrv_create_file(filename, options);
136 137
}
b/block/rbd.c
287 287
    return ret;
288 288
}
289 289

  
290
static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options)
290
static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options,
291
                           Error **errp)
291 292
{
292 293
    int64_t bytes = 0;
293 294
    int64_t objsize;
b/block/sheepdog.c
1438 1438
    return ret;
1439 1439
}
1440 1440

  
1441
static int sd_create(const char *filename, QEMUOptionParameter *options)
1441
static int sd_create(const char *filename, QEMUOptionParameter *options,
1442
                     Error **errp)
1442 1443
{
1443 1444
    int ret = 0;
1444 1445
    uint32_t vid = 0, base_vid = 0;
b/block/ssh.c
651 651
    { NULL }
652 652
};
653 653

  
654
static int ssh_create(const char *filename, QEMUOptionParameter *options)
654
static int ssh_create(const char *filename, QEMUOptionParameter *options,
655
                      Error **errp)
655 656
{
656 657
    int r, ret;
657 658
    Error *local_err = NULL;
b/block/vdi.c
645 645
    return ret;
646 646
}
647 647

  
648
static int vdi_create(const char *filename, QEMUOptionParameter *options)
648
static int vdi_create(const char *filename, QEMUOptionParameter *options,
649
                      Error **errp)
649 650
{
650 651
    int fd;
651 652
    int result = 0;
b/block/vmdk.c
1552 1552
    return VMDK_OK;
1553 1553
}
1554 1554

  
1555
static int vmdk_create(const char *filename, QEMUOptionParameter *options)
1555
static int vmdk_create(const char *filename, QEMUOptionParameter *options,
1556
                       Error **errp)
1556 1557
{
1557 1558
    int fd, idx = 0;
1558 1559
    char desc[BUF_SIZE];
b/block/vpc.c
684 684
    return ret;
685 685
}
686 686

  
687
static int vpc_create(const char *filename, QEMUOptionParameter *options)
687
static int vpc_create(const char *filename, QEMUOptionParameter *options,
688
                      Error **errp)
688 689
{
689 690
    uint8_t buf[1024];
690 691
    struct vhd_footer *footer = (struct vhd_footer *) buf;
b/include/block/block_int.h
90 90
                      const uint8_t *buf, int nb_sectors);
91 91
    void (*bdrv_close)(BlockDriverState *bs);
92 92
    void (*bdrv_rebind)(BlockDriverState *bs);
93
    int (*bdrv_create)(const char *filename, QEMUOptionParameter *options);
93
    int (*bdrv_create)(const char *filename, QEMUOptionParameter *options,
94
                       Error **errp);
94 95
    int (*bdrv_set_key)(BlockDriverState *bs, const char *key);
95 96
    int (*bdrv_make_empty)(BlockDriverState *bs);
96 97
    /* aio */

Also available in: Unified diff