monitor: convert do_eject() to QError
Also affects do_change(), because the two share eject_device(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
5cfe026475
commit
2c2a6bb860
|
@ -748,11 +748,12 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
|
||||||
if (bdrv_is_inserted(bs)) {
|
if (bdrv_is_inserted(bs)) {
|
||||||
if (!force) {
|
if (!force) {
|
||||||
if (!bdrv_is_removable(bs)) {
|
if (!bdrv_is_removable(bs)) {
|
||||||
monitor_printf(mon, "device is not removable\n");
|
qemu_error_new(QERR_DEVICE_NOT_REMOVABLE,
|
||||||
|
bdrv_get_device_name(bs));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (bdrv_is_locked(bs)) {
|
if (bdrv_is_locked(bs)) {
|
||||||
monitor_printf(mon, "device is locked\n");
|
qemu_error_new(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -769,7 +770,7 @@ static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)
|
||||||
|
|
||||||
bs = bdrv_find(filename);
|
bs = bdrv_find(filename);
|
||||||
if (!bs) {
|
if (!bs) {
|
||||||
monitor_printf(mon, "device not found\n");
|
qemu_error_new(QERR_DEVICE_NOT_FOUND, filename);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
eject_device(mon, bs, force);
|
eject_device(mon, bs, force);
|
||||||
|
|
Loading…
Reference in a new issue