Commit 92d48558 authored by Luiz Capitulino's avatar Luiz Capitulino
Browse files

block: eject_device(): Use error_set() 



Also drops the leftover 'mon' argument.

This is a preparation for the next commits which will port the
eject and change commands to the QAPI.

Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 9ad5372d

blockdev.c

+22 −8
Original line number Diff line number Diff line
@@ -665,21 +665,22 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file, 
    }

}



static int eject_device(Monitor *mon, BlockDriverState *bs, int force)

static void eject_device(BlockDriverState *bs, int force, Error **errp)

{

    if (!bdrv_dev_has_removable_media(bs)) {

        qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));

        return -1;

        error_set(errp, QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));

        return;

    }



    if (bdrv_dev_is_medium_locked(bs) && !bdrv_dev_is_tray_open(bs)) {

        bdrv_dev_eject_request(bs, force);

        if (!force) {

            qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));

            return -1;

            error_set(errp, QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));

            return;

        }

    }



    bdrv_close(bs);

    return 0;

}



int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)
@@ -687,13 +688,22 @@ int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) 
    BlockDriverState *bs;

    int force = qdict_get_try_bool(qdict, "force", 0);

    const char *filename = qdict_get_str(qdict, "device");

    Error *err = NULL;



    bs = bdrv_find(filename);

    if (!bs) {

        qerror_report(QERR_DEVICE_NOT_FOUND, filename);

        return -1;

    }

    return eject_device(mon, bs, force);



    eject_device(bs, force, &err);

    if (error_is_set(&err)) {

        qerror_report_err(err);

        error_free(err);

        return -1;

    }



    return 0;

}



void qmp_block_passwd(const char *device, const char *password, Error **errp)
@@ -723,6 +733,7 @@ int do_change_block(Monitor *mon, const char *device, 
    BlockDriverState *bs;

    BlockDriver *drv = NULL;

    int bdrv_flags;

    Error *err = NULL;



    bs = bdrv_find(device);

    if (!bs) {
@@ -736,7 +747,10 @@ int do_change_block(Monitor *mon, const char *device, 
            return -1;

        }

    }

    if (eject_device(mon, bs, 0) < 0) {

    eject_device(bs, 0, &err);

    if (error_is_set(&err)) {

        qerror_report_err(err);

        error_free(err);

        return -1;

    }

    bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR;