From patchwork Fri Jun 8 14:53:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Bryant X-Patchwork-Id: 163790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 12290B6EF3 for ; Sat, 9 Jun 2012 01:27:19 +1000 (EST) Received: from localhost ([::1]:45857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sd15o-000614-RC for incoming@patchwork.ozlabs.org; Fri, 08 Jun 2012 11:27:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sd15f-00060i-D8 for qemu-devel@nongnu.org; Fri, 08 Jun 2012 11:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sd15d-0003jQ-5A for qemu-devel@nongnu.org; Fri, 08 Jun 2012 11:27:06 -0400 Received: from cpe-174-097-227-101.nc.res.rr.com ([174.97.227.101]:54167 helo=localhost.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sd15c-0003jD-UJ for qemu-devel@nongnu.org; Fri, 08 Jun 2012 11:27:05 -0400 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.14.5/8.14.5) with ESMTP id q58BQtXL001079; Fri, 8 Jun 2012 11:27:00 -0400 Received: (from corey@localhost) by localhost.localdomain (8.14.5/8.14.5/Submit) id q58ErxS9026321; Fri, 8 Jun 2012 10:53:59 -0400 From: Corey Bryant To: qemu-devel@nongnu.org Date: Fri, 8 Jun 2012 10:53:54 -0400 Message-Id: <1339167236-26287-3-git-send-email-coreyb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.2 In-Reply-To: <1339167236-26287-1-git-send-email-coreyb@linux.vnet.ibm.com> References: <1339167236-26287-1-git-send-email-coreyb@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 174.97.227.101 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, libvir-list@redhat.com, Corey Bryant , eblake@redhat.com Subject: [Qemu-devel] [PATCH v2 2/4] qapi: Add passfd QMP command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. 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",