From 6a6b27091bd9ecff3654a7de7f1fc038c5e71bc8 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Sun, 17 Nov 2024 11:27:03 -0500 Subject: [PATCH] Update instructions to use -netdev stream Since QEMU 7.2 wrappers are no longer needed[0]; update the documentation to instruct users to prefer the new options added in 2022[1] but not documented until 2024[2]. The client can be entirely removed in a future release. [0] https://john-millikin.com/improved-unix-socket-networking-in-qemu-7.2 [1] https://github.com/qemu/qemu/commit/5166fe0ae46dbfed8cd7e7c3743c591ca [2] https://github.com/qemu/qemu/commit/178413a1031af79f1a224e021e3dfd422 Signed-off-by: Tamir Duberstein --- README.md | 9 ++++----- test/test.sh | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index de6df0d..cd85f6e 100644 --- a/README.md +++ b/README.md @@ -208,13 +208,12 @@ sudo make PREFIX=/opt/socket_vmnet uninstall.launchd ## Usage ### QEMU -Make sure that the `socket_vmnet` daemon is running, and execute QEMU via `socket_vmnet_client` as follows: +Make sure that the `socket_vmnet` daemon is running, and execute QEMU as follows: ```console -${HOMEBREW_PREFIX}/opt/socket_vmnet/bin/socket_vmnet_client \ - ${HOMEBREW_PREFIX}/var/run/socket_vmnet \ - qemu-system-x86_64 \ - -device virtio-net-pci,netdev=net0 -netdev socket,id=net0,fd=3 \ +qemu-system-x86_64 \ + -device virtio-net-pci,netdev=net0 \ + -netdev stream,id=net0,addr.type=unix,addr.path=${HOMEBREW_PREFIX}/var/run/socket_vmnet \ -m 4096 -accel hvf -cdrom ubuntu-22.04-desktop-amd64.iso ``` diff --git a/test/test.sh b/test/test.sh index faae892..2beed2d 100755 --- a/test/test.sh +++ b/test/test.sh @@ -15,9 +15,9 @@ fi rm -f serial.log echo >&2 "===== QEMU BEGIN =====" -/opt/socket_vmnet/bin/socket_vmnet_client "$SOCKET" qemu-system-x86_64 \ +qemu-system-x86_64 \ -device virtio-net-pci,netdev=net0 \ - -netdev socket,id=net0,fd=3 \ + -netdev stream,id=net0,addr.type=unix,addr.path="$SOCKET" \ -kernel ipxe.lkrn \ -initrd test.ipxe \ -no-reboot \