From nobody Sat Apr 20 07:01:41 2024 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; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1605716357; cv=none; d=zohomail.com; s=zohoarc; b=l6Sut6vOH8BjJnX7YaDe/wYIz/zwfQn7hXLHOMYQMMPhhrIJLfMXx7iMAAemKI6xGH48rC51T5zD/peZjLrESn4D8Py7Y8zpL2PPTyxtBP5xehZFLbyg1IIHhWJdID25ShqFTr0kksCnjN7EGluWB4rE75BfMn2hpBNBj+cq7us= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605716357; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Yxlf0IXQXqAloYtI6zom92FR066RWvs6AXFiJXg6KRI=; b=BzqXJLofKqQLqIBlbJBpTCHPOPEHR2iPqoZfnpcVGocECshiaRoZV+sGPpr8laFNfzp75+DprDWHE5JGGYY/CMlKPncITZUWGUEwJkcxENOjZMytRAmkLBrsr1W1KMu5qkmlAC7QTnuvFi1X/uUu7wr8Jm6NymRkTlFYrEUNRXc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 1605716357208735.0582302702685; Wed, 18 Nov 2020 08:19:17 -0800 (PST) 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-8-7e4pb7cONBqufwunv_peFQ-1; Wed, 18 Nov 2020 11:19:11 -0500 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 4377964161; Wed, 18 Nov 2020 16:19:04 +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 EE48760854; Wed, 18 Nov 2020 16:19:01 +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 ADE0C86C01; Wed, 18 Nov 2020 16:18:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AIGIwZu027500 for ; Wed, 18 Nov 2020 11:18:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 79CD92022792; Wed, 18 Nov 2020 16:18:58 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7288E202278F for ; Wed, 18 Nov 2020 16:18:55 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 50145102F1E0 for ; Wed, 18 Nov 2020 16:18:55 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-O6xrd0HbOvutbGYCamiCjg-1; Wed, 18 Nov 2020 11:18:52 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AIG4FBS061224 for ; Wed, 18 Nov 2020 11:18:51 -0500 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 34w4xpn537-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 18 Nov 2020 11:18:49 -0500 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0AIGH2gc028304 for ; Wed, 18 Nov 2020 16:18:46 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03ams.nl.ibm.com with ESMTP id 34t6v8caqg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 18 Nov 2020 16:18:46 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0AIGIgkB54591982 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Nov 2020 16:18:42 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8B42A11C058; Wed, 18 Nov 2020 16:18:42 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4A35F11C05C; Wed, 18 Nov 2020 16:18:42 +0000 (GMT) Received: from t46lp68.lnxne.boe (unknown [9.152.108.100]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 18 Nov 2020 16:18:42 +0000 (GMT) X-MC-Unique: 7e4pb7cONBqufwunv_peFQ-1 X-MC-Unique: O6xrd0HbOvutbGYCamiCjg-1 From: Shalini Chellathurai Saroja To: libvir-list@redhat.com Subject: [PATCH libvirt v1] tests: add capabilities for QEMU 5.1.0 on s390x Date: Wed, 18 Nov 2020 17:18:37 +0100 Message-Id: <20201118161837.1643363-1-shalini@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-11-18_04:2020-11-17, 2020-11-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=999 spamscore=0 impostorscore=0 mlxscore=0 adultscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011180111 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Shalini Chellathurai Saroja 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shalini Chellathurai Saroja --- The replies file is removed from this patch and is available in https://gitlab.com/shalinichellathurai/libvirt/-/commit/1c34c07c434560d7f44= 212ce0bbbc8bf92490622 tests/domaincapsdata/qemu_5.1.0.s390x.xml | 230 + .../caps_5.1.0.s390x.replies | 24617 ++++++++++++++++ .../qemucapabilitiesdata/caps_5.1.0.s390x.xml | 3278 ++ ...default-video-type-s390x.s390x-latest.args | 2 +- .../disk-error-policy-s390x.s390x-latest.args | 12 +- .../fs9p-ccw.s390x-latest.args | 4 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 4 +- .../s390x-ccw-headless.s390x-latest.args | 4 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 4 +- .../vhost-vsock-ccw.s390x-latest.args | 4 +- 12 files changed, 28144 insertions(+), 19 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.1.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.1.0.s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.1.0.s390x.xml diff --git a/tests/domaincapsdata/qemu_5.1.0.s390x.xml b/tests/domaincapsda= ta/qemu_5.1.0.s390x.xml new file mode 100644 index 00000000..42780349 --- /dev/null +++ b/tests/domaincapsdata/qemu_5.1.0.s390x.xml @@ -0,0 +1,230 @@ + + /usr/bin/qemu-system-s390x + kvm + s390-ccw-virtio-5.1 + s390x + + + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + no + + + + + + + off + + + + gen15a-base + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + z800-base + z890.2-base + z9EC.2 + z13.2 + z9BC-base + z990.5-base + z890.2 + z890 + z9BC + z13 + z196 + z13s + z990.3 + z13s-base + z9EC + gen15a + z14ZR1-base + z14.2-base + z900.3-base + z13.2-base + z196.2-base + zBC12-base + z9BC.2-base + z900.2-base + z9EC.3 + zEC12 + z900 + z114-base + zEC12-base + z10EC.2 + z10EC-base + z900.3 + z14ZR1 + z10BC + z10BC.2-base + z9BC.2 + z990.2 + z990 + z14 + gen15b-base + z990.4 + max + z10EC.2-base + gen15a-base + z800 + z10EC + zEC12.2 + z990.2-base + z900-base + z10BC.2 + z9EC-base + z9EC.3-base + z114 + z890.3 + z196-base + z9EC.2-base + z196.2 + z14.2 + z990-base + z900.2 + z890-base + z10EC.3 + z14-base + z990.4-base + z10EC.3-base + z10BC-base + z13-base + z990.3-base + zEC12.2-base + zBC12 + z890.3-base + z990.5 + gen15b + qemu + + + + + + disk + cdrom + floppy + lun + + + fdc + scsi + virtio + + + virtio + virtio-transitional + virtio-non-transitional + + + + + sdl + vnc + egl-headless + + + + + + subsystem + + + default + mandatory + requisite + optional + + + pci + scsi + + + + default + vfio + + + + + virtio + virtio-transitional + virtio-non-transitional + + + random + egd + builtin + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_5.1.0.s390x.replies new file mode 100644 index 00000000..ec3fd1f6 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.1.0.s390x.replies @@ -0,0 +1,24617 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.s390x.xml new file mode 100644 index 00000000..af2647aa --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.1.0.s390x.xml @@ -0,0 +1,3278 @@ + + /usr/bin/qemu-system-s390x + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5001000 + 0 + 39100242 + qemu-5.1.0-20201029.0.64aaebe0ca.fc32 + s390x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 47818085..fa81a7aa 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -17,7 +17,7 @@ file=3D/tmp/lib/domain--1-default-video-type-s/master-key= .aes \ msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1= =3Don,sthyi=3Don,\ edat=3Don,ri=3Don,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,m= epochptff=3Don,ap=3Don,\ vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi= =3Don,apft=3Don,iep=3Don,\ -apqci=3Don,cte=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Don,sea_esop2=3Don,t= e=3Don,cmm=3Don \ +apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Don,sea_eso= p2=3Don,te=3Don,cmm=3Don \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.ar= gs b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index 414ffdba..ee0a08e8 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -32,24 +32,24 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ "file":"libvirt-3-storage"}' \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-3-form= at,\ -id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,werror=3Dstop,rerror=3Dst= op \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-3-format,id=3Dvir= tio-disk0,\ +bootindex=3D1,write-cache=3Don,werror=3Dstop,rerror=3Dstop \ -blockdev '{"driver":"file","filename":"/var/images/image2",\ "node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},\ "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ "file":"libvirt-2-storage"}' \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0001,drive=3Dlibvirt-2-form= at,\ -id=3Dvirtio-disk1,write-cache=3Don,werror=3Denospc \ +-device virtio-blk-ccw,devno=3Dfe.0.0001,drive=3Dlibvirt-2-format,id=3Dvir= tio-disk1,\ +write-cache=3Don,werror=3Denospc \ -blockdev '{"driver":"file","filename":"/var/images/image3",\ "node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0002,drive=3Dlibvirt-1-form= at,\ -id=3Dvirtio-disk2,write-cache=3Don,werror=3Dreport,rerror=3Dignore \ +-device virtio-blk-ccw,devno=3Dfe.0.0002,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk2,\ +write-cache=3Don,werror=3Dreport,rerror=3Dignore \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemu= xml2argvdata/fs9p-ccw.s390x-latest.args index 50d4bc42..500cc0ad 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -30,8 +30,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-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,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ -id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,\ +bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device virtio-9p-ccw,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,\ devno=3Dfe.0.0001 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 20288f2a..ca343cbe 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -33,7 +33,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-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,iothread=3Diothread1,scsi=3Doff,devno=3Dfe.0.0000,\ +-device virtio-blk-ccw,iothread=3Diothread1,devno=3Dfe.0.0000,\ drive=3Dlibvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2= .s390x-latest.args index 35093d4f..6da68d44 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args @@ -17,7 +17,7 @@ file=3D/tmp/lib/domain--1-test/master-key.aes \ msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1= =3Don,sthyi=3Don,\ edat=3Don,ri=3Don,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,m= epochptff=3Don,ap=3Don,\ vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi= =3Don,apft=3Don,iep=3Don,\ -apqci=3Don,cte=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Don,sea_esop2=3Don,t= e=3Don,cmm=3Don \ +apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Don,sea_eso= p2=3Don,te=3Don,cmm=3Don \ -m 256 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 5850b265..529beddc 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -30,8 +30,8 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ -id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,\ +bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:1a:29= ,\ devno=3Dfe.0.0001 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index 211cc24b..71282403 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -31,8 +31,8 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ -id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,\ +bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,\ devno=3Dfe.0.0001 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args = b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index 4c5542d8..e8956037 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -30,8 +30,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-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,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ -id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,\ +bootindex=3D1 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index de229bd0..7199416d 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -30,8 +30,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-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,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ -id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,\ +bootindex=3D1 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ --=20 2.26.2