From nobody Mon Feb 9 04:45:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618836067; cv=none; d=zohomail.com; s=zohoarc; b=ZNDe05VUos3QUpTFn+pcLoqufOrDf13WBuzXKHBLg6IC8yhSfWOyNlEbCWv7FUV/Gy8Yx6SLQz7f4tebmupREPsIBz25Dzaj0Nr2aSGLc0bxbxal3D7YmNDXc/bgwPzdauaBm12ibVu3I+0QfipGyGLeGGL8XacjOUw6MSci2uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618836067; 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=E3Abadfh5cOFHd/cn0IQToKFE93Ml4isv7PRAHVNR58=; b=NONFoG8eUqr+3CxV4KNPtz6ql+zExupaR/JrJY+lCsAqDYx0SoVQNZC5TT+mdSde1F02iWeGw9ikpGZLJrHT1nwAB9IH1thnHwa82BIgnzioRzfC2VyrHLecI04OF816PFlTGgOUF+F0Xznra97tWPmpiq3PKwQc9BFh09jh3Qw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1618836067700767.997856194568; Mon, 19 Apr 2021 05:41:07 -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-503-nNCZACljNt23bOkqGDLCTA-1; Mon, 19 Apr 2021 08:39:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 216791922961; Mon, 19 Apr 2021 12:39: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 F38272C169; Mon, 19 Apr 2021 12:39:14 +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 B45961806D1D; Mon, 19 Apr 2021 12:39:14 +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 13JCZriP019025 for ; Mon, 19 Apr 2021 08:35:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C20CE72F; Mon, 19 Apr 2021 12:35:53 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70C8519C79 for ; Mon, 19 Apr 2021 12:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618836066; 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=E3Abadfh5cOFHd/cn0IQToKFE93Ml4isv7PRAHVNR58=; b=fU0cTqZ45aWpsKlHRPLiwPdzSuoSzNCjPrrD81GFbp25PcFgX4xRzVsocbmmGCuzBp9cWw xNv8Q35+TQUESwBpTaAeFkyZVoVquox6ieMGko3QSS42Zk5LHoCX0qi/rOdQwpV1Dv5xUY +lWxgdMY7BGeT8wDlcgcqUwIBF3j9Ac= X-MC-Unique: nNCZACljNt23bOkqGDLCTA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/38] qemuxml2argvtest: Remove versioned tests for qemu < 2.11 Date: Mon, 19 Apr 2021 14:35:07 +0200 Message-Id: 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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Drop all the cases pinned to unsupported versions. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa --- .../channel-unix-guestfwd.x86_64-2.5.0.args | 33 ------------- .../console-virtio-unix.x86_64-2.5.0.args | 34 -------------- .../disk-cache.x86_64-1.5.3.args | 38 --------------- .../disk-cache.x86_64-2.6.0.args | 40 ---------------- .../disk-cache.x86_64-2.7.0.args | 40 ---------------- .../disk-network-rbd.x86_64-2.5.0.args | 40 ---------------- .../disk-scsi-device-auto.x86_64-1.5.3.args | 33 ------------- .../eoi-disabled.x86_64-2.7.0.args | 30 ------------ .../eoi-enabled.x86_64-2.7.0.args | 30 ------------ .../graphics-vnc-tls.x86_64-2.4.0.args | 30 ------------ .../hostdev-scsi-lsi.x86_64-2.8.0.args | 45 ------------------ ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 47 ------------------- .../intel-iommu.x86_64-2.6.0.args | 29 ------------ .../kvmclock+eoi-disabled.x86_64-2.7.0.args | 30 ------------ .../net-vhostuser.x86_64-2.5.0.args | 36 -------------- .../parallel-unix-chardev.x86_64-2.5.0.args | 33 ------------- .../pv-spinlock-disabled.x86_64-2.7.0.args | 30 ------------ .../pv-spinlock-enabled.x86_64-2.7.0.args | 30 ------------ ...artcard-passthrough-unix.x86_64-2.5.0.args | 32 ------------- .../usb-redir-unix.x86_64-2.5.0.args | 36 -------------- .../virtio-rng-egd-unix.x86_64-2.5.0.args | 32 ------------- tests/qemuxml2argvtest.c | 22 --------- 22 files changed, 750 deletions(-) delete mode 100644 tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5= .0.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0= .args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.ar= gs delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5= .3.args delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.ar= gs delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.ar= gs delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-= 2.8.0.args delete mode 100644 tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7= .0.args delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5= .0.args delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.= 0.args delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0= .args delete mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_6= 4-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args delete mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0= .args diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args= b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args deleted file mode 100644 index 7dfe29e892..0000000000 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args +++ /dev/null @@ -1,33 +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 \ --machine pc-i440fx-2.5,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --chardev socket,id=3Dcharchannel0,path=3D/tmp/guestfwd-listen.socket,serve= r=3Don,wait=3Doff \ --netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ --chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ --netdev user,guestfwd=3Dtcp:10.0.2.1:4601-chardev:charchannel1,id=3Dchanne= l1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args b= /tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args deleted file mode 100644 index 2c09118e98..0000000000 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args +++ /dev/null @@ -1,34 +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 \ --machine pc-i440fx-2.5,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ --chardev socket,id=3Dcharconsole0,path=3D/tmp/listen.socket,server=3Don,wa= it=3Doff \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ --chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ --device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-1.5.3.args deleted file mode 100644 index b60db3ee82..0000000000 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args +++ /dev/null @@ -1,38 +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 QEMUGuest1 \ --S \ --machine pc-i440fx-1.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,cache=3Dwriteback \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,cache=3Dunsafe \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,cache=3Dnone \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-v= irtio-disk0,cache=3Dwritethrough \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-u= sb-disk1,cache=3Ddirectsync \ --device usb-storage,bus=3Dusb.0,port=3D1,drive=3Ddrive-usb-disk1,id=3Dusb-= disk1,removable=3Doff diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-2.6.0.args deleted file mode 100644 index b82483c083..0000000000 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args +++ /dev/null @@ -1,40 +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-i440fx-2.6,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,cache=3Dwriteback \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,cache=3Dunsafe \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,cache=3Dnone \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-v= irtio-disk0,cache=3Dwritethrough \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-u= sb-disk1,cache=3Ddirectsync \ --device usb-storage,bus=3Dusb.0,port=3D1,drive=3Ddrive-usb-disk1,id=3Dusb-= disk1,removable=3Doff \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-2.7.0.args deleted file mode 100644 index f94cb247a1..0000000000 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args +++ /dev/null @@ -1,40 +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-i440fx-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,cache=3Dwriteback \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,write-cache=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,cache=3Dunsafe \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1,w= rite-cache=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,cache=3Dnone \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0,write-cache=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-v= irtio-disk0,cache=3Dwritethrough \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0,write-cache=3Doff \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-u= sb-disk1,cache=3Ddirectsync \ --device usb-storage,bus=3Dusb.0,port=3D1,drive=3Ddrive-usb-disk1,id=3Dusb-= disk1,removable=3Doff,write-cache=3Doff \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/te= sts/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args deleted file mode 100644 index e316ff9ee6..0000000000 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args +++ /dev/null @@ -1,40 +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 guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3Dmon1.exampl= e.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Draw,if= =3Dnone,id=3Ddrive-virtio-disk0' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3Drbd:pool/image@asdf:auth_supported=3Dnone,format=3Draw,if=3D= none,id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,id=3Dvirtio-disk1 \ --drive 'file=3Drbd:pool/image@foo:auth_supported=3Dnone:mon_host=3Dmon1.ex= ample.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Dra= w,if=3Dnone,id=3Ddrive-virtio-disk2' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk2,id=3Dvirtio-disk2 \ --drive file=3Drbd:pool/image@foo:auth_supported=3Dnone:conf=3D/blah/test.c= onf,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk3 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk3,id=3Dvirtio-disk3 \ --drive 'file=3Drbd:pool/image:id=3Dmyname:key=3DQVFDVm41aE82SHpGQWhBQXEwTk= N2OGp0SmNJY0UrSE9CbE1RMUE=3D:auth_supported=3Dcephx\;none:mon_host=3Dmon1.e= xample.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=3Dr= aw,if=3Dnone,id=3Ddrive-virtio-disk4' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk4,id=3Dvirtio-disk4 \ --drive 'file=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3D[\:\:1]\:63= 21\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:ff= 00\:42\:8329]\:6322,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk5' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-vir= tio-disk5,id=3Dvirtio-disk5 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args= b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args deleted file mode 100644 index 7f874d7721..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args +++ /dev/null @@ -1,33 +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-i440fx-1.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --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 \ --drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-= 0 \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args b/tests/= qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args deleted file mode 100644 index 119bfd8058..0000000000 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.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 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-i440fx-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,-kvm_pv_eoi \ --m 214 \ --realtime mlock=3Doff \ --smp 6,sockets=3D6,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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args b/tests/q= emuxml2argvdata/eoi-enabled.x86_64-2.7.0.args deleted file mode 100644 index 29651e132a..0000000000 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.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 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-i440fx-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,+kvm_pv_eoi \ --m 214 \ --realtime mlock=3Doff \ --smp 6,sockets=3D6,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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/te= sts/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args deleted file mode 100644 index 111c097683..0000000000 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.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 \ -SASL_CONF_PATH=3D/root/.sasl2 \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --machine pc-i440fx-2.4,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --vnc 127.0.0.1:3,tls=3Don,x509verify=3D/etc/pki/libvirt-vnc,sasl=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args deleted file mode 100644 index c933011f9d..0000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args +++ /dev/null @@ -1,45 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest2,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest2/master-key.aes \ --machine pc-i440fx-2.8,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest2/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --drive file=3D/dev/HostVG/QEMUGuest2,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 \ --drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ --drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,format=3Draw,id=3Ddrive-hostdev2 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Ddrive-hostdev2,id= =3Dhostdev2 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,format=3Draw,id=3Ddrive-hostdev3 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:3260/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,format=3Draw,id=3D= drive-hostdev4 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D3,drive=3Ddrive-hostdev4,id= =3Dhostdev4 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3D= drive-hostdev5 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D2,drive=3Ddrive-hostdev5,id= =3Dhostdev5 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args deleted file mode 100644 index 6125d9e2b7..0000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ /dev/null @@ -1,47 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest2,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest2/master-key.aes \ --machine pc-i440fx-2.8,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest2/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --drive file=3D/dev/HostVG/QEMUGuest2,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 \ --drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,drive= =3Ddrive-hostdev0,id=3Dhostdev0 \ --drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,drive= =3Ddrive-hostdev1,id=3Dhostdev1 \ --drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-ua-7996c8dc-a4fa-= 4012-b76f-043d20144263 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D6,drive= =3Ddrive-ua-7996c8dc-a4fa-4012-b76f-043d20144263,id=3Dua-7996c8dc-a4fa-4012= -b76f-043d20144263 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,format=3Draw,id=3Ddrive-hostdev2 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,drive= =3Ddrive-hostdev2,id=3Dhostdev2 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,format=3Draw,id=3Ddrive-hostdev3,readonly=3Don \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,drive= =3Ddrive-hostdev3,id=3Dhostdev3 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:3260/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,format=3Draw,id=3D= drive-hostdev4 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,drive= =3Ddrive-hostdev4,id=3Dhostdev4 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3D= drive-hostdev5 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,drive= =3Ddrive-hostdev5,id=3Dhostdev5 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args b/tests/q= emuxml2argvdata/intel-iommu.x86_64-2.6.0.args deleted file mode 100644 index b68f5908c5..0000000000 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args +++ /dev/null @@ -1,29 +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-2.6,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,iommu=3Don= \ --cpu qemu64 \ --m 214 \ --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 \ --boot strict=3Don \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args= b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args deleted file mode 100644 index 9367978bff..0000000000 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.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 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-i440fx-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,-kvmclock,-kvm_pv_eoi \ --m 214 \ --realtime mlock=3Doff \ --smp 6,sockets=3D6,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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests= /qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args deleted file mode 100644 index 718156b864..0000000000 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args +++ /dev/null @@ -1,36 +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 guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server=3Don \ --netdev vhost-user,chardev=3Dcharnet0,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ee:96:6b= ,bus=3Dpci.0,addr=3D0x2 \ --chardev socket,id=3Dcharnet1,path=3D/tmp/vhost1.sock \ --netdev vhost-user,chardev=3Dcharnet1,id=3Dhostnet1 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:ee:96:6c= ,bus=3Dpci.0,addr=3D0x3 \ --netdev socket,listen=3D:2015,id=3Dhostnet2 \ --device rtl8139,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:95:db:c0,bus=3D= pci.0,addr=3D0x4 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args= b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args deleted file mode 100644 index a9d1f97626..0000000000 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args +++ /dev/null @@ -1,33 +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 \ --machine pc-i440fx-2.5,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --chardev socket,id=3Dcharparallel0,path=3D/tmp/parport0.socket,server=3Don= ,wait=3Doff \ --device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ --chardev socket,id=3Dcharparallel1,path=3D/tmp/parport1.socket \ --device isa-parallel,chardev=3Dcharparallel1,id=3Dparallel1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args = b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args deleted file mode 100644 index 8efe3ad1bb..0000000000 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.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 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-i440fx-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,-kvm_pv_unhalt \ --m 214 \ --realtime mlock=3Doff \ --smp 6,sockets=3D6,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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args b= /tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args deleted file mode 100644 index fb18f19f3e..0000000000 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.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 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-i440fx-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,+kvm_pv_unhalt \ --m 214 \ --realtime mlock=3Doff \ --smp 6,sockets=3D6,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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0= .args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args deleted file mode 100644 index 3129ae1cb5..0000000000 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.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-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --machine pc-i440fx-2.5,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ --chardev socket,id=3Dcharsmartcard0,path=3D/tmp/smartcard.sock,server=3Don= ,wait=3Doff \ --device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args b/test= s/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args deleted file mode 100644 index bc7806841c..0000000000 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args +++ /dev/null @@ -1,36 +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 \ --machine pc-i440fx-2.5,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ --chardev socket,id=3Dcharredir0,path=3D/tmp/connect.socket \ --device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D1 \ --chardev socket,id=3Dcharredir1,path=3D/tmp/listen.socket,server=3Don,wait= =3Doff \ --device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args b= /tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args deleted file mode 100644 index 7373ffd480..0000000000 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.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-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --machine pc-i440fx-2.5,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --chardev socket,id=3Dcharrng0,path=3D/tmp/rng.socket,server=3Don,wait=3Dof= f \ --object rng-egd,id=3Dobjrng0,chardev=3Dcharrng0 \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 475a3dbdfc..4dc3d0d846 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1228,19 +1228,14 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST_CAPS_VER("eoi-disabled", "2.7.0"); DO_TEST_CAPS_VER("eoi-disabled", "4.0.0"); DO_TEST_CAPS_LATEST("eoi-disabled"); - DO_TEST_CAPS_VER("eoi-enabled", "2.7.0"); DO_TEST_CAPS_VER("eoi-enabled", "4.0.0"); DO_TEST_CAPS_LATEST("eoi-enabled"); - DO_TEST_CAPS_VER("pv-spinlock-disabled", "2.7.0"); DO_TEST_CAPS_VER("pv-spinlock-disabled", "4.0.0"); DO_TEST_CAPS_LATEST("pv-spinlock-disabled"); - DO_TEST_CAPS_VER("pv-spinlock-enabled", "2.7.0"); DO_TEST_CAPS_VER("pv-spinlock-enabled", "4.0.0"); DO_TEST_CAPS_LATEST("pv-spinlock-enabled"); - DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "2.7.0"); DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "4.0.0"); DO_TEST_CAPS_LATEST("kvmclock+eoi-disabled"); @@ -1370,9 +1365,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-error-policy"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); - DO_TEST_CAPS_VER("disk-cache", "1.5.3"); - DO_TEST_CAPS_VER("disk-cache", "2.6.0"); - DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); @@ -1395,7 +1387,6 @@ mymain(void) QEMU_CAPS_GLUSTER_DEBUG_LEVEL); DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-gluster"); - DO_TEST_CAPS_VER("disk-network-rbd", "2.5.0"); DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); @@ -1433,7 +1424,6 @@ mymain(void) DO_TEST_PARSE_ERROR("disk-usb-pci", QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST_CAPS_LATEST("disk-scsi"); - DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); DO_TEST("disk-scsi-disk-split", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); @@ -1541,7 +1531,6 @@ mymain(void) driver.config->vncTLS =3D 1; driver.config->vncTLSx509verify =3D 1; DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA= ); - DO_TEST_CAPS_VER("graphics-vnc-tls", "2.4.0"); DO_TEST_CAPS_LATEST("graphics-vnc-tls"); driver.config->vncTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-a= 869-7acd6376d8ea"); DO_TEST_CAPS_VER("graphics-vnc-tls-secret", "5.2.0"); @@ -1630,7 +1619,6 @@ mymain(void) DO_TEST("misc-uuid", NONE); DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE); DO_TEST("net-vhostuser", QEMU_CAPS_CHARDEV_FD_PASS); - DO_TEST_CAPS_VER("net-vhostuser", "2.5.0"); DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST("net-vhostuser-multiq", QEMU_CAPS_VHOSTUSER_MULTIQUEUE); @@ -1752,7 +1740,6 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("parallel-tcp-chardev", NONE); DO_TEST("parallel-parport-chardev", NONE); - DO_TEST_CAPS_VER("parallel-unix-chardev", "2.5.0"); DO_TEST_CAPS_LATEST("parallel-unix-chardev"); DO_TEST("console-compat-chardev", QEMU_CAPS_DEVICE_ISA_SERIAL); @@ -1760,7 +1747,6 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST("channel-guestfwd", NONE); - DO_TEST_CAPS_VER("channel-unix-guestfwd", "2.5.0"); DO_TEST_CAPS_LATEST("channel-unix-guestfwd"); DO_TEST("channel-virtio", NONE); DO_TEST("channel-virtio-state", NONE); @@ -1775,7 +1761,6 @@ mymain(void) DO_TEST("console-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST_CAPS_VER("console-virtio-unix", "2.5.0"); DO_TEST_CAPS_LATEST("console-virtio-unix"); DO_TEST("console-sclp", QEMU_CAPS_VIRTIO_S390, @@ -1799,7 +1784,6 @@ mymain(void) QEMU_CAPS_CCID_PASSTHRU); DO_TEST("smartcard-controller", QEMU_CAPS_CCID_EMULATED); - DO_TEST_CAPS_VER("smartcard-passthrough-unix", "2.5.0"); DO_TEST_CAPS_LATEST("smartcard-passthrough-unix"); DO_TEST("chardev-reconnect", @@ -1866,7 +1850,6 @@ mymain(void) QEMU_CAPS_USB_REDIR, QEMU_CAPS_SPICE, QEMU_CAPS_USB_REDIR_FILTER); - DO_TEST_CAPS_VER("usb-redir-unix", "2.5.0"); DO_TEST_CAPS_LATEST("usb-redir-unix"); DO_TEST("usb1-usb2", QEMU_CAPS_PIIX3_USB_UHCI, @@ -2577,7 +2560,6 @@ mymain(void) QEMU_CAPS_OBJECT_RNG_EGD); DO_TEST_CAPS_VER("virtio-rng-builtin", "5.2.0"); DO_TEST_CAPS_LATEST("virtio-rng-builtin"); - DO_TEST_CAPS_VER("virtio-rng-egd-unix", "2.5.0"); DO_TEST_CAPS_VER("virtio-rng-egd-unix", "5.2.0"); DO_TEST_CAPS_LATEST("virtio-rng-egd-unix"); DO_TEST("virtio-rng-multiple", @@ -2936,10 +2918,8 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST_CAPS_VER("hostdev-scsi-lsi", "2.8.0"); DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); - DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "2.8.0"); DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); @@ -3419,7 +3399,6 @@ mymain(void) DO_TEST("acpi-table", NONE); DO_TEST_CAPS_LATEST("intel-iommu"); - DO_TEST_CAPS_VER("intel-iommu", "2.6.0"); DO_TEST_CAPS_LATEST("intel-iommu-caching-mode"); DO_TEST_CAPS_LATEST("intel-iommu-eim"); DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb"); @@ -3551,7 +3530,6 @@ mymain(void) DO_TEST_CAPS_LATEST("tseg-explicit-size"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx"); - DO_TEST_CAPS_VER_PARSE_ERROR("tseg-explicit-size", "2.10.0"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size"); DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW, --=20 2.30.2