From nobody Mon Feb 9 01:48:06 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=1632315950; cv=none; d=zohomail.com; s=zohoarc; b=SPqHuFKDyoGWagUqCDUmBMh6a8i7C8HEXkCVl2vnUq6uE0ZJ8P28E6xQyXkeg5NcYeHCVK75rX89+3rpNArkufT3U7v9hV1QL6Nq0+OFnT3yXDdeKm3SxBvmVImbDkaDCqXFdYlmn2hR2tjuIjWOICCmNlIIEPhU+JSb0fe9qM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315950; 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=BGUF0cEpdiwmIlFaXIlXG4MNH0V6PgD1QyQWJcFPF+M=; b=YbzNR7S/RoiTUSly8wNIYXcfJ6FnH9PUdduN4YD3xrePu6UalCfaM0zr6o6F69KNyZwt9ESkmR8l3eoIc23ibUC5qrDalYEnoCkuIKC/HDCJaRVRjEOo1xy4LFh5uh17+KHwGAggoh5pSOBSujTk+u0H3RaPV4zRX2/KSgUgvew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632315950349877.4468129175657; Wed, 22 Sep 2021 06:05:50 -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-99-gONZAExOOdSpDN_zpRI3MQ-1; Wed, 22 Sep 2021 09:05:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 180F6801E72; Wed, 22 Sep 2021 13:05:37 +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 E53C11972D; Wed, 22 Sep 2021 13:05:36 +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 B00FE4EA2A; Wed, 22 Sep 2021 13:05:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MD5Zrx021333 for ; Wed, 22 Sep 2021 09:05:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2493B5D9F4; Wed, 22 Sep 2021 13:05:35 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CDA25D9DC for ; Wed, 22 Sep 2021 13:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315945; 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=BGUF0cEpdiwmIlFaXIlXG4MNH0V6PgD1QyQWJcFPF+M=; b=Lg/kNDuz7JuI2HYePZR7XMCY+Ope9uGDyd4r6eoM3S7+2dfAOMK9BFruRxMAQdo2h/aXJF T42o2OUMJejsPdCe4m5Ce4pLtijV0iKYkZnUUuF07APnmQwMk+eVUusFpPEWYSrVPlSlXG 47MO/49H/o0/BGszV5a4rm8kB/oo68M= X-MC-Unique: gONZAExOOdSpDN_zpRI3MQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/20] qemuxml2argvtest: Modernize s390x disk tests Date: Wed, 22 Sep 2021 15:02:25 +0200 Message-Id: <4b894446ef2f005cdfce300c4ab72b5262a4b4ae.1632315628.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.23 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: 1632315953165100001 Content-Type: text/plain; charset="utf-8" An update to the machine type was necessary as 'virtio-ccw' is no longer supported. Signed-off-by: Peter Krempa --- .../disk-virtio-ccw-many.args | 36 ---------------- .../disk-virtio-ccw-many.s390x-latest.args | 43 +++++++++++++++++++ .../qemuxml2argvdata/disk-virtio-ccw-many.xml | 2 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 32 -------------- .../disk-virtio-ccw.s390x-latest.args | 37 ++++++++++++++++ tests/qemuxml2argvdata/disk-virtio-ccw.xml | 2 +- .../disk-virtio-s390-zpci.args | 31 ------------- .../disk-virtio-s390-zpci.s390x-latest.args | 35 +++++++++++++++ tests/qemuxml2argvtest.c | 6 +-- 9 files changed, 120 insertions(+), 104 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-lates= t.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-late= st.args diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args b/tests/qemux= ml2argvdata/disk-virtio-ccw-many.args deleted file mode 100644 index 6932f29a18..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.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-s390x \ --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 s390-ccw,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 \ --boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3D0.0.0007,drive=3Ddrive-virtio-disk0,id=3Dvi= rtio-disk0,bootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest4,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk1,id=3Dv= irtio-disk1 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk2 \ --device virtio-blk-ccw,devno=3Dfe.0.0001,drive=3Ddrive-virtio-disk2,id=3Dv= irtio-disk2 \ --drive file=3D/dev/HostVG/QEMUGuest3,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk3 \ --device virtio-blk-ccw,devno=3Dfe.2.f00f,drive=3Ddrive-virtio-disk3,id=3Dv= irtio-disk3 \ --device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args = b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args new file mode 100644 index 0000000000..d509d6e536 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args @@ -0,0 +1,43 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memor= y-backend=3Ds390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ +-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 \ +-boot strict=3Don \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ +-device virtio-blk-ccw,devno=3D0.0.0007,drive=3Dlibvirt-4-format,id=3Dvirt= io-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-3-format,id=3Dvir= tio-disk1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0001,drive=3Dlibvirt-2-format,id=3Dvir= tio-disk2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.2.f00f,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk3 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml b/tests/qemuxm= l2argvdata/disk-virtio-ccw-many.xml index e04371c715..b0e8ff57d6 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml +++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args b/tests/qemuxml2ar= gvdata/disk-virtio-ccw.args deleted file mode 100644 index 1794560190..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-ccw.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-s390x \ --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 s390-ccw,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 \ --boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ --device virtio-blk-ccw,devno=3D0.0.0007,drive=3Ddrive-virtio-disk1,id=3Dvi= rtio-disk1 \ --device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args new file mode 100644 index 0000000000..414dd053d5 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memor= y-backend=3Ds390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ +-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 \ +-boot strict=3Don \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-2-format,id=3Dvir= tio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3D0.0.0007,drive=3Dlibvirt-1-format,id=3Dvirt= io-disk1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.xml b/tests/qemuxml2arg= vdata/disk-virtio-ccw.xml index 6bc04b8b98..ffd318bf8a 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw.xml +++ b/tests/qemuxml2argvdata/disk-virtio-ccw.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args b/tests/qemu= xml2argvdata/disk-virtio-s390-zpci.args deleted file mode 100644 index bdec1f752c..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args +++ /dev/null @@ -1,31 +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-s390x \ --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 s390-ccw-virtio,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 \ --boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device zpci,uid=3D25,fid=3D31,target=3Dvirtio-disk0,id=3Dzpci25 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ --device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args= b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args new file mode 100644 index 0000000000..8e58542d50 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memor= y-backend=3Ds390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ +-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 \ +-boot strict=3Don \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device zpci,uid=3D25,fid=3D31,target=3Dvirtio-disk0,id=3Dzpci25 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5f64a222ac..69018c6411 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1310,9 +1310,9 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); DO_TEST_CAPS_LATEST("disk-floppy-tray"); DO_TEST_CAPS_LATEST("disk-virtio"); - DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW); - DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW); - DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("disk-virtio-ccw", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("disk-virtio-ccw-many", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("disk-virtio-s390-zpci", "s390x"); DO_TEST_CAPS_LATEST("disk-order"); DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_CAPS_LATEST("disk-boot-disk"); --=20 2.31.1