From nobody Sun Feb  8 22:08:27 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1677767942; cv=none;
	d=zohomail.com; s=zohoarc;
	b=NHAeXB2jrY6EXo+G3XNdJE+sca+NCL5ae2xmm8nsB93SJ1RUKMy2HVBB5ZMzX5M9/GZtA78h8XpLnDM9UCgwRgkrpshDs5K6XZg7Iu7TUAP01FZAbE0tUn8Iylvo/iek3O/ypWFwFN5EqMsYJVnRNSgB6hLkCuUfU28bz98kS7g=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1677767942;
 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=QhXGEvQK+PkATCkKqy+WuCTgHoSH/VfssRtcnUOcKg8=;
	b=j27zXYSjCiOUzzBh9ZoKmkXgW/g/QyxYacZ6Go+TP8iQG0tabxMKHRxw+DXrrdwmIf9CTeTZxa8Ie9TFshF39r7Pwff0d5oYizIIHgd/JUxcvc4FrUYV7zsJFtO7OwdLJ6TqkKy9xca8rEGwsw849ySgGRVDnknBRhSz1UrGLCA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1677767942466288.09747145377537;
 Thu, 2 Mar 2023 06:39:02 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-46-unr1uvqNNhC8l4BxqQxPAA-1; Thu, 02 Mar 2023 09:38:58 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com
 [10.11.54.2])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8456B280BF72;
	Thu,  2 Mar 2023 14:38:15 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 67FC140C6EC4;
	Thu,  2 Mar 2023 14:38:15 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 59C3C19452CD;
	Thu,  2 Mar 2023 14:38:15 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com
 [10.11.54.7])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 4489B1948664 for <libvir-list@listman.corp.redhat.com>;
 Thu,  2 Mar 2023 14:38:14 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 29EFF1400070; Thu,  2 Mar 2023 14:38:14 +0000 (UTC)
Received: from speedmetal.lan (unknown [10.45.242.7])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 68695140EBF6
 for <libvir-list@redhat.com>; Thu,  2 Mar 2023 14:38:13 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1677767941;
	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=QhXGEvQK+PkATCkKqy+WuCTgHoSH/VfssRtcnUOcKg8=;
	b=I1yuu5hbUDept5t0SuPQHP8aqXe7fanBTPJNakC53LP/0+w4QTsCuhBxLozdVwPUnTFRnj
	qqEQDn7RQmvmNb3vfFqGsX7lBWDZ2RBiuon4UO0GQiW3GVu6/0ATA8JS/MSd2LLC4wlcVD
	6bkL5t/SaSXdsyt8l5jkPS1UqnU1StI=
X-MC-Unique: unr1uvqNNhC8l4BxqQxPAA-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 07/21] qemuxml2(argv|xmltest): Simplify testing of scheduler
 settings
Date: Thu,  2 Mar 2023 15:37:49 +0100
Message-Id: 
 <22184622e86651c3c5bdf592abaed463b35759d6.1677767499.git.pkrempa@redhat.com>
In-Reply-To: <cover.1677767499.git.pkrempa@redhat.com>
References: <cover.1677767499.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2
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: 1677767943658100002
Content-Type: text/plain; charset="utf-8"

Remove the cputune-iothreads, cputune-iothreadsched-zeropriority,
cputune-iothreadsched test files by moving the relevant elements into
the cputune case as we can setup scheduler settings for multiple objects
and thus test everything in one go.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemuxml2argvdata/cputune-iothreads.xml  | 39 --------------
 .../cputune-iothreadsched-zeropriority.xml    | 40 ---------------
 .../cputune-iothreadsched.xml                 | 39 --------------
 .../cputune.x86_64-latest.args                |  6 ++-
 tests/qemuxml2argvdata/cputune.xml            |  8 ++-
 .../qemuxml2xmloutdata/cputune-iothreads.xml  | 48 -----------------
 .../cputune-iothreadsched-zeropriority.xml    | 51 -------------------
 .../cputune-iothreadsched.xml                 | 51 -------------------
 .../cputune.x86_64-latest.xml                 | 10 +++-
 tests/qemuxml2xmltest.c                       |  3 --
 10 files changed, 21 insertions(+), 274 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/cputune-iothreads.xml
 delete mode 100644 tests/qemuxml2argvdata/cputune-iothreadsched-zeropriori=
ty.xml
 delete mode 100644 tests/qemuxml2argvdata/cputune-iothreadsched.xml
 delete mode 100644 tests/qemuxml2xmloutdata/cputune-iothreads.xml
 delete mode 100644 tests/qemuxml2xmloutdata/cputune-iothreadsched-zeroprio=
rity.xml
 delete mode 100644 tests/qemuxml2xmloutdata/cputune-iothreadsched.xml

diff --git a/tests/qemuxml2argvdata/cputune-iothreads.xml b/tests/qemuxml2a=
rgvdata/cputune-iothreads.xml
deleted file mode 100644
index d55d85c07d..0000000000
--- a/tests/qemuxml2argvdata/cputune-iothreads.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
-  <iothreads>2</iothreads>
-  <cputune>
-    <!-- intentionally in odd order -->
-    <iothreadpin iothread=3D'2' cpuset=3D'3'/>
-    <iothreadpin iothread=3D'1' cpuset=3D'2'/>
-    <emulatorpin cpuset=3D'1'/>
-    <vcpupin vcpu=3D'0' cpuset=3D'0'/>
-    <vcpupin vcpu=3D'1' cpuset=3D'1'/>
-    <quota>-1</quota>
-    <period>1000000</period>
-    <shares>2048</shares>
-  </cputune>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'/>
-    <controller type=3D'ide' index=3D'0'/>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <memballoon model=3D'virtio'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml =
b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
deleted file mode 100644
index 1144e0f132..0000000000
--- a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
-  <iothreads>4</iothreads>
-  <cputune>
-    <shares>2048</shares>
-    <period>1000000</period>
-    <quota>-1</quota>
-    <vcpupin vcpu=3D'0' cpuset=3D'0'/>
-    <vcpupin vcpu=3D'1' cpuset=3D'1'/>
-    <emulatorpin cpuset=3D'1'/>
-    <vcpusched vcpus=3D'0-1' scheduler=3D'fifo' priority=3D'0'/>
-    <iothreadsched iothreads=3D'1-3' scheduler=3D'rr' priority=3D'0'/>
-  </cputune>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'/>
-    <controller type=3D'ide' index=3D'0'/>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched.xml b/tests/qemux=
ml2argvdata/cputune-iothreadsched.xml
deleted file mode 100644
index 73bcec602e..0000000000
--- a/tests/qemuxml2argvdata/cputune-iothreadsched.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
-  <iothreads>4</iothreads>
-  <cputune>
-    <shares>2048</shares>
-    <period>1000000</period>
-    <quota>-1</quota>
-    <vcpupin vcpu=3D'0' cpuset=3D'0'/>
-    <vcpupin vcpu=3D'1' cpuset=3D'1'/>
-    <emulatorpin cpuset=3D'1'/>
-    <vcpusched vcpus=3D'0-1' scheduler=3D'fifo' priority=3D'1'/>
-    <iothreadsched iothreads=3D'1-3,^2' scheduler=3D'batch'/>
-    <iothreadsched iothreads=3D'2' scheduler=3D'batch'/>
-  </cputune>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'/>
-    <controller type=3D'ide' index=3D'0'/>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <memballoon model=3D'virtio'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/cputune.x86_64-latest.args b/tests/qemu=
xml2argvdata/cputune.x86_64-latest.args
index d77c1db2c2..e52211ee6d 100644
--- a/tests/qemuxml2argvdata/cputune.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cputune.x86_64-latest.args
@@ -16,7 +16,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -m 214 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
--smp 2,sockets=3D2,cores=3D1,threads=3D1 \
+-smp 4,sockets=3D4,cores=3D1,threads=3D1 \
+-object '{"qom-type":"iothread","id":"iothread1"}' \
+-object '{"qom-type":"iothread","id":"iothread2"}' \
+-object '{"qom-type":"iothread","id":"iothread3"}' \
+-object '{"qom-type":"iothread","id":"iothread4"}' \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -display none \
 -no-user-config \
diff --git a/tests/qemuxml2argvdata/cputune.xml b/tests/qemuxml2argvdata/cp=
utune.xml
index 3c8116f637..722636780c 100644
--- a/tests/qemuxml2argvdata/cputune.xml
+++ b/tests/qemuxml2argvdata/cputune.xml
@@ -3,7 +3,8 @@
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit=3D'KiB'>219136</memory>
   <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
+  <vcpu placement=3D'static'>4</vcpu>
+  <iothreads>4</iothreads>
   <cputune>
     <shares>2048</shares>
     <period>1000000</period>
@@ -15,6 +16,11 @@
     <vcpupin vcpu=3D'0' cpuset=3D'0'/>
     <vcpupin vcpu=3D'1' cpuset=3D'1'/>
     <emulatorpin cpuset=3D'1'/>
+    <vcpusched vcpus=3D'2-3' scheduler=3D'rr' priority=3D'1'/>
+    <vcpusched vcpus=3D'0' scheduler=3D'batch'/>
+    <vcpusched vcpus=3D'1' scheduler=3D'fifo' priority=3D'0'/>
+    <iothreadsched iothreads=3D'1-3,^2' scheduler=3D'batch'/>
+    <iothreadsched iothreads=3D'2' scheduler=3D'rr' priority=3D'0'/>
   </cputune>
   <os>
     <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml b/tests/qemuxml=
2xmloutdata/cputune-iothreads.xml
deleted file mode 100644
index 36c4b0920f..0000000000
--- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
-  <iothreads>2</iothreads>
-  <cputune>
-    <shares>2048</shares>
-    <period>1000000</period>
-    <quota>-1</quota>
-    <vcpupin vcpu=3D'0' cpuset=3D'0'/>
-    <vcpupin vcpu=3D'1' cpuset=3D'1'/>
-    <emulatorpin cpuset=3D'1'/>
-    <iothreadpin iothread=3D'1' cpuset=3D'2'/>
-    <iothreadpin iothread=3D'2' cpuset=3D'3'/>
-  </cputune>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xm=
l b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
deleted file mode 100644
index b6a79108e3..0000000000
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
-  <iothreads>4</iothreads>
-  <cputune>
-    <shares>2048</shares>
-    <period>1000000</period>
-    <quota>-1</quota>
-    <vcpupin vcpu=3D'0' cpuset=3D'0'/>
-    <vcpupin vcpu=3D'1' cpuset=3D'1'/>
-    <emulatorpin cpuset=3D'1'/>
-    <vcpusched vcpus=3D'0' scheduler=3D'fifo' priority=3D'0'/>
-    <vcpusched vcpus=3D'1' scheduler=3D'fifo' priority=3D'0'/>
-    <iothreadsched iothreads=3D'1' scheduler=3D'rr' priority=3D'0'/>
-    <iothreadsched iothreads=3D'2' scheduler=3D'rr' priority=3D'0'/>
-    <iothreadsched iothreads=3D'3' scheduler=3D'rr' priority=3D'0'/>
-  </cputune>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml b/tests/qem=
uxml2xmloutdata/cputune-iothreadsched.xml
deleted file mode 100644
index ca94bc8a38..0000000000
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
-  <iothreads>4</iothreads>
-  <cputune>
-    <shares>2048</shares>
-    <period>1000000</period>
-    <quota>-1</quota>
-    <vcpupin vcpu=3D'0' cpuset=3D'0'/>
-    <vcpupin vcpu=3D'1' cpuset=3D'1'/>
-    <emulatorpin cpuset=3D'1'/>
-    <vcpusched vcpus=3D'0' scheduler=3D'fifo' priority=3D'1'/>
-    <vcpusched vcpus=3D'1' scheduler=3D'fifo' priority=3D'1'/>
-    <iothreadsched iothreads=3D'1' scheduler=3D'batch'/>
-    <iothreadsched iothreads=3D'2' scheduler=3D'batch'/>
-    <iothreadsched iothreads=3D'3' scheduler=3D'batch'/>
-  </cputune>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml b/tests/qem=
uxml2xmloutdata/cputune.x86_64-latest.xml
index 3a94b6c1c6..f9c0fbd934 100644
--- a/tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/cputune.x86_64-latest.xml
@@ -3,7 +3,8 @@
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit=3D'KiB'>219136</memory>
   <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>2</vcpu>
+  <vcpu placement=3D'static'>4</vcpu>
+  <iothreads>4</iothreads>
   <cputune>
     <shares>2048</shares>
     <period>1000000</period>
@@ -15,6 +16,13 @@
     <vcpupin vcpu=3D'0' cpuset=3D'0'/>
     <vcpupin vcpu=3D'1' cpuset=3D'1'/>
     <emulatorpin cpuset=3D'1'/>
+    <vcpusched vcpus=3D'0' scheduler=3D'batch'/>
+    <vcpusched vcpus=3D'1' scheduler=3D'fifo' priority=3D'0'/>
+    <vcpusched vcpus=3D'2' scheduler=3D'rr' priority=3D'1'/>
+    <vcpusched vcpus=3D'3' scheduler=3D'rr' priority=3D'1'/>
+    <iothreadsched iothreads=3D'1' scheduler=3D'batch'/>
+    <iothreadsched iothreads=3D'2' scheduler=3D'rr' priority=3D'0'/>
+    <iothreadsched iothreads=3D'3' scheduler=3D'batch'/>
   </cputune>
   <os>
     <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 0b66d2407f..84179196d4 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -572,8 +572,6 @@ mymain(void)
     DO_TEST_NOCAPS("blkiotune-device");
     DO_TEST_CAPS_LATEST("cputune");
     DO_TEST_CAPS_LATEST("cputune-zero-shares");
-    DO_TEST_NOCAPS("cputune-iothreadsched");
-    DO_TEST_NOCAPS("cputune-iothreadsched-zeropriority");
     DO_TEST_CAPS_LATEST("cputune-numatune");
     DO_TEST_CAPS_LATEST("vcpu-placement-static");
     DO_TEST_CAPS_LATEST("cputune-cpuset-big-id");
@@ -583,7 +581,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("iothreads-ids");
     DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes");
     DO_TEST_CAPS_LATEST("iothreads-ids-partial");
-    DO_TEST_NOCAPS("cputune-iothreads");
     DO_TEST_CAPS_LATEST("iothreads-disk");
     DO_TEST_CAPS_ARCH_LATEST("iothreads-disk-virtio-ccw", "s390x");
     DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci");
--=20
2.39.2