From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 13 Jun 2023 13:45:11 +0000 (+0200)
Subject: qemu: Use SOCK_STREAM for notify socket
X-Git-Tag: v15~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87a6b70ea9ab529b95fc91306fc8151175999dca;p=thirdparty%2Fmkosi.git

qemu: Use SOCK_STREAM for notify socket

The CentOS 8 Stream kernel does not support SOCK_SEQPACKET for
AF_VSOCK so let's use SOCK_STREAM instead and explicitly instruct
systemd running in the VM to use SOCK_STREAM as well.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 6e7b538bc..5ccbb5fb6 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -153,7 +153,7 @@ def vsock_notify_handler() -> Iterator[tuple[str, dict[str, str]]]:
     This yields a vsock address and a dict that will be filled in with the notifications from the VM. The
     dict should only be accessed after the context manager has been finalized.
     """
-    with socket.socket(socket.AF_VSOCK, socket.SOCK_SEQPACKET) as vsock:
+    with socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM) as vsock:
         vsock.bind((socket.VMADDR_CID_ANY, socket.VMADDR_PORT_ANY))
         vsock.listen()
         vsock.setblocking(False)
@@ -186,7 +186,7 @@ def vsock_notify_handler() -> Iterator[tuple[str, dict[str, str]]]:
                     messages[k] = v
 
         with MkosiAsyncioThread(notify()):
-            yield f"vsock:{socket.VMADDR_CID_HOST}:{vsock.getsockname()[1]}", messages
+            yield f"vsock-stream:{socket.VMADDR_CID_HOST}:{vsock.getsockname()[1]}", messages
 
         logging.debug(f"Received {num_messages} notify messages totalling {format_bytes(num_bytes)} bytes")