[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/5] chardev/char-socket: Update AF_UNIX for Windows
From: |
Bin Meng |
Subject: |
[PATCH 5/5] chardev/char-socket: Update AF_UNIX for Windows |
Date: |
Wed, 27 Jul 2022 15:35:42 +0800 |
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
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, (continued)
[PATCH 5/5] chardev/char-socket: Update AF_UNIX for Windows,
Bin Meng <=
Re: [PATCH 0/5] Enable unix socket support on Windows, Daniel P . Berrangé, 2022/07/27