From nobody Mon Feb 9 23:39:49 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=1632411605; cv=none; d=zohomail.com; s=zohoarc; b=RNr8+Kk3xDCaLOiCZQ1TqhnaSScKucbs/hEH507Mtm1C7be3uRv0LFc1ptxK6S5ybSoRzUfj3aMBgH1w2qjDhxpYXu2Orf6YohSigQsetbxJmnUR9xWoLQaFJ4CW9ccS7X1WiLl0dJIwILYuC4vdzfK2Fc0boF3vtCutCt4LTho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632411605; 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=JhnjtXlNZrs35tiR44/RI8pdFZcacbs9bua6OXFphlU=; b=X/aSUCiFHnSkUHDQtaCU3wJcNEFMcT6UqoVpm9T9UVws2OG9N8BWB/Th4fVUKhGaV5lxN3ibKxfveN6zxNbyEs41QErifbFFGkahTAps6bGZuB7adl02X388hnenwcfp1chybqE/p8g1ucMz7lpyb5amz0UGuUcnwxYb2Ute2ac= 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 1632411605102600.3613825976662; Thu, 23 Sep 2021 08:40:05 -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-64-nRIggqyxN6CYXVm-cqdgqw-1; Thu, 23 Sep 2021 11:38:57 -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 3D8471007914; Thu, 23 Sep 2021 15:38:50 +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 2260F18B5E; Thu, 23 Sep 2021 15:38:50 +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 E58C6180BAD2; Thu, 23 Sep 2021 15:38:49 +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 18NFcgBs000961 for ; Thu, 23 Sep 2021 11:38:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 40528102482F; Thu, 23 Sep 2021 15:38:42 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D3FE100EBB8 for ; Thu, 23 Sep 2021 15:38:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632411603; 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=JhnjtXlNZrs35tiR44/RI8pdFZcacbs9bua6OXFphlU=; b=U/5n4aB+UbpaxMZ5trEn2uARPuflFdwvLHC5vPN91Y0AMLGQA+MMmuym2mK4KHImjT3xpO uFZu+wKZG8B+pi93HFzHX+FIljNuT22lZUGvE7vs3YNR0hHbHMqPqZbbySYt6GXHWEQE/O OdIredk2Lz5leBnUHNGji/HclhBjLts= X-MC-Unique: nRIggqyxN6CYXVm-cqdgqw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/14] qemuxml2argvtest: Modernize the rest of 'graphics-vnc' tests Date: Thu, 23 Sep 2021 17:37:18 +0200 Message-Id: <320870928f14b342f3ae915ca6fe30392eb6b821.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: 1632411606999100001 Content-Type: text/plain; charset="utf-8" As with previous test replace the fake caps versions with a combination of DO_TEST_CAPS_VER(..., "2.11.0") and DO_TEST_CAPS_LATEST(). Signed-off-by: Peter Krempa --- ...phics-vnc-egl-headless.x86_64-2.11.0.args} | 5 ++- ...aphics-vnc-egl-headless.x86_64-latest.args | 37 +++++++++++++++++++ ...ics-vnc-no-listen-attr.x86_64-2.11.0.args} | 5 ++- ...hics-vnc-no-listen-attr.x86_64-latest.args | 36 ++++++++++++++++++ ...s =3D> graphics-vnc-none.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-none.x86_64-latest.args | 33 +++++++++++++++++ ...=3D> graphics-vnc-policy.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-policy.x86_64-latest.args | 36 ++++++++++++++++++ ...emove-generated-socket.x86_64-2.11.0.args} | 5 ++- ...remove-generated-socket.x86_64-latest.args | 36 ++++++++++++++++++ ...s =3D> graphics-vnc-sasl.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-sasl.x86_64-latest.args | 37 +++++++++++++++++++ ...vnc-socket-new-cmdline.x86_64-2.11.0.args} | 5 ++- ...-vnc-socket-new-cmdline.x86_64-latest.args | 33 +++++++++++++++++ ...graphics-vnc-websocket.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc-websocket.x86_64-latest.args | 33 +++++++++++++++++ ...c.args =3D> graphics-vnc.x86_64-2.11.0.args} | 5 ++- .../graphics-vnc.x86_64-latest.args | 36 ++++++++++++++++++ tests/qemuxml2argvtest.c | 36 +++++++++--------- 19 files changed, 362 insertions(+), 36 deletions(-) rename tests/qemuxml2argvdata/{graphics-vnc-egl-headless.args =3D> graphic= s-vnc-egl-headless.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64= -latest.args rename tests/qemuxml2argvdata/{graphics-vnc-no-listen-attr.args =3D> graph= ics-vnc-no-listen-attr.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_= 64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-none.args =3D> graphics-vnc-no= ne.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.= args rename tests/qemuxml2argvdata/{graphics-vnc-policy.args =3D> graphics-vnc-= policy.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-lates= t.args rename tests/qemuxml2argvdata/{graphics-vnc-remove-generated-socket.args = =3D> graphics-vnc-remove-generated-socket.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-remove-generated-so= cket.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-sasl.args =3D> graphics-vnc-sa= sl.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.= args rename tests/qemuxml2argvdata/{graphics-vnc-socket-new-cmdline.args =3D> g= raphics-vnc-socket-new-cmdline.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.= x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-websocket.args =3D> graphics-v= nc-websocket.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-la= test.args rename tests/qemuxml2argvdata/{graphics-vnc.args =3D> graphics-vnc.x86_64-= 2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/= qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args similarity index 84% rename from tests/qemuxml2argvdata/graphics-vnc-egl-headless.args rename to tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.ar= gs index 72443b3ef4..2de4371574 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.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,10 +24,11 @@ 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 '[2001:1:2:3:4:5:1234:1234]:3' \ -display egl-headless \ -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-egl-headless.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args new file mode 100644 index 0000000000..82e3659173 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -0,0 +1,37 @@ +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 '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ +-display egl-headless,rendernode=3D/dev/dri/foo \ +-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-no-listen-attr.args b/test= s/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args similarity index 83% rename from tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args rename to tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.= args index bd39da09c7..d74be40471 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.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 '[2001:1:2:3:4:5:1234:1234]:3' \ -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-no-listen-attr.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.= args new file mode 100644 index 0000000000..a0bc3560d8 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.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 '[2001:1:2:3:4:5:1234:1234]:3,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-none.args b/tests/qemuxml2= argvdata/graphics-vnc-none.x86_64-2.11.0.args similarity index 81% rename from tests/qemuxml2argvdata/graphics-vnc-none.args rename to tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args index 766b8943cd..54e7a16312 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.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 \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -vnc none \ -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-none.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args new file mode 100644 index 0000000000..32b54db8cd --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-none.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 none,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-policy.args b/tests/qemuxm= l2argvdata/graphics-vnc-policy.x86_64-2.11.0.args similarity index 84% rename from tests/qemuxml2argvdata/graphics-vnc-policy.args rename to tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args index 090b94878a..65858f4e29 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.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 '[::]:59630,share=3Dallow-exclusive' \ -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-policy.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args new file mode 100644 index 0000000000..d7ec89dd2e --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.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 '[::]:59630,share=3Dallow-exclusive,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-remove-generated-socket.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.1= 1.0.args similarity index 83% rename from tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args rename to tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_6= 4-2.11.0.args index 22bcf33fcd..472a023d67 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-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,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 127.0.0.1:0 \ -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-remove-generated-socket.x8= 6_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-soc= ket.x86_64-latest.args new file mode 100644 index 0000000000..17eb03319d --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.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 127.0.0.1:0,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-sasl.args b/tests/qemuxml2= argvdata/graphics-vnc-sasl.x86_64-2.11.0.args similarity index 84% rename from tests/qemuxml2argvdata/graphics-vnc-sasl.args rename to tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args index f5c4b7dfa9..e9335fbc15 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args @@ -12,7 +12,7 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -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 \ @@ -25,9 +25,10 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -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 127.0.0.1:3,sasl=3Don \ -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-sasl.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args new file mode 100644 index 0000000000..46dbde8e51 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args @@ -0,0 +1,37 @@ +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 \ +SASL_CONF_PATH=3D/root/.sasl2 \ +/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 127.0.0.1:3,sasl=3Don,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-new-cmdline.args b/= tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args similarity index 81% rename from tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args rename to tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.1= 1.0.args index 8ebf57fd09..9f268c6503 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.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 \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -vnc vnc=3Dunix:/tmp/foo=3Dbar.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-new-cmdline.x86_64-= latest.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64= -latest.args new file mode 100644 index 0000000000..9c87bab4d2 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.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/foo=3Dbar.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-websocket.args b/tests/qem= uxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args similarity index 81% rename from tests/qemuxml2argvdata/graphics-vnc-websocket.args rename to tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args index ba963db2d4..7e841f07be 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.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 \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -vnc 127.0.0.1:0,websocket=3D5700 \ -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-websocket.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args new file mode 100644 index 0000000000..ac7129d400 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.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 127.0.0.1:0,websocket=3D5700,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.args b/tests/qemuxml2argvd= ata/graphics-vnc.x86_64-2.11.0.args similarity index 83% rename from tests/qemuxml2argvdata/graphics-vnc.args rename to tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args index bd39da09c7..d74be40471 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.args +++ b/tests/qemuxml2argvdata/graphics-vnc.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 '[2001:1:2:3:4:5:1234:1234]:3' \ -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.x86_64-latest.args b/tests= /qemuxml2argvdata/graphics-vnc.x86_64-latest.args new file mode 100644 index 0000000000..a0bc3560d8 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-vnc.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 '[2001:1:2:3:4:5:1234:1234]:3,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 fdd38ee1a1..e126e828eb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1453,33 +1453,35 @@ mymain(void) /* 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_CAPS_VER("graphics-vnc", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc"); 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); - DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-websocket", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-websocket"); + DO_TEST_CAPS_VER("graphics-vnc-policy", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-policy"); DO_TEST_CAPS_LATEST("graphics-vnc-power"); - DO_TEST("graphics-vnc-no-listen-attr", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-vnc-remove-generated-socket", QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("graphics-vnc-no-listen-attr", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-no-listen-attr"); + DO_TEST_CAPS_VER("graphics-vnc-remove-generated-socket", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-remove-generated-socket"); 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); + DO_TEST_CAPS_VER("graphics-vnc-none", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-none"); + DO_TEST_CAPS_VER("graphics-vnc-socket-new-cmdline", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-socket-new-cmdline"); driver.config->vncSASL =3D 1; VIR_FREE(driver.config->vncSASLdir); driver.config->vncSASLdir =3D g_strdup("/root/.sasl2"); - DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VG= A); + DO_TEST_CAPS_VER("graphics-vnc-sasl", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); driver.config->vncTLS =3D 1; driver.config->vncTLSx509verify =3D 1; DO_TEST_CAPS_VER("graphics-vnc-tls", "2.11.0"); @@ -1491,10 +1493,8 @@ mymain(void) driver.config->vncSASL =3D driver.config->vncTLSx509verify =3D driver.= config->vncTLS =3D 0; VIR_FREE(driver.config->vncSASLdir); VIR_FREE(driver.config->vncTLSx509certdir); - DO_TEST("graphics-vnc-egl-headless", - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_EGL_HEADLESS); + DO_TEST_CAPS_VER("graphics-vnc-egl-headless", "2.11.0"); + DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless"); DO_TEST("graphics-sdl", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_SDL); --=20 2.31.1