Commit c245b6a3 authored by Luiz Capitulino's avatar Luiz Capitulino
Browse files

qapi: Convert eject 



Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 92d48558

blockdev.c

+5 −15
Original line number Diff line number Diff line
@@ -683,27 +683,17 @@ static void eject_device(BlockDriverState *bs, int force, Error **errp) 
    bdrv_close(bs);

}



int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)

void qmp_eject(const char *device, bool has_force, bool force, Error **errp)

{

    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);

    bs = bdrv_find(device);

    if (!bs) {

        qerror_report(QERR_DEVICE_NOT_FOUND, filename);

        return -1;

    }



    eject_device(bs, force, &err);

    if (error_is_set(&err)) {

        qerror_report_err(err);

        error_free(err);

        return -1;

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        return;

    }



    return 0;

    eject_device(bs, force, errp);

}



void qmp_block_passwd(const char *device, const char *password, Error **errp)

blockdev.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi); 
DriveInfo *add_init_drive(const char *opts);



void do_commit(Monitor *mon, const QDict *qdict);

int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data);

int do_change_block(Monitor *mon, const char *device,

                    const char *filename, const char *fmt);

int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data);

hmp-commands.hx

+1 −2
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ ETEXI 
        .args_type  = "force:-f,device:B",

        .params     = "[-f] device",

        .help       = "eject a removable medium (use -f to force it)",

        .user_print = monitor_user_noop,

        .mhandler.cmd_new = do_eject,

        .mhandler.cmd = hmp_eject,

    },



STEXI

hmp.c

+10 −0
Original line number Diff line number Diff line
@@ -702,3 +702,13 @@ void hmp_expire_password(Monitor *mon, const QDict *qdict) 
    qmp_expire_password(protocol, whenstr, &err);

    hmp_handle_error(mon, &err);

}



void hmp_eject(Monitor *mon, const QDict *qdict)

{

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

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

    Error *err = NULL;



    qmp_eject(device, true, force, &err);

    hmp_handle_error(mon, &err);

}

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -51,5 +51,6 @@ void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); 
void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict);

void hmp_set_password(Monitor *mon, const QDict *qdict);

void hmp_expire_password(Monitor *mon, const QDict *qdict);

void hmp_eject(Monitor *mon, const QDict *qdict);



#endif