[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FOR 0.12 PATCH 07/18] monitor: convert do_eject() to QErro
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [FOR 0.12 PATCH 07/18] monitor: convert do_eject() to QError |
Date: |
Mon, 7 Dec 2009 21:37:05 +0100 |
Also affects do_change(), because the two share eject_device().
Signed-off-by: Markus Armbruster <address@hidden>
---
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);
--
1.6.2.5
- Re: [Qemu-devel] Re: [FOR 0.12 PATCH 18/18] QMP: add human-readable description to error response, (continued)
[Qemu-devel] [FOR 0.12 PATCH 04/18] QError: Put error definitions in alphabetical order, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 09/18] QError: New QERR_SET_PASSWD_FAILED, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 13/18] monitor: convert do_closefd() to QError, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 14/18] QError: New QERR_FD_NOT_SUPPLIED, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 06/18] QError: New QERR_DEVICE_NOT_REMOVABLE, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 01/18] QError: new class for device encrypted errors, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 05/18] QError: New QERR_DEVICE_LOCKED, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 11/18] monitor: convert do_change() to QObject, QError, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 07/18] monitor: convert do_eject() to QError,
Markus Armbruster <=
[Qemu-devel] [FOR 0.12 PATCH 15/18] New QERR_INVALID_PARAMETER, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 03/18] monitor: Fix double-prompt after "change vnc passwd BLA", Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 02/18] monitor: do_cont(): Don't ask for passwords, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 17/18] monitor: convert do_getfd() to QError, Markus Armbruster, 2009/12/07
[Qemu-devel] Re: [FOR 0.12 PATCH 00/18] QError conversions and more, Luiz Capitulino, 2009/12/08