From nobody Tue May 7 23:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1642528657; cv=none; d=zohomail.com; s=zohoarc; b=h2tau1hHTf2tKKNK0mddC8kS/+FgxV20nwTEmOYFYwrEnd3F8TNLiSSf26iT/VmsogCmQtyAwsjQM6MqKYOcr53rEuVMKfLMjneGx0pIxcy9+JtSRavHKpsTo67YLevgmiCRvhtFYMS2zY6IuDwbBOXIN0+ZdCqPR/wJm8bH5TA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642528657; 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=lH589dzy8rDZ0K26zcoI0ls8TODZcnk0aDQQiHiZpGM=; b=LoV1cNDQy4mL5MIRV1gQRdak3I5AzL2+Jk/IGC6WeCvtDZPzdNSMF93DLt29SJj+WuwOF6I2G5J+3as84b7E4/SNnbFM1+4Hcg8LrWdfV4KoMSSO5A5pttMXuyEvIKfRJWvHTI2q8Pcs3Sk03gEpEymeFTKxiMgueU0SeRZp1ro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1642528657521898.6916547518616; Tue, 18 Jan 2022 09:57:37 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-HrNdmUzVPs-nHC5Irqi6Ew-1; Tue, 18 Jan 2022 12:57:33 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 727021937FC4; Tue, 18 Jan 2022 17:48:39 +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 D8F4A7A469; Tue, 18 Jan 2022 17:48:38 +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 AADF44A70A; Tue, 18 Jan 2022 17:48:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IG5JVp030632 for ; Tue, 18 Jan 2022 11:05:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2AA24B18BF; Tue, 18 Jan 2022 16:05:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B983B18A7 for ; Tue, 18 Jan 2022 16:05:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642528656; 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=lH589dzy8rDZ0K26zcoI0ls8TODZcnk0aDQQiHiZpGM=; b=BWo5aUVUVdH0pKXGZjxstXdHc6S6mHxR2OQi7bX7rFDcHEXmbH+BWpUTJgmPIYJYjYPui4 +6S1Q/fjg4lI6r0RU2Oia7EBIILiy6D+HXF1ZZxesOCpZVE3SvXNRoEfcFI17HAn/YwhBO WcvBx3TEnSUdlf8SRXnEtzu/f6Z/4v8= X-MC-Unique: HrNdmUzVPs-nHC5Irqi6Ew-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/5] qemuBuildDeviceVideoCmd: Always assume support for 'max_outputs' property Date: Tue, 18 Jan 2022 17:04:52 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.14 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: 1642528658966100001 Content-Type: text/plain; charset="utf-8" Both the QXL video device and 'virtio' video device support 'max_outputs' in all qemu versions libvirt supports. This means we no longer have to check the QEMU_CAPS_QXL_MAX_OUTPUTS and QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS capabilities. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 13 +++++-------- tests/qemuxml2argvdata/aarch64-video-default.args | 2 +- .../aarch64-video-virtio-gpu-pci.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../qemuxml2argvdata/pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +- tests/qemuxml2argvdata/q35-pcie.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../video-device-pciaddr-default.args | 6 +++--- tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-resolution.args | 2 +- .../video-qxl-sec-device-vgamem.args | 4 ++-- tests/qemuxml2argvdata/video-qxl-sec-device.args | 4 ++-- tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +- .../video-virtio-gpu-secondary.args | 4 ++-- .../qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- 27 files changed, 36 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ed9dda4feb..d75cde2280 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4871,12 +4871,10 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, return -1; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) { - if (virJSONValueObjectAdd(&props, - "p:max_outputs", video->heads, - NULL) < 0) - return -1; - } + if (virJSONValueObjectAdd(&props, + "p:max_outputs", video->heads, + NULL) < 0) + return -1; } else if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUS= ER) { g_autofree char *alias =3D qemuDomainGetVhostUserChrAlias(video->i= nfo.alias); @@ -4888,8 +4886,7 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, } else if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { unsigned int heads =3D 0; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS)) - heads =3D video->heads; + heads =3D video->heads; if (virJSONValueObjectAdd(&props, "p:max_outputs", heads, diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemu= xml2argvdata/aarch64-video-default.args index 894e8cf3fb..7853fbed4d 100644 --- a/tests/qemuxml2argvdata/aarch64-video-default.args +++ b/tests/qemuxml2argvdata/aarch64-video-default.args @@ -30,5 +30,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device ioh3420,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2 \ -vnc 127.0.0.1:0 \ --device virtio-gpu-pci,id=3Dvideo0,bus=3Dpci.2,addr=3D0x1 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.2,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tes= ts/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args index aeb1e59918..b87c645bf7 100644 --- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args +++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args @@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ioh3420,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,multifunction= =3Don,addr=3D0x1.0x1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:73:34:53= ,bootindex=3D1,bus=3Dpci.1,addr=3D0x0 \ --device virtio-gpu-pci,id=3Dvideo0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.2,addr=3D0x0 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index 19c73b3a5f..3aec9cb96f 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -30,5 +30,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ioh3420,port=3D26,chassis=3D40,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.= 0x1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index 3cbcc650f4..41fb7e4d0c 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -38,5 +38,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device xio3130-downstream,port=3D6,chassis=3D10,id=3Dpci.10,bus=3Dpci.2,a= ddr=3D0x6 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index 881f07aff1..ed256a6473 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device x3130-upstream,id=3Dpci.4,bus=3Dpci.2,addr=3D0x0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv= data/pcihole64-q35.args index 11be3a967b..400270b4b8 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=3Dnone \ -global q35-pcihost.pci-hole64-size=3D1048576K \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2a= rgvdata/q35-pcie-autoadd.args index f195b808dc..101cc7fae8 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args @@ -55,7 +55,7 @@ QEMU_AUDIO_DRV=3Dnone \ -device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.11,addr=3D0x0 \ -device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.12,addr=3D0x0 \ -device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.13,addr=3D0x0 \ --device virtio-gpu-pci,id=3Dvideo0,bus=3Dpcie.0,addr=3D0x1 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1= \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.8,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.9,addr=3D0x0 \ diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/= q35-pcie.args index b851599c9f..52fdd3fa8c 100644 --- a/tests/qemuxml2argvdata/q35-pcie.args +++ b/tests/qemuxml2argvdata/q35-pcie.args @@ -56,7 +56,7 @@ QEMU_AUDIO_DRV=3Dnone \ -device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.13,addr=3D0x0 \ -device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.14,addr=3D0x0 \ -device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.15,addr=3D0x0 \ --device virtio-gpu-pci,id=3Dvideo0,bus=3Dpcie.0,addr=3D0x1 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1= \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.10,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.11,addr=3D0x0 \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg= vdata/q35-usb2-multi.args index 72c1f2974b..69ee444043 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -42,5 +42,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x1.0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a= rgvdata/q35-usb2-reorder.args index 19c3bb00a5..ce64732a2c 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -42,5 +42,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/= q35-usb2.args index 97820436fb..d6cdc55a66 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -34,5 +34,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.args index afaff44212..178f33e2aa 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -47,7 +47,7 @@ QEMU_AUDIO_DRV=3Dspice \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dcom.redhat.spice.0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -spice port=3D5901,tls-port=3D5902,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Doff,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -device ich9-intel-hda,id=3Dsound0,bus=3Dpcie.0,addr=3D0x1b \ -device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0 \ -chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \ diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2arg= vdata/q35-virtio-pci.args index 6f6e599853..aaba2ede11 100644 --- a/tests/qemuxml2argvdata/q35-virtio-pci.args +++ b/tests/qemuxml2argvdata/q35-virtio-pci.args @@ -56,7 +56,7 @@ QEMU_AUDIO_DRV=3Dnone \ -device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.2,addr=3D0x9 \ -device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.2,addr=3D0xa \ -device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.2,addr=3D0xb \ --device virtio-gpu-pci,id=3Dvideo0,bus=3Dpcie.0,addr=3D0x1 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1= \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x6 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.2,addr=3D0x7 \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index 3078a741ea..9793c11447 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2a= rgvdata/serial-spiceport.args index 7d4c2a0d37..804e118540 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -32,6 +32,6 @@ QEMU_AUDIO_DRV=3Dspice \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,bus= =3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tes= ts/qemuxml2argvdata/video-device-pciaddr-default.args index 931921734a..baa15e44df 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -29,8 +29,8 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -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 qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,bus= =3Dpci.0,addr=3D0x3 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,bus=3Dpci= .0,addr=3D0x4 \ --device qxl,id=3Dvideo2,ram_size=3D67108864,vram_size=3D67108864,bus=3Dpci= .0,addr=3D0x5 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x3 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device qxl,id=3Dvideo2,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D1,bus=3Dpci.0,addr=3D0x5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qe= muxml2argvdata/video-qxl-device-vgamem.args index ad29990bc4..e8931c07fc 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2a= rgvdata/video-qxl-device.args index 7c4f654645..8a4729ac71 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,bus= =3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemux= ml2argvdata/video-qxl-resolution.args index bec1879e93..c66a08ee10 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -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 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D8,xres=3D1280,yres=3D720,bus=3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D8,max_outputs=3D1,xres=3D1280,yres=3D720,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/test= s/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index a3ac6a11eb..7f3b5cc0d9 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,vgamem_mb= =3D16,bus=3Dpci.0,addr=3D0x4 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,vgamem_mb= =3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemux= ml2argvdata/video-qxl-sec-device.args index e0de0fe3cd..4754289d6d 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,bus= =3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,bus=3Dpci= .0,addr=3D0x4 \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D1,bus=3Dpci.0,addr=3D0x4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qe= muxml2argvdata/video-virtio-gpu-device.args index e23bdd8f36..36a5b9bba8 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device virtio-gpu-pci,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qe= muxml2argvdata/video-virtio-gpu-sdl-gl.args index d254d270ff..c68bfc3064 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -display sdl,gl=3Don \ --device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests= /qemuxml2argvdata/video-virtio-gpu-secondary.args index 5d7820b8de..3e4f5da09f 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args @@ -27,7 +27,7 @@ QEMU_AUDIO_DRV=3Dnone \ -no-acpi \ -boot strict=3Don \ -usb \ --device virtio-gpu-pci,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-gpu-pci,id=3Dvideo1,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-gpu-pci,id=3Dvideo1,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/= qemuxml2argvdata/video-virtio-gpu-spice-gl.args index 770799c92c..2df35b484b 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dspice \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ --device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qem= uxml2argvdata/video-virtio-gpu-virgl.args index 3b18f9302f..512d625a28 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don --=20 2.34.1 From nobody Tue May 7 23:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1642527829; cv=none; d=zohomail.com; s=zohoarc; b=loF/xhj3qk5R3by/130fOvvDlkteuSXe7Jra9GM28xhIWZOErPf4PhM6BKkuH0XjzKm0AWY+izQjQ6bczOp4E2I2weyuLjHSTkiC7FnXvlVK7jg4Mj7jjsSadue4r/SpObx8HgGqa5TqlKrrIm6VsC42ESQox75ix3gPp5h+V24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642527829; 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=AxOLuv0XHk9CqZRPxDfxEOKO/+KdvRNicYxp4dX3+d8=; b=QG6ZGgbHpQ+N2cubXMlgBllWDJTLUNGL1JwvpwKYgjF2by90s3RIYnIETWWsvS9Mem7yMgDJzVcVQZRe6UooRxoGBUnYPM66NoJ84CNdjPqEhRcgqUqGoR+At2iYbfWiQYfaYJn+7B9XOM/DJMGYiwQz0C1d2I7ptQeeXegoSCs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1642527829733950.1194351525908; Tue, 18 Jan 2022 09:43:49 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-491-jzlaTYvfPFyOXdYeAO4owQ-1; Tue, 18 Jan 2022 12:43:40 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8D80A30F2; Tue, 18 Jan 2022 17:28:10 +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 9112A10A48D4; Tue, 18 Jan 2022 17:28:10 +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 37D171806D1D; Tue, 18 Jan 2022 17:28:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IG5K36030643 for ; Tue, 18 Jan 2022 11:05:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id 761A6B18AD; Tue, 18 Jan 2022 16:05:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CF414BC75 for ; Tue, 18 Jan 2022 16:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642527828; 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=AxOLuv0XHk9CqZRPxDfxEOKO/+KdvRNicYxp4dX3+d8=; b=TLu7zAZDWzcYC5GUl2AsiJLywmBXQJj5jrir9ZmpH2TkyLSTufXiohhpTVpWNKJZ9of/w+ p9pbO4Vi4tWyV6siXWNgb+vpn9up7yYIVTVsde062Q6lE2UwnE2cK/D3fPf7BZ9L8JTdLn bsiqwjRPfl/vFl/AHO0O8E2nKz5rapg= X-MC-Unique: jzlaTYvfPFyOXdYeAO4owQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/5] qemu: capabilities: Retire QEMU_CAPS_QXL_MAX_OUTPUTS and QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS Date: Tue, 18 Jan 2022 17:04:53 +0100 Message-Id: <3ee9b0086977d0958c65e59d13c247b47163835f.1642521842.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.22 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: 1642527830656100005 Content-Type: text/plain; charset="utf-8" Both are supported by qemu-2.11 and later, so we don't have to check for them explicitly. Note that QXL is supported only on x86_64, thus on other arches only the capability for 'virtio-gpu' is removed. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 4 ++-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - .../qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - .../qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - .../qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 2 -- tests/qemuxml2argvtest.c | 16 ++++------------ tests/qemuxml2xmltest.c | 2 -- 46 files changed, 8 insertions(+), 76 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a71d3b912f..6bb8fffda6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -379,7 +379,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "nec-usb-xhci-ports", /* QEMU_CAPS_NEC_USB_XHCI_PORTS */ "virtio-scsi-pci.iothread", /* QEMU_CAPS_VIRTIO_SCSI_IOTHREA= D */ "name-guest", /* X_QEMU_CAPS_NAME_GUEST */ - "qxl.max_outputs", /* QEMU_CAPS_QXL_MAX_OUTPUTS */ + "qxl.max_outputs", /* X_QEMU_CAPS_QXL_MAX_OUTPUTS */ "qxl-vga.max_outputs", /* X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS */ /* 225 */ @@ -441,7 +441,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 265 */ "virtio-net.tx_queue_size", /* QEMU_CAPS_VIRTIO_NET_TX_QUEUE= _SIZE */ "chardev-reconnect", /* QEMU_CAPS_CHARDEV_RECONNECT */ - "virtio-gpu.max_outputs", /* QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUT= S */ + "virtio-gpu.max_outputs", /* X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTP= UTS */ "vxhs", /* QEMU_CAPS_VXHS */ "virtio-blk.num-queues", /* QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES = */ @@ -1496,12 +1496,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCa= psDevicePropsVmwareSvga[] =3D { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQxl[] =3D { { "vgamem_mb", QEMU_CAPS_QXL_VGAMEM, NULL }, { "vram64_size_mb", QEMU_CAPS_QXL_VRAM64, NULL }, - { "max_outputs", QEMU_CAPS_QXL_MAX_OUTPUTS, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[= ] =3D { { "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL, NULL }, - { "max_outputs", QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, NULL }, { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL }, { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2c1b6a99c4..7d42e3a714 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -358,7 +358,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting= */ QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */ X_QEMU_CAPS_NAME_GUEST, /* -name guest=3D */ - QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs=3D */ + X_QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs=3D */ X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs=3D */ /* 225 */ @@ -420,7 +420,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 265 */ QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */ - QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-ou= tputs=3D */ + X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-= outputs=3D */ QEMU_CAPS_VXHS, /* -drive file.driver=3Dvxhs via query-qmp-schema */ QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 4d916121c5..86adb32202 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -62,7 +62,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.11.0.x86_64.xml index ed9826504c..ab575cb2ee 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -106,7 +106,6 @@ - @@ -133,7 +132,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index 0c646c9c24..150072f0d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -96,7 +96,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index eb964e46d6..05359247b5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index 15a3e8724b..035d17681b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -62,7 +62,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 7f536db863..c90e0c73bf 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -104,7 +104,6 @@ - @@ -130,7 +129,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index e287c85293..cef1659cf2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -91,7 +91,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv32.xml index 4f1a2631d8..e15da432ee 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -45,7 +45,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv64.xml index c917876949..aad775b589 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -45,7 +45,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.s390x.xml index 4d0be025fd..e751648332 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -64,7 +64,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index 24ebdf3bbf..10af446776 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -105,7 +105,6 @@ - @@ -132,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 05d7921734..ca2ce49684 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index eedf55d677..654e9acca4 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -105,7 +105,6 @@ - @@ -132,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 3fe7332e19..8a1fbd1069 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -98,7 +98,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index 10f0d825e7..086dd4b04a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -98,7 +98,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index 9ae7a9260a..a16bc7fac2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -101,7 +101,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index cbfdf4968e..f960e381a2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -101,7 +101,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index 8e6ac7a8a9..2aec9b92dd 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -64,7 +64,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 2e5947aff6..33735f14d0 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -104,7 +104,6 @@ - @@ -131,7 +130,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index 40ad314d29..6bb750d071 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -104,7 +104,6 @@ - @@ -131,7 +130,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 6cdc32dab3..86c2445f45 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -100,7 +100,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 25e879b851..aa269ee0da 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -98,7 +98,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index beac3db473..ad6976dd1f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -64,7 +64,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 415d12054b..290f50207a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -105,7 +105,6 @@ - @@ -132,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index bb6a7d5ee7..4c1a37104c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index f8317c1117..070d0f2982 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -100,7 +100,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 58c7eb6651..286049a8a6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -101,7 +101,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 69f49020e7..f563d672b4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -105,7 +105,6 @@ - @@ -132,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 578e16e8b0..2d0ef18147 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -105,7 +105,6 @@ - @@ -132,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index b943eaedaf..e809b95c43 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index ec64e1cacf..0cbbffe4fb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index a11d15f91a..13a69678b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -100,7 +100,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 552e1d43c9..518bb7ab7f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -63,7 +63,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index bcc262551a..64e7bc21f0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -105,7 +105,6 @@ - @@ -132,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 0fefe64537..743f7d985b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 61685066b8..b034ffd12a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -63,7 +63,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 0d6763e9a3..b213abb9a6 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -104,7 +104,6 @@ - @@ -131,7 +130,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 228f397c67..d9bdcf9e92 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -103,7 +103,6 @@ - @@ -130,7 +129,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 6bf9933bc5..f200a7d4be 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 06cd7fb396..2c8e5fe533 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 75aaeed03c..103d00fddd 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -103,7 +103,6 @@ - @@ -130,7 +129,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 6b80e7817e..0753ac5c78 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -103,7 +103,6 @@ - @@ -130,7 +129,6 @@ - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cc67d806e4..9d2de2a569 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2478,15 +2478,9 @@ mymain(void) QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_QXL_VGAMEM); DO_TEST_CAPS_LATEST("video-qxl-sec-device-vram64"); - DO_TEST("video-qxl-heads", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_QXL_MAX_OUTPUTS); - DO_TEST("video-vga-qxl-heads", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_QXL_MAX_OUTPUTS); - DO_TEST("video-qxl-noheads", - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_QXL_MAX_OUTPUTS); + DO_TEST("video-qxl-heads", QEMU_CAPS_DEVICE_QXL); + DO_TEST("video-vga-qxl-heads", QEMU_CAPS_DEVICE_QXL); + DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL); DO_TEST("video-qxl-resolution", QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_QXL_VGAMEM); @@ -2509,8 +2503,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_GPU); DO_TEST("video-virtio-vga", QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_DEVICE_VIRTIO_VGA, - QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); + QEMU_CAPS_DEVICE_VIRTIO_VGA); DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl"); DO_TEST_CAPS_LATEST("video-bochs-display-device"); DO_TEST_CAPS_LATEST("video-ramfb-display-device"); @@ -3390,7 +3383,6 @@ mymain(void) DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index fb438269b9..2b6124463b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1252,13 +1252,11 @@ mymain(void) DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); DO_TEST("video-virtio-gpu-ccw-auto", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); DO_TEST("video-none-device", QEMU_CAPS_VNC); --=20 2.34.1 From nobody Tue May 7 23:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1642527828; cv=none; d=zohomail.com; s=zohoarc; b=IIHg3XzZOtP73V6UHPFALEvaMJ+ySvRw7UIys81zNZfgERomDbzmoWefnjWBAZ25U85WofbGR2kNYTeI4bNXGtHwH+q7ZaP/Vl0XB70Iaaj8O00HJi3uv9jfUh83JtbV6b8FmEleZCTFkadQVaR2oMShBvNxVFg+HtGiOQjfm9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642527828; 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=ZJFHlvRwGGk8Ee0/rTeGK7oNuJxJ5VbhM++f+Aq2ZE4=; b=GDnolIcWK6tXAwHjTGSmhkQm1mG/avQDlASh2pwGb9ivoUkuOEafSWIGhL1TJO0wkcej94tFmv8XAtp9Z3FGyrX4YV8Yannb/Cqdyr73yAwVN+L1goAhQO2I+AiqTouFPvi5Fv5EdEYzqK/6wHKv9EKCEZ9lUpsTSJsR80Qas5s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1642527828982524.7175454015332; Tue, 18 Jan 2022 09:43:48 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-171-0ixemox2PBauEIyg_Q3U1Q-1; Tue, 18 Jan 2022 12:43:44 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 81A7D10A8ABB; Tue, 18 Jan 2022 17:28:15 +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 5D5F47AB72; Tue, 18 Jan 2022 17:28:15 +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 EE7D81806D03; Tue, 18 Jan 2022 17:28:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IG5Ml5030659 for ; Tue, 18 Jan 2022 11:05:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1981DB18AD; Tue, 18 Jan 2022 16:05:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7C5BB18B8 for ; Tue, 18 Jan 2022 16:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642527827; 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=ZJFHlvRwGGk8Ee0/rTeGK7oNuJxJ5VbhM++f+Aq2ZE4=; b=f9rGzgahq1xjBgnh2jP/P22wRvvwQdZH9hR0BLYxnDUn69c7DgzC7P2iDZ7+kshAdeFbuS WycZdLlFHbI3GokUTzTlT5Ru+NKEsQiydlWUhjZuMhJ9WzrQusqih1iwdBJ5MklYpK6wcc EkLqT0n0ea6L+toQm2pk6d97eqqnZy0= X-MC-Unique: 0ixemox2PBauEIyg_Q3U1Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/5] qemuBuildDeviceVideoCmd: Simplify formatting of 'max_outputs' property Date: Tue, 18 Jan 2022 17:04:54 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.16 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: 1642527830561100003 Content-Type: text/plain; charset="utf-8" Since there's no capability to check now, we can simply move the formatting of 'max_outputs' earlier. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 21 ++++++------------- ...s-spice-agent-file-xfer.x86_64-latest.args | 4 ++-- ...phics-spice-compression.x86_64-latest.args | 4 ++-- ...hics-spice-egl-headless.x86_64-latest.args | 2 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 4 ++-- .../graphics-spice-sasl.x86_64-latest.args | 2 +- .../graphics-spice.x86_64-latest.args | 4 ++-- ...tdev-mdev-display-ramfb.x86_64-latest.args | 2 +- ...play-spice-egl-headless.x86_64-latest.args | 2 +- ...ev-display-spice-opengl.x86_64-latest.args | 2 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 2 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- .../q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../serial-spiceport.x86_64-latest.args | 2 +- .../video-device-pciaddr-default.args | 6 +++--- .../video-qxl-device-vgamem.args | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.args | 6 +++--- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- .../video-qxl-resolution.args | 2 +- .../video-qxl-sec-device-vgamem.args | 4 ++-- ...o-qxl-sec-device-vram64.x86_64-latest.args | 4 ++-- .../video-qxl-sec-device.args | 4 ++-- .../qemuxml2argvdata/video-vga-qxl-heads.args | 6 +++--- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- 36 files changed, 54 insertions(+), 63 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d75cde2280..d54ab5bba6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4822,6 +4822,7 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, bool virtio =3D false; bool virtioBusSuffix =3D false; g_autoptr(virJSONValue) props =3D NULL; + unsigned int max_outputs =3D 0; if (!(model =3D qemuDeviceVideoGetModel(qemuCaps, video, &virtio, &vir= tioBusSuffix))) return -1; @@ -4844,9 +4845,14 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, } } + if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_QXL || + video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO) + max_outputs =3D video->heads; + if (virJSONValueObjectAdd(&props, "s:id", video->info.alias, "T:virgl", virgl, + "p:max_outputs", max_outputs, NULL) < 0) return -1; @@ -4870,28 +4876,13 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, NULL) < 0) return -1; } - - if (virJSONValueObjectAdd(&props, - "p:max_outputs", video->heads, - NULL) < 0) - return -1; } else if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUS= ER) { g_autofree char *alias =3D qemuDomainGetVhostUserChrAlias(video->i= nfo.alias); if (virJSONValueObjectAdd(&props, - "p:max_outputs", video->heads, "s:chardev", alias, NULL) < 0) return -1; - } else if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { - unsigned int heads =3D 0; - - heads =3D video->heads; - - if (virJSONValueObjectAdd(&props, - "p:max_outputs", heads, - NULL) < 0) - return -1; } else if ((video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VMVGA && diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args index 520ab87acc..1593f55217 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-fil= e-xfer=3Don,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","addr= ":"0x4"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864= ,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr= ":"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.ar= gs index 35206c0741..d8f57112ad 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-g= lz-wan-compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilte= r,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864= ,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr"= :"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.= args index 9b69a29c0f..137d80e285 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,addr=3D127.0.0.1,seamless-migration=3Don \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args index 0a20c13eb0..9b57101c8a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,seamless-migratio= n=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864= ,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr"= :"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args index 7f846f8048..5e0a6f28a0 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args @@ -30,7 +30,7 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl=3Don,x509-dir=3D/= etc/pki/libvirt-spice,tls-channel=3Ddefault,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args b/tes= ts/qemuxml2argvdata/graphics-spice.x86_64-latest.args index c33f1d6e36..d4354f1368 100644 --- a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Ddefault,tls-channel=3Dmain,plaintext-channel=3Din= puts,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan-= compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disab= le-copy-paste=3Don,disable-agent-file-xfer=3Don,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864= ,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr"= :"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.ar= gs index 63813837e9..24b8b09fc8 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"vfio-pci-nohotplug","id":"hostdev0","sysfsdev":"/sys/b= us/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","ramfb= ":true,"bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"vfio-pci","id":"hostdev1","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dd","display":"on","bus":"pci.0","a= ddr":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless= .x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl= -headless.x86_64-latest.args index 447cd900e8..1a94c7af17 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_6= 4-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x8= 6_64-latest.args index e745397598..02b0f12a08 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x= 86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-hea= dless.x86_64-latest.args index 44f07d4ef3..b5bb6922df 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index 302b94780b..6eaaf8c81c 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index 3aec9cb96f..77cad42cae 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -30,5 +30,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ioh3420,port=3D26,chassis=3D40,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.= 0x1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index 41fb7e4d0c..a713034c28 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -38,5 +38,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device xio3130-downstream,port=3D6,chassis=3D10,id=3Dpci.10,bus=3Dpci.2,a= ddr=3D0x6 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index ed256a6473..568fdc26bc 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device x3130-upstream,id=3Dpci.4,bus=3Dpci.2,addr=3D0x0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv= data/pcihole64-q35.args index 400270b4b8..cf1423b163 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=3Dnone \ -global q35-pcihost.pci-hole64-size=3D1048576K \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg= vdata/q35-usb2-multi.args index 69ee444043..f37fee42a8 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -42,5 +42,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x1.0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a= rgvdata/q35-usb2-reorder.args index ce64732a2c..5d35297bf3 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -42,5 +42,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/= q35-usb2.args index d6cdc55a66..b69a39d36f 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -34,5 +34,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.args index 178f33e2aa..5fe11ec1ef 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -47,7 +47,7 @@ QEMU_AUDIO_DRV=3Dspice \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,id=3Dchannel1,name=3Dcom.redhat.spice.0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -spice port=3D5901,tls-port=3D5902,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Doff,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpcie.0,addr=3D0x1 \ -device ich9-intel-hda,id=3Dsound0,bus=3Dpcie.0,addr=3D0x1b \ -device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0 \ -chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index 9793c11447..0de12902c8 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=3Dnone \ -device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,max_o= utputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2a= rgvdata/serial-spiceport.args index 804e118540..211fa7c352 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -32,6 +32,6 @@ QEMU_AUDIO_DRV=3Dspice \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args b/t= ests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args index f756fb4870..c10b07d3bb 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tes= ts/qemuxml2argvdata/video-device-pciaddr-default.args index baa15e44df..bd6ce59ac7 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -29,8 +29,8 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -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 qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x3 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D1,bus=3Dpci.0,addr=3D0x4 \ --device qxl,id=3Dvideo2,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D1,bus=3Dpci.0,addr=3D0x5 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x3 \ +-device qxl,id=3Dvideo1,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,bus=3Dpci.0,addr=3D0x4 \ +-device qxl,id=3Dvideo2,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,bus=3Dpci.0,addr=3D0x5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qe= muxml2argvdata/video-qxl-device-vgamem.args index e8931c07fc..ea1536f25f 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index f42498a616..d4ee6c1da9 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":128,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0"= ,"addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":128,"vgamem_mb":16,"bus":"pci.0"= ,"addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2a= rgvdata/video-qxl-device.args index 8a4729ac71..0eeac66d2c 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2ar= gvdata/video-qxl-heads.args index c9d13ab55b..84958a9512 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.args @@ -29,8 +29,8 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -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 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,max_outpu= ts=3D3,bus=3Dpci.0,addr=3D0x4 \ --device qxl,id=3Dvideo2,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D7,bus=3Dpci.0,addr=3D0x5 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,max_outputs=3D3,ram_size=3D67108864,vram_size=3D33= 554432,bus=3Dpci.0,addr=3D0x4 \ +-device qxl,id=3Dvideo2,max_outputs=3D7,ram_size=3D67108864,vram_size=3D67= 108864,bus=3Dpci.0,addr=3D0x5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2= argvdata/video-qxl-noheads.args index 3202979915..242fb9055b 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -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 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemux= ml2argvdata/video-qxl-resolution.args index c66a08ee10..0bb7d66f14 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.args @@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -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 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D8,max_outputs=3D1,xres=3D1280,yres=3D720,bus=3Dpci.0,addr=3D0x2 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D8,xres=3D1280,yres=3D720,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/test= s/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index 7f3b5cc0d9..0ce9308efe 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vgame= m_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,vgamem_mb= =3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-late= st.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.= args index 4aaedb252d..09e21bad67 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":128,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","ad= dr":"0x4"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864= ,"vram_size":67108864,"vram64_size_mb":128,"vgamem_mb":16,"bus":"pci.0","ad= dr":"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemux= ml2argvdata/video-qxl-sec-device.args index 4754289d6d..c085014b56 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,bus=3Dpci.0,addr=3D0x4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxm= l2argvdata/video-vga-qxl-heads.args index c9d13ab55b..84958a9512 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args @@ -29,8 +29,8 @@ QEMU_AUDIO_DRV=3Dnone \ -usb \ -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 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,max_o= utputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,max_outpu= ts=3D3,bus=3Dpci.0,addr=3D0x4 \ --device qxl,id=3Dvideo2,ram_size=3D67108864,vram_size=3D67108864,max_outpu= ts=3D7,bus=3Dpci.0,addr=3D0x5 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,max_outputs=3D3,ram_size=3D67108864,vram_size=3D33= 554432,bus=3Dpci.0,addr=3D0x4 \ +-device qxl,id=3Dvideo2,max_outputs=3D7,ram_size=3D67108864,vram_size=3D67= 108864,bus=3Dpci.0,addr=3D0x5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 8cad1d9f38..56226138bf 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -43,7 +43,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","= addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x7"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x8"}' \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index 9e4c361ec9..37a1afb897 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -50,7 +50,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pcie.0",= "addr":"0x1"}' \ +-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pcie.0",= "addr":"0x1"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ --=20 2.34.1 From nobody Tue May 7 23:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1642527853; cv=none; d=zohomail.com; s=zohoarc; b=fzf5zS9b3DsXVQhcAu4VaVa6fU+RZ7Zhbl+FnjPZitH5fWqjO+zkPVxhmoJhPFrZltCfBqucQZdKa7ZZtWwVkYslnVRggG8yje+Rqg455EGR9Q6/VpTK5WWdqpnyQfH1NReV+Jbcpu28RDVEY8OmWNbAZlz/4mTgPvf4GJbQz9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642527853; 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=qV6fRzLjcdbQSTg2nqzIy5/F3i2RWd86VD4MJmuQZ9s=; b=AO1rZu9uJMTiSvNZD4lB2i953FjqOpmJ2hVS+KW4lNFD4UcKaNNbX4PgZ8eYxSIFH8iiwE9tqtrjafzeoEewkR3PomOeegp4Lv3AmTyLuQDsbE3rY+/41jCYtu+2O3pkufBYrnhhSC0O9bWttyDQDHRosVMa7eGJhsC0iqftwAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1642527853721795.0378076633269; Tue, 18 Jan 2022 09:44:13 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-345-SK9jcrqIOIeqPE0GrjXflg-1; Tue, 18 Jan 2022 12:43:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F23A3BFFAC; Tue, 18 Jan 2022 17:28:18 +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 D3DBB7EBF6; Tue, 18 Jan 2022 17:28:18 +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 840FD4A705; Tue, 18 Jan 2022 17:28:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IG5NNX030681 for ; Tue, 18 Jan 2022 11:05:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 52D29B18AD; Tue, 18 Jan 2022 16:05:23 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2B35B18A7 for ; Tue, 18 Jan 2022 16:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642527852; 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=qV6fRzLjcdbQSTg2nqzIy5/F3i2RWd86VD4MJmuQZ9s=; b=eot67/mJ/WQnmj3iQpbCaP90Z0ZJyo1EwTPHytRLoAC7QTdnDtn6+lJJzxsOuYSjNGCSLo GMsUeydTdJAbsVEyc0mq97qvWj2WoPlkensUwFBPc+vv28yfU8zRK5N5bj7O3/kQvIP9Jd C48BaxB6bTnEGNi/SkSb5RDJOPGKFds= X-MC-Unique: SK9jcrqIOIeqPE0GrjXflg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/5] qemuValidateDomainDeviceDefVideo: Refactor condition checking for qxl and virtio-vga Date: Tue, 18 Jan 2022 17:04:55 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.12 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: 1642527855606100001 Content-Type: text/plain; charset="utf-8" Subsequent patch will use the same condition so move the primary device check into a nested condition. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3a69733f81..5b2af94890 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2472,14 +2472,14 @@ qemuValidateDomainDeviceDefVideo(const virDomainVid= eoDef *video, return -1; } - if (!video->primary && - video->type !=3D VIR_DOMAIN_VIDEO_TYPE_QXL && + if (video->type !=3D VIR_DOMAIN_VIDEO_TYPE_QXL && video->type !=3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("video type '%s' is only valid as primary " - "video device"), - virDomainVideoTypeToString(video->type)); - return -1; + if (!video->primary) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("video type '%s' is only valid as primary vid= eo device"), + virDomainVideoTypeToString(video->type)); + return -1; + } } if (video->accel && video->accel->accel2d =3D=3D VIR_TRISTATE_SWITCH_O= N) { --=20 2.34.1 From nobody Tue May 7 23:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1642528504; cv=none; d=zohomail.com; s=zohoarc; b=a0Oa3Fv+twpU5yqpY/+6/pqLl/X+N9xAat3XIDJ4YIMxMNd+H5V2yLuQAirQ5YBBMXEjvR9guqMzdKUr9LjIRi1lqOqMsoGpFedwI3XoQSerQ7Jc13qWl69cIWtKLWRQtwQoxXcMdTFgaFg57oCn2eAI8++YD87s7AdW+09A9YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642528504; 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=5i0zLX6o8Jg8rDh5SfOBooxSqKMNiU8Gy0/Tc2wO+r4=; b=mPYZ98AwgXVRxqVXYgU5JXHWPvgDsM8aEQ+fOHIlXMuqJLgqWbfzI2NKikm6u9gmDwEsUL7GmP5JIEZbfpgbmJoBGn8MbUgf+ABeTnDMrqiyVAM/z2eeCCWtl6VAcHCEWrz7UTlga8oPAbgJAAHSfbCvkumunORqbdvKT15edic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1642528504876873.4889868672785; Tue, 18 Jan 2022 09:55:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-483--pql-aZ5MYqsSIh570DVYQ-1; Tue, 18 Jan 2022 12:54:54 -0500 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 19EFC84DA4E; Tue, 18 Jan 2022 17:48:51 +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 E5CE37A552; Tue, 18 Jan 2022 17:48: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 841CC4A70A; Tue, 18 Jan 2022 17:48:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IG5ODj030692 for ; Tue, 18 Jan 2022 11:05:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id D0854B18AD; Tue, 18 Jan 2022 16:05:24 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28CA0B18A7 for ; Tue, 18 Jan 2022 16:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642528503; 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=5i0zLX6o8Jg8rDh5SfOBooxSqKMNiU8Gy0/Tc2wO+r4=; b=hQ7RZEGwZIvA1LzJ0MAnA1jNh+mHocRveAvnozstM/Cpo6tUYXr7S8v5Ew6pa7IF6TR6Hr CgyFJM+pvO+yK52OxVsY6DqSR+ioByagB5BsOZczsk0By8iLvm22qk8qgLWdeSaBe2+T7R PqLEm9QECqVXiIaCkaW3Gwdg7k9GaQk= X-MC-Unique: -pql-aZ5MYqsSIh570DVYQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/5] qemuValidateDomainDeviceDefVideo: Reject non-default video head count for devices not supporting it Date: Tue, 18 Jan 2022 17:04:56 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1642528505993100001 Content-Type: text/plain; charset="utf-8" Only QXL and virtio-vga actually propagate the 'heads' attribute as 'max_outputs' to the commandline of qemu. Reject the setting when non-default value is used for any other video type. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2036300 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 5b2af94890..4fb4a8a536 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2480,6 +2480,13 @@ qemuValidateDomainDeviceDefVideo(const virDomainVide= oDef *video, virDomainVideoTypeToString(video->type)); return -1; } + + if (video->heads !=3D 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("video type '%s' doesn't support multiple 'he= ads'"), + virDomainVideoTypeToString(video->type)); + return -1; + } } if (video->accel && video->accel->accel2d =3D=3D VIR_TRISTATE_SWITCH_O= N) { --=20 2.34.1