90057151bb
- s390x/sclp: Simplify get_sclp_device() - target/ppc: Remove msr_pr macro - docs/system/target-arm: Re-alphabetize board list - migration: Extend query-migrate to provide dirty page limit info - migration: Implement dirty-limit convergence algo - migration: Put the detection logic before auto-converge checking - migration: Refactor auto-converge capability logic - migration: Introduce dirty-limit capability - qapi/migration: Introduce vcpu-dirty-limit parameters - qapi/migration: Introduce x-vcpu-dirty-limit-period parameter - Change the value of no_ged from true to false - Allow UNIX socket option for VNC websocket - tpm_emulator: Avoid double initialization during - chardev/char-socket: Update AF_UNIX for Windows - KVM: dirty ring: add missing memory barrier - i386: reset KVM nested state upon CPU reset - esp: Handle CMD_BUSRESET by resetting the SCSI bus - dbus-vmstate: Restrict error checks to registered proxies in dbus_get_proxies - vfio/pci: Add Ascend310b scend910b support - target/i386: Export RFDS bit to guests - target/i386: Add new CPU model SierraForest - target/i386: Introduce Icelake-Server-v7 to enable TSX - hw/virtio: handle un-configured shutdown in virtio-pci - target/s390x: display deprecation status in '-cpu help' - target/i386: display deprecation status in '-cpu help' - pc-bios/s390-ccw: Fix booting with logical block size < physical block size Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From 83a0636d6eb42c223ca4d6c0d26ca3a2075de532 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 15 May 2024 01:21:57 +0000
|
|
Subject: [PATCH] chardev/char-socket: Update AF_UNIX for Windows mainline
|
|
inclusion commit 120fa5e0e6ebacd811e4d830cff8a405806d305c category: bugfix
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---------------------------------------------------------------
|
|
|
|
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>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Message-Id: <20220802075200.907360-4-bmeng.cn@gmail.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
chardev/char-socket.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
|
|
index ef5d3053f3..278190dd93 100644
|
|
--- a/chardev/char-socket.c
|
|
+++ b/chardev/char-socket.c
|
|
@@ -632,12 +632,10 @@ static char *qemu_chr_compute_filename(SocketChardev *s)
|
|
const char *left = "", *right = "";
|
|
|
|
switch (ss->ss_family) {
|
|
-#ifndef _WIN32
|
|
case AF_UNIX:
|
|
return g_strdup_printf("unix:%s%s",
|
|
((struct sockaddr_un *)(ss))->sun_path,
|
|
s->is_listen ? ",server=on" : "");
|
|
-#endif
|
|
case AF_INET6:
|
|
left = "[";
|
|
right = "]";
|
|
@@ -1450,10 +1448,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.27.0
|
|
|