From patchwork Mon Dec 7 20:37:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [FOR,0.12,07/18] monitor: convert do_eject() to QError Date: Mon, 07 Dec 2009 10:37:05 -0000 From: Markus Armbruster X-Patchwork-Id: 40541 Message-Id: <1260218236-22143-8-git-send-email-armbru@redhat.com> To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Also affects do_change(), because the two share eject_device(). Signed-off-by: Markus Armbruster --- monitor.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index b9d3d92..62d2ef5 100644 --- a/monitor.c +++ b/monitor.c @@ -778,11 +778,12 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force) if (bdrv_is_inserted(bs)) { if (!force) { 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; } 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; } } @@ -799,7 +800,7 @@ static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) bs = bdrv_find(filename); if (!bs) { - monitor_printf(mon, "device not found\n"); + qemu_error_new(QERR_DEVICE_NOT_FOUND, filename); return; } eject_device(mon, bs, force);