From nobody Sat May 18 19:12:54 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170314773440574.19495438461217; Thu, 21 Dec 2023 00:35:34 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 202AE1BB8; Thu, 21 Dec 2023 03:35:33 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3B0D51B70; Thu, 21 Dec 2023 03:33:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 41F361B6A; Thu, 21 Dec 2023 03:33:50 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8D3F61B58 for ; Thu, 21 Dec 2023 03:33:49 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-4i34-8IrNWuisyJWqyui1Q-1; Thu, 21 Dec 2023 03:33:47 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 04078101A551 for ; Thu, 21 Dec 2023 08:33:47 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.113.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE9143C25; Thu, 21 Dec 2023 08:33:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,WEIRD_PORT autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 4i34-8IrNWuisyJWqyui1Q-1 From: Han Han To: devel@lists.libvirt.org Subject: [PATCH] qemu: Replace the deprecated short-formed option "unix" Date: Thu, 21 Dec 2023 16:33:38 +0800 Message-ID: <20231221083341.63115-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: B2RMKX2LVEBTQKC4HAN6ASHF7DBF4GZI X-Message-ID-Hash: B2RMKX2LVEBTQKC4HAN6ASHF7DBF4GZI X-MailFrom: hhan@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Han Han X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1703147734790100001 Change to the boolean option "unix=3Don" Signed-off-by: Han Han Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 2 +- .../graphics-spice-auto-socket-cfg.x86_64-latest.args | 2 +- .../graphics-spice-auto-socket.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/name-escape.x86_64-latest.args | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b45a5e4f80..bc285c0b6f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8204,7 +8204,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= *cfg, =20 switch (glisten->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - virBufferAddLit(&opt, "unix,addr=3D"); + virBufferAddLit(&opt, "unix=3Don,addr=3D"); virQEMUBuildBufferEscapeComma(&opt, glisten->socket); virBufferAddLit(&opt, ","); hasInsecure =3D true; diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args index a50ca802ae..03fa8e868a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ --spice unix,addr=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,s= eamless-migration=3Don \ +-spice unix=3Don,addr=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.s= ock,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.ar= gs index a50ca802ae..03fa8e868a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ --spice unix,addr=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.sock,s= eamless-migration=3Don \ +-spice unix=3Don,addr=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/spice.s= ock,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args index 634176a6c3..9c30cf6089 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ --spice unix,addr=3D/tmp/spice.sock,seamless-migration=3Don \ +-spice unix=3Don,addr=3D/tmp/spice.sock,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/= qemuxml2argvdata/name-escape.x86_64-latest.args index 096a774caa..9eec8f5a9f 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -41,7 +41,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo=3D1= ,bar=3D2/.config \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -vnc vnc=3Dunix:/var/lib/libvirt/qemu/domain--1-foo=3D1,,bar=3D2/vnc.sock,= audiodev=3Daudio1 \ --spice unix,addr=3D/var/lib/libvirt/qemu/domain--1-foo=3D1,,bar=3D2/spice.= sock,gl=3Don,rendernode=3D/dev/dri/foo,,bar,seamless-migration=3Don \ +-spice unix=3Don,addr=3D/var/lib/libvirt/qemu/domain--1-foo=3D1,,bar=3D2/s= pice.sock,gl=3Don,rendernode=3D/dev/dri/foo,,bar,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -blockdev '{"driver":"iscsi","portal":"example.foo.org:3260","target":"iqn= .1992-01.com.example:my,storage","lun":1,"transport":"tcp","node-name":"lib= virt-2-backend","read-only":false}' \ -device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":4}' \ --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org