Commit ceff3e1f authored by Mao Zhongyi's avatar Mao Zhongyi Committed by Stefan Hajnoczi
Browse files

hw/block: Use errp directly rather than local_err 



[Drop virtio_blk_data_plane_create() change that misinterprets return
value when the virtio transport does not support dataplane.
--Stefan]

Cc: John Snow <jsnow@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>

Signed-off-by: default avatarMao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: e77848d3735ba590f23ffbf8094379c646c33d79.1511317952.git.maozy.fnst@cn.fujitsu.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 9d3b1551

hw/block/fdc.c

+6 −11
Original line number Diff line number Diff line
@@ -473,16 +473,13 @@ static void fd_revalidate(FDrive *drv) 
static void fd_change_cb(void *opaque, bool load, Error **errp)

{

    FDrive *drive = opaque;

    Error *local_err = NULL;



    if (!load) {

        blk_set_perm(drive->blk, 0, BLK_PERM_ALL, &error_abort);

    } else {

        blkconf_apply_backend_options(drive->conf,

        if (!blkconf_apply_backend_options(drive->conf,

                                           blk_is_read_only(drive->blk), false,

                                      &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

                                           errp)) {

            return;

        }

    }
@@ -522,7 +519,6 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp) 
    FloppyDrive *dev = FLOPPY_DRIVE(qdev);

    FloppyBus *bus = FLOPPY_BUS(qdev->parent_bus);

    FDrive *drive;

    Error *local_err = NULL;

    int ret;



    if (dev->unit == -1) {
@@ -568,10 +564,9 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp) 
    dev->conf.rerror = BLOCKDEV_ON_ERROR_AUTO;

    dev->conf.werror = BLOCKDEV_ON_ERROR_AUTO;



    blkconf_apply_backend_options(&dev->conf, blk_is_read_only(dev->conf.blk),

                                  false, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

    if (!blkconf_apply_backend_options(&dev->conf,

                                       blk_is_read_only(dev->conf.blk),

                                       false, errp)) {

        return;

    }

hw/block/nvme.c

+2 −5
Original line number Diff line number Diff line
@@ -928,7 +928,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) 
    int i;

    int64_t bs_size;

    uint8_t *pci_conf;

    Error *local_err = NULL;



    if (!n->conf.blk) {

        error_setg(errp, "drive property not set");
@@ -947,10 +946,8 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) 
        return;

    }

    blkconf_blocksizes(&n->conf);

    blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk),

                                  false, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

    if (!blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk),

                                       false, errp)) {

        return;

    }

hw/block/virtio-blk.c

+5 −8
Original line number Diff line number Diff line
@@ -930,19 +930,16 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) 
    }



    blkconf_serial(&conf->conf, &conf->serial);

    blkconf_apply_backend_options(&conf->conf,

    if (!blkconf_apply_backend_options(&conf->conf,

                                       blk_is_read_only(conf->conf.blk), true,

                                  &err);

    if (err) {

        error_propagate(errp, err);

                                       errp)) {

        return;

    }

    s->original_wce = blk_enable_write_cache(conf->conf.blk);

    blkconf_geometry(&conf->conf, NULL, 65535, 255, 255, &err);

    if (err) {

        error_propagate(errp, err);

    if (!blkconf_geometry(&conf->conf, NULL, 65535, 255, 255, errp)) {

        return;

    }



    blkconf_blocksizes(&conf->conf);



    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,

hw/ide/qdev.c

+4 −8
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp) 
{

    IDEBus *bus = DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus);

    IDEState *s = bus->ifs + dev->unit;

    Error *err = NULL;

    int ret;



    if (!dev->conf.blk) {
@@ -191,16 +190,13 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp) 


    blkconf_serial(&dev->conf, &dev->serial);

    if (kind != IDE_CD) {

        blkconf_geometry(&dev->conf, &dev->chs_trans, 65535, 16, 255, &err);

        if (err) {

            error_propagate(errp, err);

        if (!blkconf_geometry(&dev->conf, &dev->chs_trans, 65535, 16, 255,

                              errp)) {

            return;

        }

    }

    blkconf_apply_backend_options(&dev->conf, kind == IDE_CD, kind != IDE_CD,

                                  &err);

    if (err) {

        error_propagate(errp, err);

    if (!blkconf_apply_backend_options(&dev->conf, kind == IDE_CD,

                                       kind != IDE_CD, errp)) {

        return;

    }

hw/scsi/scsi-disk.c

+4 −9
Original line number Diff line number Diff line
@@ -2332,7 +2332,6 @@ static void scsi_disk_unit_attention_reported(SCSIDevice *dev) 
static void scsi_realize(SCSIDevice *dev, Error **errp)

{

    SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev);

    Error *err = NULL;



    if (!s->qdev.conf.blk) {

        error_setg(errp, "drive property not set");
@@ -2356,17 +2355,13 @@ static void scsi_realize(SCSIDevice *dev, Error **errp) 
    }



    if (dev->type == TYPE_DISK) {

        blkconf_geometry(&dev->conf, NULL, 65535, 255, 255, &err);

        if (err) {

            error_propagate(errp, err);

        if (!blkconf_geometry(&dev->conf, NULL, 65535, 255, 255, errp)) {

            return;

        }

    }

    blkconf_apply_backend_options(&dev->conf,

    if (!blkconf_apply_backend_options(&dev->conf,

                                       blk_is_read_only(s->qdev.conf.blk),

                                  dev->type == TYPE_DISK, &err);

    if (err) {

        error_propagate(errp, err);

                                       dev->type == TYPE_DISK, errp)) {

        return;

    }