From nobody Mon Feb 9 00:06:57 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=1677767901; cv=none; d=zohomail.com; s=zohoarc; b=jrW2ZrQE1wxrD3YSlFkkArLN6OyD5MVbo9Fv+0HS+FjEcjo+kuiMoMjg9OyEn/fptcL8dhLHShUtylisW4ixJCzJGI5o7NDqFWkktCRfWyGQTfQoBnKQGs88Vwb5k1r68rtSFeGuy76fDn/BzntOq41ujOUNyAB747xHpg3TriQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677767901; 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=lHj/AHeN7ZHQP0/TX8CzzR2Jlf7pXWleJ22l3kobfpM=; b=PlOuw5U2OTr3TiQGXvXKNhpJSuEVN/TXRuKpPI1YZvSZBjnZDAwRKcCrLKP/vsDHF/gaRDnPAAtiJq1jecyftQnWaw1y/MK7+D6ttnAvE3LJjOv6lm4x7rdnV/+DwofQgb3HH6lh0pmyLF9debQNTFnQmJiCntUmGjuJmH/a3Dw= 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 1677767901882932.8610718224953; Thu, 2 Mar 2023 06:38:21 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-tJt4e491Ok2Ol5dRuXZufg-1; Thu, 02 Mar 2023 09:38:17 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 37AF2882820; Thu, 2 Mar 2023 14:38:12 +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 22534C16029; Thu, 2 Mar 2023 14:38:12 +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 17A0C19452D0; Thu, 2 Mar 2023 14:38:12 +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 A805B19452CD for ; Thu, 2 Mar 2023 14:38:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9B84B1417202; Thu, 2 Mar 2023 14:38:10 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7D7E140EBF6 for ; Thu, 2 Mar 2023 14:38:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677767900; 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=lHj/AHeN7ZHQP0/TX8CzzR2Jlf7pXWleJ22l3kobfpM=; b=buozpU5QkhMrVccNZGvgkAeIcF5AXxdrg5/kFDd2NFLXt81QFbGDaGnGe7YZmsL/FWy1eu uzBkGVKPt1VFPwjjUTix1dwVwMorpcy8ODH7X12DgOELaBVNTEt9wEpLQESjL6RDjOSsSn fn0sZfjZ+0RESElWdURoI4j3Xw35hVE= X-MC-Unique: tJt4e491Ok2Ol5dRuXZufg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/21] qemuxml2argvtest: Modernize the rest of 'iohtreads-*' Date: Thu, 2 Mar 2023 15:37:46 +0100 Message-Id: In-Reply-To: References: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: 1677767903239100001 Content-Type: text/plain; charset="utf-8" Use DO_TEST_CAPS_LATEST for the basic tests. The emulator needed to be tweaked to work with the real caps data. Signed-off-by: Peter Krempa --- ...args =3D> iothreads-disk.x86_64-latest.args} | 21 +++++++++++-------- tests/qemuxml2argvdata/iothreads-disk.xml | 4 ++-- ... iothreads-ids-partial.x86_64-latest.args} | 19 ++++++++++------- .../iothreads-ids-partial.xml | 4 ++-- ....args =3D> iothreads-ids.x86_64-latest.args} | 19 +++++++++-------- tests/qemuxml2argvdata/iothreads-ids.xml | 4 ++-- tests/qemuxml2argvtest.c | 6 +++--- ...k.xml =3D> iothreads-disk.x86_64-latest.xml} | 9 +++++--- ...> iothreads-ids-partial.x86_64-latest.xml} | 9 +++++--- ...ds.xml =3D> iothreads-ids.x86_64-latest.xml} | 9 +++++--- tests/qemuxml2xmltest.c | 6 +++--- 11 files changed, 64 insertions(+), 46 deletions(-) rename tests/qemuxml2argvdata/{iothreads-disk.args =3D> iothreads-disk.x86= _64-latest.args} (60%) rename tests/qemuxml2argvdata/{iothreads-ids.args =3D> iothreads-ids-parti= al.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{iothreads-ids-partial.args =3D> iothreads-i= ds.x86_64-latest.args} (58%) rename tests/qemuxml2xmloutdata/{iothreads-disk.xml =3D> iothreads-disk.x8= 6_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{iothreads-ids-partial.xml =3D> iothreads-= ids-partial.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{iothreads-ids.xml =3D> iothreads-ids.x86_= 64-latest.xml} (82%) diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2arg= vdata/iothreads-disk.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/iothreads-disk.args rename to tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args index ef80cf4008..1f18c97c97 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.args +++ b/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args @@ -6,17 +6,19 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -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 pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -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 \ --object iothread,id=3Diothread1 \ --object iothread,id=3Diothread2 \ +-object '{"qom-type":"iothread","id":"iothread1"}' \ +-object '{"qom-type":"iothread","id":"iothread2"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -27,15 +29,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,iothread=3Diothread1,bus=3Dpci.0,addr=3D0x4,drive= =3Dlibvirt-2-format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","= addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,iothread=3Diothread2,bus=3Dpci.0,addr=3D0x2,drive= =3Dlibvirt-1-format,id=3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","iothread":"iothread2","bus":"pci.0","= addr":"0x2","drive":"libvirt-1-format","id":"virtio-disk2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-disk.xml b/tests/qemuxml2argv= data/iothreads-disk.xml index bbfac34db5..485ae3760e 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.xml +++ b/tests/qemuxml2argvdata/iothreads-disk.xml @@ -6,7 +6,7 @@ 2 2 - hvm + hvm @@ -14,7 +14,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argv= data/iothreads-ids-partial.x86_64-latest.args similarity index 54% rename from tests/qemuxml2argvdata/iothreads-ids.args rename to tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.args index ddb79f9bef..857e343f8d 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.args +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.args @@ -6,17 +6,21 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -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 pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -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 \ --object iothread,id=3Diothread2 \ --object iothread,id=3Diothread4 \ +-object '{"qom-type":"iothread","id":"iothread5"}' \ +-object '{"qom-type":"iothread","id":"iothread6"}' \ +-object '{"qom-type":"iothread","id":"iothread1"}' \ +-object '{"qom-type":"iothread","id":"iothread2"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -27,9 +31,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.xml b/tests/qemux= ml2argvdata/iothreads-ids-partial.xml index 25069acf80..ff759f2ce2 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.xml +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.xml @@ -10,7 +10,7 @@ - hvm + hvm @@ -18,7 +18,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemu= xml2argvdata/iothreads-ids.x86_64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/iothreads-ids-partial.args rename to tests/qemuxml2argvdata/iothreads-ids.x86_64-latest.args index a20f6e68bf..dd4280ad96 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/iothreads-ids.x86_64-latest.args @@ -6,19 +6,19 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -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 pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -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 \ --object iothread,id=3Diothread5 \ --object iothread,id=3Diothread6 \ --object iothread,id=3Diothread1 \ --object iothread,id=3Diothread2 \ +-object '{"qom-type":"iothread","id":"iothread2"}' \ +-object '{"qom-type":"iothread","id":"iothread4"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,9 +29,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-ids.xml b/tests/qemuxml2argvd= ata/iothreads-ids.xml index d41a07efa5..aca3d7dece 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.xml +++ b/tests/qemuxml2argvdata/iothreads-ids.xml @@ -10,7 +10,7 @@ - hvm + hvm @@ -18,7 +18,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5db882a142..8dc21ea51e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1883,10 +1883,10 @@ mymain(void) DO_TEST_NOCAPS("smp"); DO_TEST("smp-dies", QEMU_CAPS_SMP_DIES); - DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD); - DO_TEST("iothreads-ids-partial", QEMU_CAPS_OBJECT_IOTHREAD); + DO_TEST_CAPS_LATEST("iothreads-ids"); + DO_TEST_CAPS_LATEST("iothreads-ids-partial"); DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes"); - DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); + DO_TEST_CAPS_LATEST("iothreads-disk"); DO_TEST_CAPS_ARCH_VER("iothreads-disk-virtio-ccw", "s390x", "4.2.0"); DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0"); DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); diff --git a/tests/qemuxml2xmloutdata/iothreads-disk.xml b/tests/qemuxml2xm= loutdata/iothreads-disk.x86_64-latest.xml similarity index 86% rename from tests/qemuxml2xmloutdata/iothreads-disk.xml rename to tests/qemuxml2xmloutdata/iothreads-disk.x86_64-latest.xml index 38074b4c62..2155971ef0 100644 --- a/tests/qemuxml2xmloutdata/iothreads-disk.xml +++ b/tests/qemuxml2xmloutdata/iothreads-disk.x86_64-latest.xml @@ -6,15 +6,18 @@ 2 2 - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 @@ -33,7 +36,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml b/tests/qem= uxml2xmloutdata/iothreads-ids-partial.x86_64-latest.xml similarity index 82% rename from tests/qemuxml2xmloutdata/iothreads-ids-partial.xml rename to tests/qemuxml2xmloutdata/iothreads-ids-partial.x86_64-latest.xml index b6afcf9cbb..c40bac6643 100644 --- a/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml +++ b/tests/qemuxml2xmloutdata/iothreads-ids-partial.x86_64-latest.xml @@ -12,22 +12,25 @@ - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
- +
diff --git a/tests/qemuxml2xmloutdata/iothreads-ids.xml b/tests/qemuxml2xml= outdata/iothreads-ids.x86_64-latest.xml similarity index 82% rename from tests/qemuxml2xmloutdata/iothreads-ids.xml rename to tests/qemuxml2xmloutdata/iothreads-ids.x86_64-latest.xml index 4f73431581..4b55b08ac4 100644 --- a/tests/qemuxml2xmloutdata/iothreads-ids.xml +++ b/tests/qemuxml2xmloutdata/iothreads-ids.x86_64-latest.xml @@ -10,22 +10,25 @@ - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
- +
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 676a707f44..4d9c6853a7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -582,11 +582,11 @@ mymain(void) DO_TEST_CAPS_LATEST("numavcpus-topology-mismatch"); DO_TEST_NOCAPS("smp"); - DO_TEST_NOCAPS("iothreads-ids"); + DO_TEST_CAPS_LATEST("iothreads-ids"); DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes"); - DO_TEST_NOCAPS("iothreads-ids-partial"); + DO_TEST_CAPS_LATEST("iothreads-ids-partial"); DO_TEST_NOCAPS("cputune-iothreads"); - DO_TEST_NOCAPS("iothreads-disk"); + DO_TEST_CAPS_LATEST("iothreads-disk"); DO_TEST_NOCAPS("iothreads-disk-virtio-ccw"); DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI); --=20 2.39.2