From nobody Sun Feb 8 19:59:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 14907968205981011.3567518318606; Wed, 29 Mar 2017 07:13:40 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 8F85A8EB5A; Wed, 29 Mar 2017 14:13:38 +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 5580018ADC; Wed, 29 Mar 2017 14:13:35 +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 B064118523CB; Wed, 29 Mar 2017 14:13:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2TE97Rj020827 for ; Wed, 29 Mar 2017 10:09:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BC3B7D9EB; Wed, 29 Mar 2017 14:09:07 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 79F0A7D9F1 for ; Wed, 29 Mar 2017 14:09:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8F85A8EB5A Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8F85A8EB5A From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 16:08:53 +0200 Message-Id: <1490796536-4529-3-git-send-email-abologna@redhat.com> In-Reply-To: <1490796536-4529-1-git-send-email-abologna@redhat.com> References: <1490796536-4529-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/5] tests: Initialize basic capabilities properly 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 29 Mar 2017 14:13:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The capabilities used in test cases should match those used during normal operation for the tests to make any sense. --- src/qemu/qemu_capabilities.c | 2 = +- src/qemu/qemu_capabilities.h | 2 = ++ tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args | 1 + .../qemuxml2argv-s390-allow-bogus-usb-controller.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args | 1 - tests/qemuxml2argvtest.c | 4 = ++-- 55 files changed, 7 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index eec2ee4..d9a1f8b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4217,7 +4217,7 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps, * * Initialize @qemuCaps with basic architecture-dependent capabilities. */ -static void +void virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps) { /* ACPI/HPET/KVM PIT are x86 specific */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d44682f..24e2f38 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -510,6 +510,8 @@ int virQEMUCapsParseHelpStr(const char *qemu, const char *qmperr); /* Only for use by test suite */ int virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str); +/* Only for use by test suite */ +void virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps); =20 VIR_ENUM_DECL(virQEMUCaps); =20 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args b/te= sts/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args index 23276ad..5fdaa08 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args @@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ --no-acpi \ -boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args b/test= s/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args index f79c1c6..2caf1b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args @@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ --no-acpi \ -boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args b/test= s/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args index fce9308..3ae8e5f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args @@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ --no-acpi \ -boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args b= /tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args index 8565071..c8bb726 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args @@ -15,6 +15,5 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a,deflate-on-oom= =3Don diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/= qemuxml2argvdata/qemuxml2argv-console-sclp.args index dc9f7af..17f6055 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/= tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args index 4fe0d6d..73868d4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0001 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b= /tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args index 6e0e11e..06ef1b7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -device virtio-serial-s390,id=3Dvirtio-serial0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args b/t= ests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args index 07abc93..0b4ce4c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args @@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-guest1/monitor.sock,server,nowait \ --no-acpi \ -boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args b/test= s/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args index 4c95d6a..48850b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args @@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-guest1/monitor.sock,server,nowait \ --no-acpi \ -boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args = b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args index 5f6b087..8290cd6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3D0.0.0007,drive=3Ddrive-virtio-disk0,id=3Dvi= rtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tes= ts/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args index 45f51a8..2f77a29 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/te= sts/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args index 30aa47a..45c4659 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args = b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args index 3b352bf..522fd99 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -device virtio-scsi-ccw,id=3Dscsi0,devno=3Dfe.0.0001 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemu= xml2argvdata/qemuxml2argv-fs9p-ccw.args index d4bf19c..6d4f65e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args @@ -15,7 +15,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-cc= w.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.ar= gs index 199adfa..03de632 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -device virtio-scsi-ccw,id=3Dscsi0,devno=3Dfe.0.0001 \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/test= s/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args index 26e9496..1b2a52b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args @@ -22,6 +22,7 @@ host-nodes=3D1-3,policy=3Dbind \ -monitor unix:/tmp/lib/domain--1-fedora/monitor.sock,server,nowait \ -rtc base=3Dutc,driftfix=3Dslew \ -no-kvm-pit-reinjection \ +-no-hpet \ -global PIIX4_PM.disable_s3=3D1 \ -global PIIX4_PM.disable_s4=3D1 \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.= args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args index 5e001de..ba4e699 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args @@ -16,7 +16,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,iothread=3Diothread1,devno=3Dfe.0.0000,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.= args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args index 1ebb6d4..e87912b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args @@ -16,7 +16,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -device virtio-scsi-ccw,iothread=3Diothread2,id=3Dscsi0,devno=3Dfe.0.0001 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap= .args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args index 33a53a0..c718084 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap= s.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.ar= gs index 33a53a0..c718084 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.= args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args index 9536cce..c6eaa24 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps= .args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args index 9536cce..c6eaa24 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap= .args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args index 9afa7c2..434f506 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap= s.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.ar= gs index 9afa7c2..434f506 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.= args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args index e73ed67..24e2035 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps= .args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args index e73ed67..24e2035 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.= args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args index 19d2c35..acde08a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args = b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args index 19d2c35..acde08a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonum= a.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.ar= gs index 781f30d..88ed6b6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args @@ -18,7 +18,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -kernel /media/ram/uImage \ -initrd /media/ram/ramdisk \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args b/test= s/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args index 86b6add..8a0598a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -device virtio-net-ccw,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,devno=3D= fe.0.0001 \ -net user,vlan=3D0,name=3Dhostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tes= ts/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args index 46ccbc9..ef31b79 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -device virtio-net-s390,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55 \ -net user,vlan=3D0,name=3Dhostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemux= ml2argvdata/qemuxml2argv-ppc-dtb.args index 58c1526..10ddca0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -kernel /media/ram/uImage \ -initrd /media/ram/ramdisk \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args b/test= s/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args index d623836..87f4ee5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args @@ -16,7 +16,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -kernel /media/ram/uImage \ -initrd /media/ram/ramdisk \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests= /qemuxml2argvdata/qemuxml2argv-pseries-basic.args index 2839dea..97a7057 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -usb \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/= tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args index 06595a2..7740e2f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args @@ -18,7 +18,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -usb \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/t= ests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args index 803c1aa..d2c99a7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args @@ -18,7 +18,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -usb \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args b/test= s/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args index 2839dea..97a7057 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -usb \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args b/tests= /qemuxml2argvdata/qemuxml2argv-pseries-nvram.args index 89e0e56..904b951 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args @@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ -boot c \ -usb \ -global spapr-nvram.reg=3D0x4000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args= b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args index 2839dea..97a7057 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -usb \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.a= rgs b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args index 2839dea..97a7057 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -usb \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b= /tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args index 56e3552..a92b1e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args b/tes= ts/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args index 1a672c6..caaccdb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/t= ests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args index 7273891..b9bd905 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -device pci-ohci,id=3Dusb1,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.= args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args index 5754d3c..63cf3c1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -device spapr-vscsi,id=3Dscsi0,reg=3D0x2000 \ -device spapr-vscsi,id=3Dscsi1,reg=3D0x30000000 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/q= emuxml2argvdata/qemuxml2argv-pseries-vio.args index 43381dd..0294067 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -device spapr-vscsi,id=3Dscsi0,reg=3D0x2000 \ -device spapr-vscsi,id=3Dscsi1,reg=3D0x3000 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.arg= s b/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args index e139e52..91598e9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args @@ -15,6 +15,7 @@ QEMU_AUDIO_DRV=3Dspice \ -monitor unix:/tmp/lib/domain--1-virt-manager-basic/monitor.sock,server,no= wait \ -rtc base=3Dutc,driftfix=3Dslew \ -no-kvm-pit-reinjection \ +-no-hpet \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D1 \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-contr= oller.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-contr= oller.args index a1c1c85..8abe0df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.a= rgs +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.a= rgs @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-test/monitor.so= ck,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -device virtio-serial-s390,id=3Dvirtio-serial0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.= args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args index a1c1c85..8abe0df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-test/monitor.so= ck,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -device virtio-serial-s390,id=3Dvirtio-serial0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args b/= tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args index a18b5a5..3267814 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0000 \ -chardev pty,id=3Dcharconsole0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args= b/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args index e49c8df..fa8fbbc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -boot c \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0000 \ -chardev pty,id=3Dcharconsole0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/test= s/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args index dec49e1..a73bce8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0001 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/te= sts/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args index 2997c12..95f915c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args @@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --no-acpi \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ -device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ -device diag288,id=3Dwatchdog0 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 41461ea..731b793 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -360,8 +360,6 @@ testInitQEMUCaps(struct testInfo *info, if (!(info->qemuCaps =3D virQEMUCapsNew())) goto cleanup; =20 - virQEMUCapsSet(info->qemuCaps, QEMU_CAPS_NO_ACPI); - if (testQemuCapsSetGIC(info->qemuCaps, gic) < 0) goto cleanup; =20 @@ -381,6 +379,8 @@ testUpdateQEMUCaps(const struct testInfo *info, =20 virQEMUCapsSetArch(info->qemuCaps, vm->def->os.arch); =20 + virQEMUCapsInitQMPBasicArch(info->qemuCaps); + /* We need to pretend QEMU 2.0.0 is in use so that pSeries guests * will get the correct alias assigned to their buses. * See virQEMUCapsHasPCIMultiBus() */ --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list