From nobody Mon Feb 9 12:08:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1632411535; cv=none; d=zohomail.com; s=zohoarc; b=aj2nNOwQTX5xVK3RD8gd7YZSjiZtjD0Lghe29tAUOAi7pC9xPAODLjYfgI0cHk0pCvVggf1C+ohED2YAc8mpG2USrtj/rMDGX6oxrroxYbnBTiW13pUVJ4KHr3f0W6UsfYXBGDR0rZczgZnW0VKiI97110UeplxmxLQfWBZoM/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632411535; 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=zhjCpIoY6CwhnfJyLahzyp9ECBFbPjHlJBx3ierDdyk=; b=VnwmRGnglimQabCKroDvgHPOK8xVuAQs0728iNGkC9tBCD6gYqRS4Sw2SHROFlDeQm5ytMuOS3XNuxlqDsK/wCVhzoZ4tE6D27Da2gaeWzeuLNk2BG8juLrlXFueLWxZg7jXI7mtSvDkDFKWFW9Y4F3YS1j6tOqPN/duMDiNTwQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632411535321667.084808677801; Thu, 23 Sep 2021 08:38:55 -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-453-kodGikAzNtG2sU_Z3iewUQ-1; Thu, 23 Sep 2021 11:38:52 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6BB7210199B0; Thu, 23 Sep 2021 15:38:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B2B118A8F; Thu, 23 Sep 2021 15:38:47 +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 184154EA3A; Thu, 23 Sep 2021 15:38:47 +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 18NFcfEU000945 for ; Thu, 23 Sep 2021 11:38:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 15683100EBB8; Thu, 23 Sep 2021 15:38:41 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67EC51024893 for ; Thu, 23 Sep 2021 15:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632411534; 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=zhjCpIoY6CwhnfJyLahzyp9ECBFbPjHlJBx3ierDdyk=; b=cM5XQSpzkoRwNSF3u0LIoIs4nMqkYOX/ffseYgs72W2dXLD+GPwiaRjVBd0SDFhDeduJmQ U9Hytbv3A0slyDAHYKH4EQtkGUVYamAsWLU9Rgr875WsNgxw5HbTkErL+hGHrCB21UffRO G8FsRlig0sz5vjfF7F90EK40dxwnoA4= X-MC-Unique: kodGikAzNtG2sU_Z3iewUQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/14] qemuxml2argvtest: Add DO_TEST_CAPS_LATEST for the vnc unix socket tests Date: Thu, 23 Sep 2021 17:37:17 +0200 Message-Id: <161d398bac081d97f33cd75ae2694dea643184fd.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.79 on 10.5.11.11 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: 1632411535886100005 Content-Type: text/plain; charset="utf-8" Now that the code is refactored add the DO_TEST_CAPS_LATEST versions as promised in the commit adding the pinned versions. Signed-off-by: Peter Krempa --- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 36 +++++++++++++++++++ ...raphics-vnc-auto-socket.x86_64-latest.args | 33 +++++++++++++++++ .../graphics-vnc-socket.x86_64-latest.args | 33 +++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 105 insertions(+) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86= _64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-= latest.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-lates= t.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lat= est.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lates= t.args new file mode 100644 index 0000000000..5fa93dc611 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ +-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.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args new file mode 100644 index 0000000000..c2ea5ca77c --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ +-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.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args new file mode 100644 index 0000000000..af595caf10 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-vnc vnc=3Dunix:/tmp/vnc.sock,audiodev=3Daudio1 \ +-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 cda73d9f88..fdd38ee1a1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1455,6 +1455,7 @@ mymain(void) * 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_CAPS_VER("graphics-vnc-socket", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-socket"); DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); @@ -1467,8 +1468,10 @@ mymain(void) QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncAutoUnixSocket =3D true; DO_TEST_CAPS_VER("graphics-vnc-auto-socket-cfg", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket-cfg"); driver.config->vncAutoUnixSocket =3D false; DO_TEST_CAPS_VER("graphics-vnc-auto-socket", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket"); 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); --=20 2.31.1