From nobody Mon Feb 9 06:50:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657885488; cv=none; d=zohomail.com; s=zohoarc; b=K2w24r5Ay3Lpz2XObdYCPl91qaAvu48dJbM/DffX5Ysxhsd21p1QQNZe2cUUnqU0ln44LOVDLao3W2hJn4yz2IiQRnA3CAt0v/dT5lFp+lWVG5sLjxeUNRZdgeYSpkzlrEys7eNHqSs5gtHbX0UCWaOsLuCAXTqkasrkHR1OGh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657885488; 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=2CamWnaiMNXEpo+DBLB979k6sTaSK620WjnLPmYPU1g=; b=fF7b2lOlqaxcZGMQcsVufB0w9jgoPIVkpbbmbnX64U0DMQpZ0NDG32HYv4kRj+j/cU8yI0wZlyQtbzaIoONclgqu7EBIyvQDMhidvenp/me/oP1UkVHfUB2Kz8hOBMtp3HLO1FALhWmlVNNY7fmscF2kDSaM3EFtBCA759QisO0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1657885488845120.85958058530946; Fri, 15 Jul 2022 04:44:48 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-tD7HYxXJNWWho4dLWLqK7w-1; Fri, 15 Jul 2022 07:44:34 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94751803918; Fri, 15 Jul 2022 11:44:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81119492CA2; Fri, 15 Jul 2022 11:44:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8EAEF1947B81; Fri, 15 Jul 2022 11:44:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8050E19466DF for ; Fri, 15 Jul 2022 11:44:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 72E8C40315B; Fri, 15 Jul 2022 11:44:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04BCA475009 for ; Fri, 15 Jul 2022 11:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657885487; 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=2CamWnaiMNXEpo+DBLB979k6sTaSK620WjnLPmYPU1g=; b=WVWs16jXC2MsaeDphA1tb0E6kL5hJdrixn3nLlTNEDIpSLw5sgrtuZx6fEvxt80CUEyIm3 DNuY3MIyNxl5M/cLeiYWI64riOWQ1k9vUHmPJZdbVx95lt1MNV0DdcUCcRrJ70JNAtron8 z3ZDn9Se4H7H23ke9O6km/gKGDtgXbw= X-MC-Unique: tD7HYxXJNWWho4dLWLqK7w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/20] qemuxml2argvtest: Remove 'qemu-3.1' versions of virtio-(non-)transitional tests Date: Fri, 15 Jul 2022 13:44:09 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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: 1657885489993100001 Content-Type: text/plain; charset="utf-8" Starting from qemu-4.0 a new device model name is used instead of the 'disable_*' props. Since we are going to bump to qemu-4.2 as minimum this test can be removed. Signed-off-by: Peter Krempa --- .../virtio-non-transitional.x86_64-3.1.0.args | 53 ------------------- .../virtio-transitional.x86_64-3.1.0.args | 46 ---------------- tests/qemuxml2argvtest.c | 3 -- 3 files changed, 102 deletions(-) delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3= .1.0.args delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0= .args diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.ar= gs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args deleted file mode 100644 index 2d0e568bb0..0000000000 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args +++ /dev/null @@ -1,53 +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-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-3.1,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 214 \ --overcommit mem-lock=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,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ --device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ --device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ --device pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ --device pcie-root-port,port=3D15,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x1.0x7 \ --device pcie-root-port,port=3D16,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ --device pcie-root-port,port=3D17,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x2.0x1 \ --device virtio-scsi-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dscsi= 0,bus=3Dpci.4,addr=3D0x0 \ --device virtio-serial-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dvi= rtio-serial0,bus=3Dpci.3,addr=3D0x0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-pci,disable-legacy=3Don,disable-modern=3Doff,scsi=3Doff= ,bus=3Dpci.5,addr=3D0x0,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootin= dex=3D1 \ --fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device virtio-9p-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dfs0,fs= dev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.1,addr=3D0x0 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,disable-legacy=3Don,disable-modern=3Doff,netdev=3Dh= ostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x0 \ --device vhost-scsi-pci,disable-legacy=3Don,disable-modern=3Doff,wwpn=3Dnaa= .5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.6,addr=3D0x0 \ --device virtio-balloon-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Db= alloon0,bus=3Dpci.7,addr=3D0x0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ --device virtio-rng-pci,disable-legacy=3Don,disable-modern=3Doff,rng=3Dobjr= ng0,id=3Drng0,bus=3Dpci.8,addr=3D0x0 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device vhost-vsock-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dvsoc= k0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.9,addr=3D0x0 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b= /tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args deleted file mode 100644 index 83bb5d137d..0000000000 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args +++ /dev/null @@ -1,46 +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-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-3.1,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 214 \ --overcommit mem-lock=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,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device virtio-scsi-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dscs= i0,bus=3Dpci.2,addr=3D0x4 \ --device virtio-serial-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dv= irtio-serial0,bus=3Dpci.2,addr=3D0x3 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-pci,disable-legacy=3Doff,disable-modern=3Doff,scsi=3Dof= f,bus=3Dpci.2,addr=3D0x5,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ --fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device virtio-9p-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dfs0,f= sdev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.2,addr=3D0x1 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,disable-legacy=3Doff,disable-modern=3Doff,netdev=3D= hostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \ --device vhost-scsi-pci,disable-legacy=3Doff,disable-modern=3Doff,wwpn=3Dna= a.5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.2,addr=3D0x6 \ --device virtio-balloon-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3D= balloon0,bus=3Dpci.2,addr=3D0x7 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ --device virtio-rng-pci,disable-legacy=3Doff,disable-modern=3Doff,rng=3Dobj= rng0,id=3Drng0,bus=3Dpci.2,addr=3D0x8 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device vhost-vsock-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dvso= ck0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.2,addr=3D0x9 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8d76472c0c..d65a18f8d4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3310,9 +3310,6 @@ mymain(void) DO_TEST("riscv64-virt-pci", QEMU_CAPS_OBJECT_GPEX); - /* Older version checks disable-legacy usage */ - DO_TEST_CAPS_VER("virtio-transitional", "3.1.0"); - DO_TEST_CAPS_VER("virtio-non-transitional", "3.1.0"); DO_TEST_CAPS_LATEST("virtio-transitional"); DO_TEST_CAPS_LATEST("virtio-non-transitional"); DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-transitional-not-supported"); --=20 2.36.1