From nobody Mon Feb 9 09:16:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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=1632315960; cv=none; d=zohomail.com; s=zohoarc; b=E5VhvUopEEJNYS1oO4wKYfmmrUjPhbcPqOUFZCCSfPuo7utsygJy3egcU+XctnkxifrhvmI0wZ1x3Zp4elEP6q9WAO7EcZGbXig8HxFiPCeNVyCxdARB0vUQNnI3vtbJ6Bfq9H1h/l5nmIkaF4XugMva8Q17KmlxbZXx/sibTvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315960; 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=Whi0OUwjmUy/ACamkJvw6DSQso/yonHwtjxOiSlkcBQ=; b=htUWuH21Lq7h0WuxmDiror43YW5ePIcX1Cut8smn44w+Aty88kecFiOgaiIr6LL6c41bJjinzHgJYcVDW5oRu5aRl3ZYqQS8j6O35/hhGkTA8PRwttCvEzZh8HpS6KxMg+EguF/lwyZy6s1b66r4VsvHEG1e3IF7NEABKJy3kFU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1632315960820408.75219617991127; Wed, 22 Sep 2021 06:06:00 -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-51-_ddntA8zMaewB1WF0yI9HA-1; Wed, 22 Sep 2021 09:05:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30D5210766DA; Wed, 22 Sep 2021 13:05:50 +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 A623716920; Wed, 22 Sep 2021 13:05:48 +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 7602B4EA2F; Wed, 22 Sep 2021 13:05:48 +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 18MD5lh4021371 for ; Wed, 22 Sep 2021 09:05:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 568C117B4F; Wed, 22 Sep 2021 13:05:47 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 782C55D9F4 for ; Wed, 22 Sep 2021 13:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315959; 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=Whi0OUwjmUy/ACamkJvw6DSQso/yonHwtjxOiSlkcBQ=; b=Yr0lBMF1mDaxV4+LO+Z+mpG+RldtnTH+5hcxw6M0YYlLy7a8Ri/9KH/ODyM7NhEusQzxCk /bJ1KT8s3T1pCSRtaz6cFOfPfNanKTLSv3xfjop4F5tRDnHKYYVnjyvFsj07yAFOB+cGax Vv8vuUseYk4R+dDZtm+VIfTaxqdNVCc= X-MC-Unique: _ddntA8zMaewB1WF0yI9HA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/20] tests: qemu: Remove 'virtio-ccw' machine type from fake capabilities Date: Wed, 22 Sep 2021 15:02:26 +0200 Message-Id: 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.79 on 10.5.11.12 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: 1632315962723100001 Content-Type: text/plain; charset="utf-8" Modern QEMUs don't support the machine type at all. Remove it from our fake caps generator too and adjust test cases which depend on it. Signed-off-by: Peter Krempa --- .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +- ...ug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 2 +- ...lug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 +- .../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +- ...plug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +- .../qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +- .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 2 +- tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml | 2 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-ccw-deflate.xml | 2 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/console-virtio-ccw.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml | 2 +- tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.xml | 2 +- tests/qemuxml2argvdata/non-x86_64-timer-error.err | 2 +- tests/qemuxml2argvdata/non-x86_64-timer-error.xml | 2 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +- tests/qemuxml2argvdata/virtio-rng-ccw.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml | 2 +- tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml | 2 +- tests/testutilsqemu.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-vir= tio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio= .xml index 44f41c6ddd..a786d03185 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-= ccw-virtio+ccw-virtio-1-explicit.xml b/tests/qemuhotplugtestdomains/qemuhot= plug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml index d10b29be7e..0c76410ff1 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-vir= tio+ccw-virtio-1-explicit.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-vir= tio+ccw-virtio-1-explicit.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-= ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotp= lug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml index 0988f8681c..e048d2c23a 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-vir= tio+ccw-virtio-1-reverse.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-vir= tio+ccw-virtio-1-reverse.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-= ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-wit= h-2-ccw-virtio.xml index b0151cd690..fcf5bfadcb 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-vir= tio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-vir= tio.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-cc= w-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotpl= ug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml index 0e8075caf6..8e7f479967 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virti= o+ccw-virtio-2-explicit.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virti= o+ccw-virtio-2-explicit.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-cc= w-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-c= cw-live-with-ccw-virtio+ccw-virtio-2.xml index 0e8075caf6..8e7f479967 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virti= o+ccw-virtio-2.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virti= o+ccw-virtio-2.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-cc= w-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-= ccw-virtio.xml index 240dda4c72..adec141512 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virti= o.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virti= o.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/t= ests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml index 9a650e340e..2267fe39df 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxm= l2argvdata/balloon-ccw-deflate.args index 351ac7ea48..bf56265638 100644 --- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args +++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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 \ +-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 \ diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.xml b/tests/qemuxml= 2argvdata/balloon-ccw-deflate.xml index fe7c76037f..046fd7137f 100644 --- a/tests/qemuxml2argvdata/balloon-ccw-deflate.xml +++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml= 2argvdata/console-virtio-ccw.args index 5af1839410..5447a5e9e0 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/console-virtio-ccw.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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 \ +-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 \ diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.xml b/tests/qemuxml2= argvdata/console-virtio-ccw.xml index fc300db20e..5a16facbea 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.xml +++ b/tests/qemuxml2argvdata/console-virtio-ccw.xml @@ -4,7 +4,7 @@ 219100 219100 - hvm + hvm destroy diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args index 8f04e0b053..f78579846e 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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 s390-ccw,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-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 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests= /qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml index 33234bc3d9..2ef7b0c688 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/= qemuxml2argvdata/iothreads-disk-virtio-ccw.args index 7d5efa5aa3..52af50f032 100644 --- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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 \ +-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 \ diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml b/tests/q= emuxml2argvdata/iothreads-disk-virtio-ccw.xml index dcc64ae618..dd2f6062c2 100644 --- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml +++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml @@ -6,7 +6,7 @@ 1 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2arg= vdata/net-virtio-ccw.args index 76ceaef6cf..24719f5a72 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/net-virtio-ccw.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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 \ +-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 \ diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.xml b/tests/qemuxml2argv= data/net-virtio-ccw.xml index fa8d52d9c5..ef8f0c872b 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.xml +++ b/tests/qemuxml2argvdata/net-virtio-ccw.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.err b/tests/qemu= xml2argvdata/non-x86_64-timer-error.err index f46673eb62..eab07d939d 100644 --- a/tests/qemuxml2argvdata/non-x86_64-timer-error.err +++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.err @@ -1 +1 @@ -unsupported configuration: Configuring the 'tsc' timer is not supported fo= r virtType=3Dkvm arch=3Ds390x machine=3Ds390-ccw guests +unsupported configuration: Configuring the 'tsc' timer is not supported fo= r virtType=3Dkvm arch=3Ds390x machine=3Ds390-ccw-virtio guests diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml b/tests/qemu= xml2argvdata/non-x86_64-timer-error.xml index 11559bb52b..1c8bad2daf 100644 --- a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml +++ b/tests/qemuxml2argvdata/non-x86_64-timer-error.xml @@ -4,7 +4,7 @@ 262144 262144 - hvm + hvm diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2arg= vdata/virtio-rng-ccw.args index c728ead87e..8ec40a2a9e 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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 \ +-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 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.xml b/tests/qemuxml2argv= data/virtio-rng-ccw.xml index 2cf7d82b48..8aa7c509c3 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.xml +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.xml @@ -4,7 +4,7 @@ 219100 219100 - hvm + hvm destroy diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tes= ts/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml index ee42e03f07..95eff7ead6 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml b/tests= /qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml index f711b34ffe..05cb204ea5 100644 --- a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml +++ b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml @@ -6,7 +6,7 @@ 1 2 - hvm + hvm diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 505c66b818..1078a3117a 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -73,7 +73,7 @@ static const char *const riscv64_machines[] =3D { "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL }; static const char *const s390x_machines[] =3D { - "s390-ccw-virtio", "s390-ccw", NULL + "s390-ccw-virtio", NULL }; static const char *const sparc_machines[] =3D { "SS-5", "LX", "SPARCClassic", "SPARCbook", --=20 2.31.1