From: Bin Meng <bmeng.cn@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Bin Meng" <bin.meng@windriver.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH 5/5] chardev/char-socket: Update AF_UNIX for Windows
Date: Wed, 27 Jul 2022 15:35:42 +0800 [thread overview]
Message-ID: <20220727073542.811420-6-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20220727073542.811420-1-bmeng.cn@gmail.com>
From: Bin Meng <bin.meng@windriver.com>
Now that AF_UNIX has come to Windows, update the existing logic in
qemu_chr_compute_filename() and qmp_chardev_open_socket() for Windows.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
chardev/char-socket.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index dc4e218eeb..5a1fa0db33 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -37,6 +37,10 @@
#include "chardev/char-io.h"
#include "chardev/char-socket.h"
+#if defined(CONFIG_WIN32) && defined(CONFIG_AF_UNIX)
+# include <afunix.h>
+#endif /* CONFIG_WIN32 && CONFIG_AF_UNIX */
+
static gboolean socket_reconnect_timeout(gpointer opaque);
static void tcp_chr_telnet_init(Chardev *chr);
@@ -557,7 +561,7 @@ static char *qemu_chr_compute_filename(SocketChardev *s)
const char *left = "", *right = "";
switch (ss->ss_family) {
-#ifndef _WIN32
+#ifdef CONFIG_AF_UNIX
case AF_UNIX:
return g_strdup_printf("unix:%s%s",
((struct sockaddr_un *)(ss))->sun_path,
@@ -1372,10 +1376,12 @@ static void qmp_chardev_open_socket(Chardev *chr,
}
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_RECONNECTABLE);
+#ifndef _WIN32
/* TODO SOCKET_ADDRESS_FD where fd has AF_UNIX */
if (addr->type == SOCKET_ADDRESS_TYPE_UNIX) {
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS);
}
+#endif
/*
* In the chardev-change special-case, we shouldn't register a new yank
--
2.34.1
next prev parent reply other threads:[~2022-07-27 7:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 7:35 [PATCH 0/5] Enable unix socket support on Windows Bin Meng
2022-07-27 7:35 ` [PATCH 1/5] util/qemu-sockets: Replace the call to close a socket with closesocket() Bin Meng
2022-07-27 7:35 ` [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version Bin Meng
2022-07-27 8:50 ` Yan Vugenfirer
2022-07-27 9:38 ` Bin Meng
2022-07-27 9:59 ` Daniel P. Berrangé
2022-07-27 10:57 ` Yan Vugenfirer
2022-07-27 11:55 ` Bin Meng
2022-07-27 12:53 ` Daniel P. Berrangé
2022-07-27 13:15 ` Bin Meng
2022-07-27 13:18 ` Konstantin Kostiuk
2022-07-27 13:21 ` Bin Meng
2022-07-27 7:35 ` [PATCH 3/5] qga/commands-win32: Use os_get_win_version() Bin Meng
2022-07-27 8:59 ` Konstantin Kostiuk
2022-07-27 7:35 ` [PATCH 4/5] util/qemu-sockets: Enable unix socket support on Windows Bin Meng
2022-07-27 8:50 ` Yan Vugenfirer
2022-07-27 9:58 ` Bin Meng
2022-07-27 8:53 ` Konstantin Kostiuk
2022-07-27 10:01 ` Bin Meng
2022-07-28 13:11 ` Marc-André Lureau
2022-07-28 13:41 ` Bin Meng
2022-07-27 7:35 ` Bin Meng [this message]
2022-07-27 9:06 ` [PATCH 0/5] " Daniel P. Berrangé
2022-07-27 10:15 ` Bin Meng
2022-07-27 10:24 ` Daniel P. Berrangé
2022-07-27 11:37 ` Bin Meng
2022-07-27 11:45 ` Stefan Weil via
2022-07-27 12:17 ` Bin Meng
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=20220727073542.811420-6-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=bin.meng@windriver.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).