From nobody Mon Feb 9 09:08:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632411532; cv=none; d=zohomail.com; s=zohoarc; b=QEa26H7tM3wagCfUIeBrKdQkHoAvQNclo+hzYrt3znemx4SOtyxHkClBASP8nOAbUBIb9/60+NZ/XaO8RpwCPDB0iJvEOr/6eQhQ0+99Z7g5knmYTmi659Xb+yfLmIz2cVsiWO89VA1KHI7fqs6cYlkmqk1zbqbKmKTjY72c8oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632411532; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=idCFBUiou9ZMjd4ypmsPRww6v3i7r2HpTIv+gJ/oo9s=; b=PHOdzOJ/J2mbSOcHsFPn/B6TSenVdkXgO4D/u2zmozG0GnmOLebDF15nWtKRSY3MFBhwWYPep8QFyT9tmi8hsOVXqu5Q/fQiMu56RMIvGn4CWodu8hWidraTePbWGWT555Y6Tu51Nj+MXaxBvPIIyKBRtzvZ3cw463SXEvWoF8c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1632411532375264.7029061706022; Thu, 23 Sep 2021 08:38:52 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-20-tpLFZvSIPpGxPkXJGC4Yxw-1; Thu, 23 Sep 2021 11:38:48 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3CD010144E1; Thu, 23 Sep 2021 15:38:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7FA3719730; Thu, 23 Sep 2021 15:38:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4DFE5180BAD2; Thu, 23 Sep 2021 15:38:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18NFcbhl000915 for ; Thu, 23 Sep 2021 11:38:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99DC8102482F; Thu, 23 Sep 2021 15:38:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF17F100EBB8 for ; Thu, 23 Sep 2021 15:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632411531; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=idCFBUiou9ZMjd4ypmsPRww6v3i7r2HpTIv+gJ/oo9s=; b=ixwB+I3ftHLUisdbkywC0bZGoWyYsx0s2f1VGgpnU5TglLLwHjvChzvUETrvUAUd6acNHp 2hWl+h2WRlgRtabSEO7axo4Bl03KoLmxE9Uvt4X+2ef9q//6b61ztcsD4kk1IhUlp1DlMc DiW7nwTJOZkQ/NJx2ReUZIH31fJ27NU= X-MC-Unique: tpLFZvSIPpGxPkXJGC4Yxw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/14] qemuxml2argvtest: Replace vnc unix socket tests with pinned versions Date: Thu, 23 Sep 2021 17:37:14 +0200 Message-Id: <9c687d8909830fbaacbc9b36573b8f214517ce5e.1632411336.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632411533653100001 Content-Type: text/plain; charset="utf-8" Replace the 3 unix socket tests with real caps versions to demonstrate that supported qemus no longer use the old syntax. DO_TEST_CAPS_LATEST versions will be added later. This also removes duplicate invocation of 'graphics-vnc-socket'. Signed-off-by: Peter Krempa --- ... graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args} | 7 ++++--- ...s =3D> graphics-vnc-auto-socket.x86_64-2.11.0.args} | 7 ++++--- ...t.args =3D> graphics-vnc-socket.x86_64-2.11.0.args} | 7 ++++--- tests/qemuxml2argvtest.c | 12 ++++++------ 4 files changed, 18 insertions(+), 15 deletions(-) rename tests/qemuxml2argvdata/{graphics-vnc-auto-socket-cfg.args =3D> grap= hics-vnc-auto-socket-cfg.x86_64-2.11.0.args} (79%) rename tests/qemuxml2argvdata/{graphics-vnc-socket.args =3D> graphics-vnc-= auto-socket.x86_64-2.11.0.args} (77%) rename tests/qemuxml2argvdata/{graphics-vnc-auto-socket.args =3D> graphics= -vnc-socket.x86_64-2.11.0.args} (78%) diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tes= ts/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args similarity index 79% rename from tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args rename to tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0= .args index c0ff5b80fc..81d3101d14 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-2.11,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -24,9 +24,10 @@ QEMU_AUDIO_DRV=3Dnone \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \ +-vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxm= l2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args similarity index 77% rename from tests/qemuxml2argvdata/graphics-vnc-socket.args rename to tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args index c40c289ccd..a1aedc0535 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-2.11,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -24,7 +24,8 @@ QEMU_AUDIO_DRV=3Dnone \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ --vnc unix:/tmp/vnc.sock \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/q= emuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args similarity index 78% rename from tests/qemuxml2argvdata/graphics-vnc-auto-socket.args rename to tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args index fbbba9b0f4..ca0293016b 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-2.11,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -24,7 +24,8 @@ QEMU_AUDIO_DRV=3Dnone \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ --vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-vnc vnc=3Dunix:/tmp/vnc.sock \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d6aeccba3f..9a98c6ca88 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1450,8 +1450,11 @@ mymain(void) DO_TEST_CAPS_LATEST("graphics-egl-headless"); DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode"); + /* DO_TEST_CAPS_VER("graphics-vnc-*", "2.11.0"); were added as a demon= stration + * that the old fake-caps tests were already using the new format, thus + * they can be removed without replacement when "2.11.0" will be retir= ed */ DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_= VGA); + DO_TEST_CAPS_VER("graphics-vnc-socket", "2.11.0"); DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); @@ -1463,12 +1466,9 @@ mymain(void) DO_TEST("graphics-vnc-remove-generated-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncAutoUnixSocket =3D true; - DO_TEST("graphics-vnc-auto-socket-cfg", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-auto-socket-cfg", "2.11.0"); driver.config->vncAutoUnixSocket =3D false; - DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_= VGA); - DO_TEST("graphics-vnc-auto-socket", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-auto-socket", "2.11.0"); DO_TEST("graphics-vnc-none", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VG= A); DO_TEST("graphics-vnc-socket-new-cmdline", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_VNC_MULTI_SERVERS); --=20 2.31.1