From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfOCQ-0006r6-PB for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:34 -0500 Received: from [199.232.76.173] (port=57722 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOCQ-0006qb-0M for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:34 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfOCO-0001GY-Lk for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10679) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfOCO-0001GQ-8W for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:32 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1oV3S018966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Feb 2010 20:50:31 -0500 From: Luiz Capitulino Date: Wed, 10 Feb 2010 23:49:53 -0200 Message-Id: <1265853007-27300-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> References: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 07/21] Monitor: Convert do_getfd() to cmd_new_ret() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com Signed-off-by: Luiz Capitulino --- monitor.c | 11 ++++++----- qemu-monitor.hx | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 0ae408a..9466c63 100644 --- a/monitor.c +++ b/monitor.c @@ -2403,7 +2403,7 @@ static void do_inject_mce(Monitor *mon, const QDict *qdict) } #endif -static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) +static int do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *fdname = qdict_get_str(qdict, "fdname"); mon_fd_t *monfd; @@ -2412,12 +2412,12 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) fd = qemu_chr_get_msgfd(mon->chr); if (fd == -1) { qemu_error_new(QERR_FD_NOT_SUPPLIED); - return; + return -1; } if (qemu_isdigit(fdname[0])) { qemu_error_new(QERR_INVALID_PARAMETER, "fdname"); - return; + return -1; } fd = dup(fd); @@ -2426,7 +2426,7 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) qemu_error_new(QERR_TOO_MANY_FILES); else qemu_error_new(QERR_UNDEFINED_ERROR); - return; + return -1; } QLIST_FOREACH(monfd, &mon->fds, next) { @@ -2436,7 +2436,7 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) close(monfd->fd); monfd->fd = fd; - return; + return 0; } monfd = qemu_mallocz(sizeof(mon_fd_t)); @@ -2444,6 +2444,7 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) monfd->fd = fd; QLIST_INSERT_HEAD(&mon->fds, monfd, next); + return 0; } static void do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index d2be5c4..e8e2ee1 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1083,7 +1083,7 @@ ETEXI .params = "getfd name", .help = "receive a file descriptor via SCM rights and assign it a name", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_getfd, + .cmd_new_ret = do_getfd, }, STEXI -- 1.6.6