From nobody Sun May 19 11:06:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591874410; cv=none; d=zohomail.com; s=zohoarc; b=nlQnyR2TOyXf7b3iUYzLoS6BZyIRkCz57oMPzfevyfZawow372PkUKzhjSEERgQABXY+mY6fjn6cBSmgm4lm+c/0dZU1VoJ9/ekAx/s9ruAiUoJQ1VbqTTb0qNvOtwC5zRy7sE+9vJ0Y5WMMv2E3fiw8OAhhiSHA7JgNTiHmfp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591874410; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JZUM30HithXix6eV/zUUUkvVwY9gnckp++ff4Je8OQs=; b=T9S1Yn8uj3VeMHGDMj/1dgcp6nBC2VIUWuNmgHlEMdiUhKu+4v9oCAhwhS+Aaj+bxwwKY55205OPH7t17PDWmnR/Y/UlR1F2hqrVG9wae2scIrUmM4L7oVDG4hayux3FUdMs/XDp3R8UWcPceKTWwPRfn6IYnQ+Nf/ub5giZuHw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591874410537451.1160527682814; Thu, 11 Jun 2020 04:20:10 -0700 (PDT) Received: from localhost ([::1]:58952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjLFh-000587-2S for importer@patchew.org; Thu, 11 Jun 2020 07:20:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjLCu-0001nD-Vj for qemu-devel@nongnu.org; Thu, 11 Jun 2020 07:17:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48956 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jjLCs-0003zv-Qt for qemu-devel@nongnu.org; Thu, 11 Jun 2020 07:17:16 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-66-UmxToQNvOwy2iAuiSMW6jw-1; Thu, 11 Jun 2020 07:17:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0610B835B43 for ; Thu, 11 Jun 2020 11:17:11 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-116.ams2.redhat.com [10.36.114.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04A5D60BF3; Thu, 11 Jun 2020 11:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591874233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JZUM30HithXix6eV/zUUUkvVwY9gnckp++ff4Je8OQs=; b=FtlKd7LeEral8upcA1aAcIsg7AixxPbpf5f7vM8LyhCtTL0gwUXjh1Sg5C3ux2jOTO/vVv LqoYyB5BP87HQ/DTMXmCcra0uHVwhXo8WLjdL3OH6NBngBPgulDq8bxHV5qjBF/t7/jsx9 lXv2q7huTQkvxga1JzOTwHEcV2aKT3o= X-MC-Unique: UmxToQNvOwy2iAuiSMW6jw-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, armbru@redhat.com, thuth@redhat.com, quintela@redhat.com Subject: [PATCH 1/2] qmp: Add 'openfd' command Date: Thu, 11 Jun 2020 12:17:02 +0100 Message-Id: <20200611111703.159590-2-dgilbert@redhat.com> In-Reply-To: <20200611111703.159590-1-dgilbert@redhat.com> References: <20200611111703.159590-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=dgilbert@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 03:29:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" The existing 'getfd' command imports an fd from the monitor via SCM rights. This command allows qemu to open the file for itself; this is convenient primarily in testing, or with simple QMP clients. Signed-off-by: Dr. David Alan Gilbert --- monitor/misc.c | 48 ++++++++++++++++++++++++++++++++++++++---------- qapi/misc.json | 23 ++++++++++++++++++++++- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/monitor/misc.c b/monitor/misc.c index f5207cd242..d538af592a 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1230,22 +1230,20 @@ static void hmp_acl_remove(Monitor *mon, const QDic= t *qdict) } } =20 -void qmp_getfd(const char *fdname, Error **errp) +/* + * Add a named fd to the monitor list. + * Returns true on success. + */ +static bool addfd(const char *fdname, int fd, Error **errp) { mon_fd_t *monfd; - int fd, tmp_fd; - - fd =3D qemu_chr_fe_get_msgfd(&cur_mon->chr); - if (fd =3D=3D -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); - return; - } + int tmp_fd; =20 if (qemu_isdigit(fdname[0])) { close(fd); error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdname", "a name not starting with a digit"); - return; + return false; } =20 qemu_mutex_lock(&cur_mon->mon_lock); @@ -1259,7 +1257,7 @@ void qmp_getfd(const char *fdname, Error **errp) qemu_mutex_unlock(&cur_mon->mon_lock); /* Make sure close() is outside critical section */ close(tmp_fd); - return; + return true; } =20 monfd =3D g_malloc0(sizeof(mon_fd_t)); @@ -1268,6 +1266,36 @@ void qmp_getfd(const char *fdname, Error **errp) =20 QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next); qemu_mutex_unlock(&cur_mon->mon_lock); + + return true; +} + +void qmp_getfd(const char *fdname, Error **errp) +{ + int fd =3D qemu_chr_fe_get_msgfd(&cur_mon->chr); + if (fd =3D=3D -1) { + error_setg(errp, QERR_FD_NOT_SUPPLIED); + return; + } + + if (!addfd(fdname, fd, errp)) { + close(fd); + } +} + +void qmp_openfd(const char *fdname, const char *filename, Error **errp) +{ + int fd; + + fd =3D open(filename, O_RDWR | O_CREAT, S_IRWXU); + if (fd =3D=3D -1) { + error_setg_errno(errp, errno, "Cannot open file '%s'", filename); + return; + } + + if (!addfd(fdname, fd, errp)) { + close(fd); + } } =20 void qmp_closefd(const char *fdname, Error **errp) diff --git a/qapi/misc.json b/qapi/misc.json index 99b90ac80b..baec07358e 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -952,7 +952,7 @@ ## # @closefd: # -# Close a file descriptor previously passed via SCM rights +# Close a named file descriptor # # @fdname: file descriptor name # @@ -968,6 +968,27 @@ ## { 'command': 'closefd', 'data': {'fdname': 'str'} } =20 +## +# @openfd: +# +# Open a file descriptor. The file is opened read-write. +# +# @fdname: file descriptor name +# @filename: file name +# +# Returns: Nothing on success +# +# Since: 5.1 +# +# Example: +# +# -> { "execute": "openfd", "arguments": { "fdname": "null", +# "filename": "/dev/null" } } +# <- { "return": {} } +# +## +{ 'command': 'openfd', 'data': {'fdname': 'str', 'filename': 'str'} } + ## # @MemoryInfo: # --=20 2.26.2 From nobody Sun May 19 11:06:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591874342; cv=none; d=zohomail.com; s=zohoarc; b=c19vmhPc/oobaP5tsBjzuzLBtGuc9XFlw4qXMQb4vH1q4/pejB3Wxkn7vYfi6feqFR9CO8bST2ObRhL2t55b7c4cjWKWvXlwsaAalk1mDC84nGN37vnvLd0webI0GgKdT3paY9A35JOzmJjf04N3YapzrGLUALM+X+TjYqeriIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591874342; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xBfgtz5cZqbDBoicdnCS+gGmYNw/8M9z8Tjjd4WiQSU=; b=Hf+rRfmfviUJTLtDfLJJvriNtcpTGCe1asiKwbm6cUPAUy+UM6dzPvKsq5C3nJQbat9E+9mpt8gZaBKF2pkeau4U06g9kFwNDUvkH9EpmIMyOKoPtLw+ZY+HfXtg0wl6nEl3El/rnPGkrUKLbvmBsdWvmXXPei20HEPPn4q7kk0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591874342778106.00011214394533; Thu, 11 Jun 2020 04:19:02 -0700 (PDT) Received: from localhost ([::1]:54828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjLEa-0003RT-Gc for importer@patchew.org; Thu, 11 Jun 2020 07:19:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjLCx-0001nd-2J for qemu-devel@nongnu.org; Thu, 11 Jun 2020 07:17:19 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:44584 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jjLCu-000406-KK for qemu-devel@nongnu.org; Thu, 11 Jun 2020 07:17:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-419-_59sli9GNLWTJnybuanikQ-1; Thu, 11 Jun 2020 07:17:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54DFF80572E for ; Thu, 11 Jun 2020 11:17:12 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-116.ams2.redhat.com [10.36.114.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5270960BF3; Thu, 11 Jun 2020 11:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591874235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xBfgtz5cZqbDBoicdnCS+gGmYNw/8M9z8Tjjd4WiQSU=; b=MkezIBABelTvQ6WCorioz6h/2NgS48tujiv0eWaAittPTD1+XZkIj8WNGDfvzEuRUPZTeu MNZq0MoZLggIRdoAgKDHBkaH8xhsRTooJWy5mArlhtXUOnPp74ia8bQrHVZeNk5JgVaeOd Hjw1Hn1zi710ufFJ8h7aZ3yvvRgXRI4= X-MC-Unique: _59sli9GNLWTJnybuanikQ-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, armbru@redhat.com, thuth@redhat.com, quintela@redhat.com Subject: [PATCH 2/2] hmp: Add 'openfd' command Date: Thu, 11 Jun 2020 12:17:03 +0100 Message-Id: <20200611111703.159590-3-dgilbert@redhat.com> In-Reply-To: <20200611111703.159590-1-dgilbert@redhat.com> References: <20200611111703.159590-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 03:29:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Wire up the hmp 'openfd' to open a file and add it to the monitor's fd stash. Example usage: (qemu) openfd mig "my.mig" (qemu) migrate -d "fd:mig" Signed-off-by: Dr. David Alan Gilbert --- hmp-commands.hx | 16 +++++++++++++++- include/monitor/hmp.h | 1 + monitor/hmp-cmds.c | 10 ++++++++++ tests/qtest/test-hmp.c | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 28256209b5..c10d5b3668 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1606,7 +1606,7 @@ ERST .name =3D "closefd", .args_type =3D "fdname:s", .params =3D "closefd name", - .help =3D "close a file descriptor previously passed via SCM= rights", + .help =3D "close a named file descriptor", .cmd =3D hmp_closefd, }, =20 @@ -1617,6 +1617,20 @@ SRST used by another monitor command. ERST =20 + { + .name =3D "openfd", + .args_type =3D "fdname:s,filename:s", + .params =3D "openfd name filename", + .help =3D "open the named file (read write) and assign it a = name", + .cmd =3D hmp_openfd, + }, + +SRST +``openfd`` *fdname* *filename* + Open the named file and store it using the name *fdname* for later use by + other monitor comands. +ERST + { .name =3D "block_passwd", .args_type =3D "device:B,password:s", diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index c986cfd28b..7beaf3eab7 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -83,6 +83,7 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict); void hmp_netdev_del(Monitor *mon, const QDict *qdict); void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); +void hmp_openfd(Monitor *mon, const QDict *qdict); void hmp_sendkey(Monitor *mon, const QDict *qdict); void hmp_screendump(Monitor *mon, const QDict *qdict); void hmp_chardev_add(Monitor *mon, const QDict *qdict); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 9c61e769ca..62a3a8a514 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1659,6 +1659,16 @@ void hmp_closefd(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, err); } =20 +void hmp_openfd(Monitor *mon, const QDict *qdict) +{ + const char *fdname =3D qdict_get_str(qdict, "fdname"); + const char *filename =3D qdict_get_str(qdict, "filename"); + Error *err =3D NULL; + + qmp_openfd(fdname, filename, &err); + hmp_handle_error(mon, err); +} + void hmp_sendkey(Monitor *mon, const QDict *qdict) { const char *keys =3D qdict_get_str(qdict, "keys"); diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index b8b1271b9e..66a4f34348 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -57,6 +57,8 @@ static const char *hmp_cmds[] =3D { "o /w 0 0x1234", "object_add memory-backend-ram,id=3Dmem1,size=3D256M", "object_del mem1", + "openfd null \"/dev/null\"", + "closefd null", /* purposely after openfd */ "pmemsave 0 4096 \"/dev/null\"", "p $pc + 8", "qom-list /", --=20 2.26.2