From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Seu9u-0003py-0X for qemu-devel@nongnu.org; Wed, 13 Jun 2012 16:27:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Seu9s-0007Rc-0K for qemu-devel@nongnu.org; Wed, 13 Jun 2012 16:27:17 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:38269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Seu9r-0007LA-GL for qemu-devel@nongnu.org; Wed, 13 Jun 2012 16:27:15 -0400 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 13 Jun 2012 14:27:11 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id B91F53E40054 for ; Wed, 13 Jun 2012 20:26:21 +0000 (WET) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5DKPkvu078140 for ; Wed, 13 Jun 2012 14:26:06 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5DKPU0F005396 for ; Wed, 13 Jun 2012 14:25:30 -0600 Message-ID: <4FD8F734.7030301@linux.vnet.ibm.com> Date: Wed, 13 Jun 2012 16:25:24 -0400 From: Corey Bryant MIME-Version: 1.0 References: <1339170179-2554-1-git-send-email-coreyb@linux.vnet.ibm.com> <1339170179-2554-3-git-send-email-coreyb@linux.vnet.ibm.com> <20120613164649.04b13706@doriath.home> In-Reply-To: <20120613164649.04b13706@doriath.home> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 2/4] qapi: Add passfd QMP command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, libvir-list@redhat.com, qemu-devel@nongnu.org, eblake@redhat.com On 06/13/2012 03:46 PM, Luiz Capitulino wrote: > On Fri, 8 Jun 2012 11:42:57 -0400 > Corey Bryant wrote: > >> This patch adds the passfd QMP command using the QAPI framework. >> Like the getfd command, it is used to pass a file descriptor via >> SCM_RIGHTS. However, the passfd command also returns the received >> file descriptor, which is a difference in behavior from the getfd >> command, which returns nothing. > > Let's call it pass-fd instead. Sure, that works for me. > > Also, getfd automatically closes a fd if an existing fdname is passed again. > I don't think this is a good behavior, I think pass-fd should fail instead > (note that we can't fix getfd though). > I agree. It makes sense to fail rather than blindly closing the existing fd. It can be closed explicitly with closefd if the user wants it closed. >> >> The closefd command can be used to close a file descriptor that was >> passed with the passfd command. >> >> v2: >> -Introduce new QMP command to pass/return fd (lcapitulino@redhat.com) >> -Use passfd as command name (berrange@redhat.com) >> >> Signed-off-by: Corey Bryant >> --- >> monitor.c | 14 ++++++++++---- >> qapi-schema.json | 15 +++++++++++++++ >> qmp-commands.hx | 27 +++++++++++++++++++++++++++ >> 3 files changed, 52 insertions(+), 4 deletions(-) >> >> diff --git a/monitor.c b/monitor.c >> index 4c53cb6..980a226 100644 >> --- a/monitor.c >> +++ b/monitor.c >> @@ -2182,7 +2182,7 @@ static void do_inject_mce(Monitor *mon, const QDict *qdict) >> } >> #endif >> >> -void qmp_getfd(const char *fdname, Error **errp) >> +int64_t qmp_passfd(const char *fdname, Error **errp) >> { >> mon_fd_t *monfd; >> int fd; >> @@ -2190,13 +2190,13 @@ void qmp_getfd(const char *fdname, Error **errp) >> fd = qemu_chr_fe_get_msgfd(cur_mon->chr); >> if (fd == -1) { >> error_set(errp, QERR_FD_NOT_SUPPLIED); >> - return; >> + return -1; >> } >> >> if (qemu_isdigit(fdname[0])) { >> error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdname", >> "a name not starting with a digit"); >> - return; >> + return -1; >> } >> >> QLIST_FOREACH(monfd, &cur_mon->fds, next) { >> @@ -2206,7 +2206,7 @@ void qmp_getfd(const char *fdname, Error **errp) >> >> close(monfd->fd); >> monfd->fd = fd; >> - return; >> + return fd; >> } >> >> monfd = g_malloc0(sizeof(mon_fd_t)); >> @@ -2214,6 +2214,12 @@ void qmp_getfd(const char *fdname, Error **errp) >> monfd->fd = fd; >> >> QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next); >> + return fd; >> +} >> + >> +void qmp_getfd(const char *fdname, Error **errp) >> +{ >> + qmp_passfd(fdname, errp); >> return; >> } >> >> diff --git a/qapi-schema.json b/qapi-schema.json >> index 6be1d90..15da1b8 100644 >> --- a/qapi-schema.json >> +++ b/qapi-schema.json >> @@ -1864,6 +1864,21 @@ >> { 'command': 'netdev_del', 'data': {'id': 'str'} } >> >> ## >> +# @passfd: >> +# >> +# Pass a file descriptor via SCM rights and assign it a name >> +# >> +# @fdname: file descriptor name >> +# >> +# Returns: The QEMU file descriptor that was received >> +# If file descriptor was not received, FdNotSupplied >> +# If @fdname is not valid, InvalidParameterType >> +# >> +# Since: 1.2.0 >> +## >> +{ 'command': 'passfd', 'data': {'fdname': 'str'}, 'returns': 'int' } >> + >> +## >> # @getfd: >> # >> # Receive a file descriptor via SCM rights and assign it a name >> diff --git a/qmp-commands.hx b/qmp-commands.hx >> index f8c0f68..338a0b3 100644 >> --- a/qmp-commands.hx >> +++ b/qmp-commands.hx >> @@ -869,6 +869,33 @@ Example: >> EQMP >> >> { >> + .name = "passfd", >> + .args_type = "fdname:s", >> + .params = "passfd name", >> + .help = "pass a file descriptor via SCM rights and assign it a name", >> + .mhandler.cmd_new = qmp_marshal_input_passfd, >> + }, >> + >> +SQMP >> +passfd >> +------ >> + >> +Pass a file descriptor via SCM rights and assign it a name. >> + >> +Arguments: >> + >> +- "fdname": file descriptor name (json-string) >> + >> +Return a json-int with the QEMU file descriptor that was received. >> + >> +Example: >> + >> +-> { "execute": "passfd", "arguments": { "fdname": "fd1" } } >> +<- { "return": 42 } >> + >> +EQMP >> + >> + { >> .name = "getfd", >> .args_type = "fdname:s", >> .params = "getfd name", > -- Regards, Corey