[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] chardev/char-socket: Update AF_UNIX for Windows
From: |
Bin Meng |
Subject: |
[PATCH v2 5/6] chardev/char-socket: Update AF_UNIX for Windows |
Date: |
Wed, 27 Jul 2022 21:28:01 +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>
---
Changes in v2:
- drop #include <afunix.h> as it is now already included in osdep.h
chardev/char-socket.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index dc4e218eeb..14a56b7b13 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -557,7 +557,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 +1372,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
- [PATCH v2 0/6] Enable unix socket support on Windows, Bin Meng, 2022/07/27
- [PATCH v2 1/6] util/qemu-sockets: Replace the call to close a socket with closesocket(), Bin Meng, 2022/07/27
- [PATCH v2 2/6] util/oslib-win32: Add a helper to get the Windows version, Bin Meng, 2022/07/27
- [PATCH v2 3/6] qga/commands-win32: Use os_get_win_version(), Bin Meng, 2022/07/27
- [PATCH v2 4/6] util/qemu-sockets: Enable unix socket support on Windows, Bin Meng, 2022/07/27
- [PATCH v2 5/6] chardev/char-socket: Update AF_UNIX for Windows,
Bin Meng <=
- [PATCH v2 6/6] tests/unit: Update test-io-channel-socket.c for Windows, Bin Meng, 2022/07/27