From nobody Mon Feb 9 06:50:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1618836195; cv=none; d=zohomail.com; s=zohoarc; b=BGCyatmoCBHk0BV9vD5vNV7wgwHq+Ke4XlKs5qpGcCtSdpdV864E+QXo23I6PEfeCxr6DKi19Ic/9tlU2qs8XNG33wzb61YlOMXvZW6N4njwVN7/Rbwkge/wwVu/OGaHJMUk50PtQIXZoYNRgzk6pkcET4SOhKxtINJILC7sZhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618836195; 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=WeEtnk2XGoI7wtiX2SXo0gg2KwN9v3t8IZChqwWvIRk=; b=nRZvNX01SMAf2q4GnrR/V9BH6ZonWpLAgSxUl1XfWDWSF4X0glQNIHTCe7nA/jCigzqCraSdaHCLYTDvAgGLyoh2067vuDZmjvw/2/OFcC/l/1GyG/RqcWEX/m91X+CzU0piXdTY4GncSqmMZiZruNJxJZJlbBxFAnQNm2Lb+H8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1618836195443932.5243434166694; Mon, 19 Apr 2021 05:43:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-549-iCLnVvYBMJmPYeJnX5rttg-1; Mon, 19 Apr 2021 08:39:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80ECA8189D2; Mon, 19 Apr 2021 12:39:27 +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 611A060CCE; Mon, 19 Apr 2021 12:39:27 +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 29DED1806D28; Mon, 19 Apr 2021 12:39:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13JCaBUk019200 for ; Mon, 19 Apr 2021 08:36:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C95619C79; Mon, 19 Apr 2021 12:36:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9815D19C66 for ; Mon, 19 Apr 2021 12:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618836194; 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=WeEtnk2XGoI7wtiX2SXo0gg2KwN9v3t8IZChqwWvIRk=; b=PQa7SNSbfexH2N5oTErBFOOLV1Q2/jiM71NilVuyupDY0UGKTPPQM44TZLdOj1rTXLXQ2/ q1aiZNfLaKqpjjNPkvp/G8jvju4PAQ9JgcFmlfAHMdYEjckypyNcJuFDLfDON9nN+amM2m +bBhCDqzme9l6/BZNWoxzTyTlVLx3sY= X-MC-Unique: iCLnVvYBMJmPYeJnX5rttg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/38] qemuxml2argvtest: Remove tests for absence of QEMU_CAPS_DEVICE_VIDEO_PRIMARY Date: Mon, 19 Apr 2021 14:35:21 +0200 Message-Id: <51b23d0bff84f42a6ec201b0ee6e61a36d3b3742.1618834490.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.13 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) Content-Type: text/plain; charset="utf-8" All supported qemu versions now have the capability so testing the absence doesn't make sense. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa --- .../qemuxml2argvdata/video-qxl-nodevice.args | 32 ------------------- tests/qemuxml2argvdata/video-qxl-nodevice.xml | 29 ----------------- .../qemuxml2argvdata/video-vga-nodevice.args | 30 ----------------- tests/qemuxml2argvdata/video-vga-nodevice.xml | 29 ----------------- tests/qemuxml2argvtest.c | 2 -- 5 files changed, 122 deletions(-) delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-nodevice.xml delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.args delete mode 100644 tests/qemuxml2argvdata/video-vga-nodevice.xml diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args b/tests/qemuxml= 2argvdata/video-qxl-nodevice.args deleted file mode 100644 index 2ef92283df..0000000000 --- a/tests/qemuxml2argvdata/video-qxl-nodevice.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name QEMUGuest1 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --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 \ --vga qxl \ --global qxl-vga.ram_size=3D67108864 \ --global qxl-vga.vram_size=3D67108864 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.xml b/tests/qemuxml2= argvdata/video-qxl-nodevice.xml deleted file mode 100644 index d52fdf0fa0..0000000000 --- a/tests/qemuxml2argvdata/video-qxl-nodevice.xml +++ /dev/null @@ -1,29 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - - - - - diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args b/tests/qemuxml= 2argvdata/video-vga-nodevice.args deleted file mode 100644 index c290c203e5..0000000000 --- a/tests/qemuxml2argvdata/video-vga-nodevice.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name QEMUGuest1 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --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 \ --vga std \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.xml b/tests/qemuxml2= argvdata/video-vga-nodevice.xml deleted file mode 100644 index 7e2080af0d..0000000000 --- a/tests/qemuxml2argvdata/video-vga-nodevice.xml +++ /dev/null @@ -1,29 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 47f668d37d..db3b5aa3a1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2456,12 +2456,10 @@ mymain(void) QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); - DO_TEST("video-vga-nodevice", QEMU_CAPS_DEVICE_VGA); DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("video-vga-device-vgamem", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_VGAMEM); - DO_TEST("video-qxl-nodevice", QEMU_CAPS_DEVICE_QXL); DO_TEST("video-qxl-device", QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); --=20 2.30.2