OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: eject_device(): Use error_set()

Browse Source 
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: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-12-07 15:47:23 -02:00
parent 9ad5372daa
commit 92d48558ed
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
blockdev.c
View File

@ -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)) { if (!bdrv_dev_has_removable_media(bs)) {
qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs)); error_set(errp, QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));
return -1; return;
} }
if (bdrv_dev_is_medium_locked(bs) && !bdrv_dev_is_tray_open(bs)) { if (bdrv_dev_is_medium_locked(bs) && !bdrv_dev_is_tray_open(bs)) {
bdrv_dev_eject_request(bs, force); bdrv_dev_eject_request(bs, force);
if (!force) { if (!force) {
qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); error_set(errp, QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));
return -1; return;
} }
} }
bdrv_close(bs); bdrv_close(bs);
return 0;
} }
int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) 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; BlockDriverState *bs;
int force = qdict_get_try_bool(qdict, "force", 0); int force = qdict_get_try_bool(qdict, "force", 0);
const char *filename = qdict_get_str(qdict, "device"); const char *filename = qdict_get_str(qdict, "device");
Error *err = NULL;
bs = bdrv_find(filename); bs = bdrv_find(filename);
if (!bs) { if (!bs) {
qerror_report(QERR_DEVICE_NOT_FOUND, filename); qerror_report(QERR_DEVICE_NOT_FOUND, filename);
return -1; 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) 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; BlockDriverState *bs;
BlockDriver *drv = NULL; BlockDriver *drv = NULL;
int bdrv_flags; int bdrv_flags;
Error *err = NULL;
bs = bdrv_find(device); bs = bdrv_find(device);
if (!bs) { if (!bs) {
@ -736,7 +747,10 @@ int do_change_block(Monitor *mon, const char *device,
return -1; 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; return -1;
} }
bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR; bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR;