From aeb91c1e13d574ce71a408fb4cf836fbc45b40ab Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 10 Feb 2010 23:49:54 -0200 Subject: Monitor: Convert do_closefd() to cmd_new_ret() Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori --- monitor.c | 5 +++-- qemu-monitor.hx | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 9466c63ba..9338d13e8 100644 --- a/monitor.c +++ b/monitor.c @@ -2447,7 +2447,7 @@ static int do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } -static void do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) +static int do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *fdname = qdict_get_str(qdict, "fdname"); mon_fd_t *monfd; @@ -2461,10 +2461,11 @@ static void do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) close(monfd->fd); qemu_free(monfd->name); qemu_free(monfd); - return; + return 0; } qemu_error_new(QERR_FD_NOT_FOUND, fdname); + return -1; } static void do_loadvm(Monitor *mon, const QDict *qdict) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index e8e2ee1a2..6e84f7604 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1100,7 +1100,7 @@ ETEXI .params = "closefd name", .help = "close a file descriptor previously passed via SCM rights", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_closefd, + .cmd_new_ret = do_closefd, }, STEXI -- cgit v1.2.3