aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2010-02-10 23:49:50 -0200
committerAnthony Liguori <aliguori@us.ibm.com>2010-02-19 15:18:16 -0600
commit9b9d4d9c79ee7072629f36ea123a28a89ada8845 (patch)
treecad9638a32bc904dddffe2395dc6e376081b8768
parentd5a7b38f5c9f28c258595f327e28a1b88ffd370f (diff)
Monitor: Convert do_eject() to cmd_new_ret()
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--monitor.c6
-rw-r--r--qemu-monitor.hx2
2 files changed, 4 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index cede36879..e960c3831 100644
--- a/monitor.c
+++ b/monitor.c
@@ -989,7 +989,7 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
return 0;
}
-static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)
+static int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
BlockDriverState *bs;
int force = qdict_get_int(qdict, "force");
@@ -998,9 +998,9 @@ static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)
bs = bdrv_find(filename);
if (!bs) {
qemu_error_new(QERR_DEVICE_NOT_FOUND, filename);
- return;
+ return -1;
}
- eject_device(mon, bs, force);
+ return eject_device(mon, bs, force);
}
static void do_block_set_passwd(Monitor *mon, const QDict *qdict,
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 0eab6db65..c1bd77335 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -138,7 +138,7 @@ ETEXI
.params = "[-f] device",
.help = "eject a removable medium (use -f to force it)",
.user_print = monitor_user_noop,
- .mhandler.cmd_new = do_eject,
+ .cmd_new_ret = do_eject,
},
STEXI