From nobody Wed May 15 16:04:43 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=1608109863; cv=none; d=zohomail.com; s=zohoarc; b=daMrZ6dS29n0nAP37FnTrGy3qMN8/E0jGNVFTi3+24jVcJhiro8XFRvZxdstODPg4DX0Bi/1Ly49l8R68CvSKO7qIp8i0jdJZHojh5p9Uoq6ZsdU0fT67en5ndqY8dBF6TIrabyTzcWMgGG08SpUHnj1kus4HrfHTWuw28+5usg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608109863; 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=9U0oG8OUe7DvVtVpV/LHO4YBkYIetwdsOdu1BCq8k34=; b=dlBbi6S4YLWF7Hony0COClENsi3yakbp0hiajNwppxq6vPl5EC6T2aBpIsJRqHaBDi544JJh9aTst8nMNBjHIM+gqrvNer3XunZN6oKuCDiGQSSut2OgV4JnSHRmKyITlM+ef1RoebZr8f297px7+eWCAgh6XjjqUjz4w9AZQWg= 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 1608109863579715.5508030654071; Wed, 16 Dec 2020 01:11:03 -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-12-7F7F8D2QPjSbgMZVRYEB4A-1; Wed, 16 Dec 2020 04:10:58 -0500 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 C5F118712E4; Wed, 16 Dec 2020 09:10:39 +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 CC46F19172; Wed, 16 Dec 2020 09:10:37 +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 BA8DF180954D; Wed, 16 Dec 2020 09:10:34 +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 0BG9AWHO012698 for ; Wed, 16 Dec 2020 04:10:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 81C302026D49; Wed, 16 Dec 2020 09:10:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A2432026D48 for ; Wed, 16 Dec 2020 09:10:30 +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 2F453186E122 for ; Wed, 16 Dec 2020 09:10:30 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-521-Q3b1S03hO3et_yHDGytA7Q-1; Wed, 16 Dec 2020 04:10:27 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0BG93voV140790 for ; Wed, 16 Dec 2020 04:10:26 -0500 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0b-001b2d01.pphosted.com with ESMTP id 35fe53j4h9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Dec 2020 04:10:25 -0500 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0BG98Sn3014491 for ; Wed, 16 Dec 2020 09:10:23 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06fra.de.ibm.com with ESMTP id 35d3109utp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Dec 2020 09:10:23 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0BG9AJRA32899362 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Dec 2020 09:10:19 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B020A5206D; Wed, 16 Dec 2020 09:10:19 +0000 (GMT) Received: from t46lp68.lnxne.boe (unknown [9.152.108.100]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 610F05207E; Wed, 16 Dec 2020 09:10:19 +0000 (GMT) X-MC-Unique: 7F7F8D2QPjSbgMZVRYEB4A-1 X-MC-Unique: Q3b1S03hO3et_yHDGytA7Q-1 From: Shalini Chellathurai Saroja To: libvir-list@redhat.com Subject: [PATCH libvirt v1] tests: add capabilities for QEMU 5.2.0 on s390x Date: Wed, 16 Dec 2020 10:10:14 +0100 Message-Id: <20201216091014.3898605-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.343, 18.0.737 definitions=2020-12-16_02:2020-12-15, 2020-12-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 mlxlogscore=999 suspectscore=0 impostorscore=0 bulkscore=0 phishscore=0 priorityscore=1501 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012160058 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: Bjoern Walk , Boris Fiuczynski , 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.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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Let us introduce the xml and reply files for QEMU 5.2.0 on s390x. Signed-off-by: Shalini Chellathurai Saroja Reviewed-by: Boris Fiuczynski --- The replies file is removed from this patch and is available in=20 https://gitlab.com/shalinichellathurai/libvirt/-/commit/cdf6c7464cb51b72aaa= cd7c29bb5651fd4143084 tests/domaincapsdata/qemu_5.2.0.s390x.xml | 231 + .../caps_5.2.0.s390x.replies | 25458 ++++++++++++++++ .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3300 ++ ...default-video-type-s390x.s390x-latest.args | 9 +- .../disk-error-policy-s390x.s390x-latest.args | 16 +- .../fs9p-ccw.s390x-latest.args | 8 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 4 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 4 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 6 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 4 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 9 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 4 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 4 +- .../s390x-ccw-graphics.s390x-latest.args | 8 +- .../s390x-ccw-headless.s390x-latest.args | 8 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 8 +- .../vhost-vsock-ccw.s390x-latest.args | 8 +- 17 files changed, 29054 insertions(+), 35 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.2.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_5.2.0.s390x.xml new file mode 100644 index 00000000..efe999e4 --- /dev/null +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -0,0 +1,231 @@ + + /usr/bin/qemu-system-s390x + kvm + s390-ccw-virtio-5.2 + 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 + z990.5-base + z9BC-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 + z990.2 + z14 + gen15b-base + z990.4 + max + z990.2-base + z10EC.2-base + gen15a-base + z800 + z10EC + zEC12.2 + 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 + z10EC.3 + z890-base + 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.2.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_5.2.0.s390x.replies new file mode 100644 index 00000000..7f524ca0 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies @@ -0,0 +1,25458 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml new file mode 100644 index 00000000..15e7ee84 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -0,0 +1,3300 @@ + + /usr/bin/qemu-system-s390x + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5002000 + 0 + 39100243 + qemu-5.2.0-20201215.0.ba93e22c.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..9eef70cf 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -12,13 +12,16 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-default-video-type-s/master-key.aes \ --machine s390-ccw-virtio,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,csske=3Don,mep= och=3Don,msa9=3Don,\ 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 \ +vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi= =3Don,apft=3Don,els=3Don,\ +iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Do= n,sea_esop2=3Don,te=3Don,\ +cmm=3Don \ -m 1024 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D1073741824 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ 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..d75d7aca 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 214 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -32,24 +34,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..07d2a2dc 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 214 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,8 +32,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/hostdev-subsys-mdev-vfio-ap.s390x-lates= t.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.ar= gs index 12bdf84a..a6cf270d 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 512 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D536870912 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x= -latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s39= 0x-latest.args index ed6d92ab..be550aa7 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 512 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D536870912 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 20288f2a..f8a5aaae 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 214 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object iothread,id=3Diothread1 \ @@ -33,7 +35,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-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7= .s390x-latest.args index 0c2567df..a8be43af 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio-2.7,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu host \ -m 256 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D268435456 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ 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..62ffe279 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 @@ -12,13 +12,16 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,csske=3Don,mep= och=3Don,msa9=3Don,\ 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 \ +vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi= =3Don,apft=3Don,els=3Don,\ +iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Do= n,sea_esop2=3Don,te=3Don,\ +cmm=3Don \ -m 256 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D268435456 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7= .s390x-latest.args index d30c30f6..f57880ce 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio-2.7,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 256 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D268435456 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2= .s390x-latest.args index c7bd0c38..155e9b31 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio-4.2,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 256 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D268435456 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 5850b265..8c866706 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 4096 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D4294967296 \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 \ @@ -30,8 +32,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..c44c4dd8 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 4096 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D4294967296 \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -31,8 +33,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..c70f0519 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 214 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,8 +32,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..e1b17eba 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -12,9 +12,11 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,\ +memory-backend=3Ds390.ram \ -cpu qemu \ -m 214 \ +-object memory-backend-ram,id=3Ds390.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,8 +32,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