From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: "Beraldo Leal" <bleal@redhat.com>,
"Eric Blake" <eblake@redhat.com>, "Stefan Weil" <sw@weilnetz.de>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: Re: [PATCH v3 08/10] qmp: teach 'getfd' to import sockets on win32
Date: Tue, 7 Feb 2023 15:50:02 +0100 [thread overview]
Message-ID: <a8cd6b40-7b69-74bd-c706-f62557a2248a@linaro.org> (raw)
In-Reply-To: <20230207142535.1153722-9-marcandre.lureau@redhat.com>
On 7/2/23 15:25, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> A process with enough capabilities can duplicate a socket to QEMU.
> Modify 'getfd' to import it and add it to the monitor fd list, so it can
> be later used by other commands.
>
> Note that we actually store the SOCKET in the FD list, appropriate care
> must now be taken to use the correct socket functions (similar approach
> is taken by our io/ code and in glib, this is internal and shouldn't
> affect the QEMU/QMP users)
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> qapi/misc.json | 16 ++++++++--
> monitor/fds.c | 79 ++++++++++++++++++++++++++++++++++++----------
> monitor/hmp-cmds.c | 6 +++-
> 3 files changed, 81 insertions(+), 20 deletions(-)
> +void qmp_getfd(const char *fdname,
> +#ifdef WIN32
> + const char *wsa_info,
Rename as 'optional_b64_context' and remove #ifdef'ry?
Preferrably change qmp_getfd() prototype and use close_fd()
in a preliminary patch. Otherwise LGTM.
> +#endif
> + Error **errp)
> +{
> + Monitor *cur_mon = monitor_cur();
> + int fd;
> +
> +#ifdef WIN32
> + if (wsa_info) {
> + g_autofree WSAPROTOCOL_INFOW *info = NULL;
> + gsize len;
> + SOCKET sk;
> +
> + info = (void *)g_base64_decode(wsa_info, &len);
> + if (len != sizeof(*info)) {
> + error_setg(errp, "Invalid WSAPROTOCOL_INFOW value");
> + return;
> + }
> +
> + sk = WSASocketW(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
> + FROM_PROTOCOL_INFO, info, 0, 0);
> + if (sk == INVALID_SOCKET) {
> + g_autofree gchar *emsg = g_win32_error_message(WSAGetLastError());
> + error_setg(errp, "Couldn't create socket: %s", emsg);
> + return;
> + }
> +
> + return monitor_add_fd(cur_mon, sk, fdname, errp);
> + }
> +#endif
> +
> + fd = qemu_chr_fe_get_msgfd(&cur_mon->chr);
> + if (fd == -1) {
> + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS");
> + return;
> + }
> +
> + return monitor_add_fd(cur_mon, fd, fdname, errp);
> }
next prev parent reply other threads:[~2023-02-07 14:50 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 14:25 [PATCH v3 00/10] Teach 'getfd' QMP command to import win32 sockets marcandre.lureau
2023-02-07 14:25 ` [PATCH v3 01/10] tests: fix path separator, use g_build_filename() marcandre.lureau
2023-02-07 14:25 ` [PATCH v3 02/10] char: do not double-close fd when failing to add client marcandre.lureau
2023-02-07 14:43 ` Thomas Huth
2023-02-07 14:25 ` [PATCH v3 03/10] tests/docker: fix a win32 error due to portability marcandre.lureau
2023-02-27 12:11 ` Alex Bennée
2023-02-07 14:25 ` [PATCH v3 04/10] osdep: implement qemu_socketpair() for win32 marcandre.lureau
2023-02-07 14:25 ` [PATCH v3 05/10] qmp: 'add_client' actually expects sockets marcandre.lureau
2023-02-14 13:25 ` Markus Armbruster
2023-02-07 14:25 ` [PATCH v3 06/10] monitor: release the lock before calling close() marcandre.lureau
2023-02-07 14:52 ` Philippe Mathieu-Daudé
2023-02-14 13:33 ` Markus Armbruster
2023-02-14 13:36 ` Marc-André Lureau
2023-02-14 13:49 ` Daniel P. Berrangé
2023-02-14 16:23 ` Markus Armbruster
2023-02-14 16:55 ` Peter Xu
2023-02-28 18:51 ` Dr. David Alan Gilbert
2023-03-02 9:34 ` Alex Bennée
2023-03-06 15:29 ` Markus Armbruster
2023-03-06 15:35 ` Markus Armbruster
2023-02-07 14:25 ` [PATCH v3 07/10] qapi: implement conditional command arguments marcandre.lureau
2023-02-09 12:41 ` Markus Armbruster
2023-02-12 20:59 ` Marc-André Lureau
2023-02-17 8:28 ` Markus Armbruster
2023-02-18 10:45 ` Marc-André Lureau
2023-02-20 8:09 ` Markus Armbruster
2023-02-22 8:05 ` Marc-André Lureau
2023-02-22 10:23 ` Markus Armbruster
2023-02-22 10:29 ` Marc-André Lureau
2023-02-27 11:22 ` Marc-André Lureau
2023-02-28 15:58 ` Eric Blake
2023-03-01 9:24 ` Daniel P. Berrangé
2023-03-01 13:16 ` Markus Armbruster
2023-03-01 13:21 ` Marc-André Lureau
2023-03-02 6:58 ` Markus Armbruster
2023-03-02 9:31 ` Daniel P. Berrangé
2023-03-02 11:09 ` Markus Armbruster
2023-03-02 13:30 ` Markus Armbruster
2023-02-28 15:54 ` Eric Blake
2023-02-28 19:16 ` Marc-André Lureau
2023-02-07 14:25 ` [PATCH v3 08/10] qmp: teach 'getfd' to import sockets on win32 marcandre.lureau
2023-02-07 14:50 ` Philippe Mathieu-Daudé [this message]
2023-02-07 14:54 ` Daniel P. Berrangé
2023-02-08 7:28 ` Marc-André Lureau
2023-02-17 9:48 ` Markus Armbruster
2023-02-18 10:15 ` Marc-André Lureau
2023-02-20 8:26 ` Markus Armbruster
2023-02-20 9:30 ` Daniel P. Berrangé
2023-02-20 9:52 ` Marc-André Lureau
2023-02-20 10:50 ` Markus Armbruster
2023-02-07 14:25 ` [PATCH v3 09/10] libqtest: make qtest_qmp_add_client work " marcandre.lureau
2023-02-07 14:50 ` Philippe Mathieu-Daudé
2023-02-07 14:25 ` [PATCH v3 10/10] qtest: enable vnc-display test " marcandre.lureau
2023-02-07 14:37 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a8cd6b40-7b69-74bd-c706-f62557a2248a@linaro.org \
--to=philmd@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).