From nobody Thu Apr 25 23:05:59 2024 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 1490796778997106.80125268273127; Wed, 29 Mar 2017 07:12:58 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 121427AEA7; Wed, 29 Mar 2017 14:12:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B96F7A09E4; Wed, 29 Mar 2017 14:12:56 +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 3FBBD5EC62; Wed, 29 Mar 2017 14:12:55 +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 v2TE96kw020819 for ; Wed, 29 Mar 2017 10:09:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C2F27D9F4; Wed, 29 Mar 2017 14:09:06 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A7FED7D9F1 for ; Wed, 29 Mar 2017 14:09:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 121427AEA7 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.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 121427AEA7 From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 16:08:52 +0200 Message-Id: <1490796536-4529-2-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 1/5] qemu: Split virQEMUCapsInitArchQMPBasic() 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 29 Mar 2017 14:12:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of having a single function that probes the architecture from the monitor and then sets a bunch of basic capabilities based on it, have a separate function for each part: virQEMUCapsInitQMPArch() only sets the architecture, and virQEMUCapsInitQMPBasicArch() only sets the capabilities. This split will be useful later on, when we will want to set basic capabilities from the test suite without having to go through the pain of mocking the monitor. --- This is 99% pure code motion; however, an early 'return -1' has been converted to the equivalent 'goto cleanup'. src/qemu/qemu_capabilities.c | 42 +++++++++++++++++++++++++++++++---------= -- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f51141b..eec2ee4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4177,18 +4177,25 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY); } =20 -/* Capabilities that are architecture depending - * initialized for QEMU. + +/** + * virQEMUCapsInitQMPArch: + * @qemuCaps: QEMU capabilities + * @mon: QEMU monitor + * + * Initialize the architecture for @qemuCaps by asking @mon. + * + * Returns: 0 on success, <0 on failure */ static int -virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, +virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { char *archstr =3D NULL; int ret =3D -1; =20 if (!(archstr =3D qemuMonitorGetTargetArch(mon))) - return -1; + goto cleanup; =20 if ((qemuCaps->arch =3D virQEMUCapsArchFromString(archstr)) =3D=3D VIR= _ARCH_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -4196,18 +4203,29 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, goto cleanup; } =20 + ret =3D 0; + + cleanup: + VIR_FREE(archstr); + return ret; +} + + +/** + * virQEMUCapsInitQMPBasicArch: + * @qemuCaps: QEMU capabilities + * + * Initialize @qemuCaps with basic architecture-dependent capabilities. + */ +static void +virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps) +{ /* ACPI/HPET/KVM PIT are x86 specific */ if (ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); } - - ret =3D 0; - - cleanup: - VIR_FREE(archstr); - return ret; } =20 =20 @@ -4432,9 +4450,11 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, =20 virQEMUCapsInitQMPBasic(qemuCaps); =20 - if (virQEMUCapsInitArchQMPBasic(qemuCaps, mon) < 0) + if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0) goto cleanup; =20 + virQEMUCapsInitQMPBasicArch(qemuCaps); + /* USB option is supported v1.3.0 onwards */ if (qemuCaps->version >=3D 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 23:05:59 2024 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 From nobody Thu Apr 25 23:05:59 2024 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 1490796823919860.9754159407474; Wed, 29 Mar 2017 07:13:43 -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 61C0851443; Wed, 29 Mar 2017 14:13:42 +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 1B09F8AC2D; Wed, 29 Mar 2017 14:13:42 +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 9F6AB18523CB; Wed, 29 Mar 2017 14:13:38 +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 v2TE98L6020835 for ; Wed, 29 Mar 2017 10:09:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E90F7D9E0; Wed, 29 Mar 2017 14:09:08 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9947E7D9ED for ; Wed, 29 Mar 2017 14:09:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 61C0851443 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.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 61C0851443 From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 16:08:54 +0200 Message-Id: <1490796536-4529-4-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 3/5] qemu: Advertise ACPI support for aarch64 guests 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.39]); Wed, 29 Mar 2017 14:13:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" So far, libvirt has assumed that only x86 supports ACPI, but that's inaccurate since aarch64 supports it too. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1429509 --- src/qemu/qemu_capabilities.c | 28 ++++++++++++++++--= ---- .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + .../qemuxml2argv-aarch64-gic-host.args | 1 + .../qemuxml2argv-aarch64-gic-v2.args | 1 + .../qemuxml2argv-aarch64-gic-v3.args | 1 + 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d9a1f8b..d8ed88b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1043,13 +1043,17 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, =20 machines =3D NULL; nmachines =3D 0; + } =20 + if ((ARCH_IS_X86(guestarch) || guestarch =3D=3D VIR_ARCH_AARCH64) && + virCapabilitiesAddGuestFeature(guest, "acpi", true, true) =3D=3D N= ULL) { + goto cleanup; } =20 if (ARCH_IS_X86(guestarch) && - (virCapabilitiesAddGuestFeature(guest, "acpi", true, true) =3D=3D = NULL || - virCapabilitiesAddGuestFeature(guest, "apic", true, false) =3D=3D= NULL)) + virCapabilitiesAddGuestFeature(guest, "apic", true, false) =3D=3D = NULL) { goto cleanup; + } =20 if ((guestarch =3D=3D VIR_ARCH_I686) && (virCapabilitiesAddGuestFeature(guest, "pae", true, false) =3D=3D = NULL || @@ -4096,10 +4100,15 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t = runUid, gid_t runGid, const c qmperr) < 0) goto cleanup; =20 - /* -no-acpi is not supported on non-x86 - * even if qemu reports it in -help */ - if (!ARCH_IS_X86(qemuCaps->arch)) + /* Older QEMU versions reported -no-acpi in the output of -help even + * though it was not supported by the architecture. The issue has since + * been fixed, but to maintain compatibility with all release we still + * need to filter out the capability for architectures that we know + * don't support the feature, eg. anything but x86 and aarch64 */ + if (!ARCH_IS_X86(qemuCaps->arch) && + qemuCaps->arch !=3D VIR_ARCH_AARCH64) { virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); + } =20 /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu * understands the 0.13.0+ notion of "-device driver,". */ @@ -4220,9 +4229,14 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps, void virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps) { - /* ACPI/HPET/KVM PIT are x86 specific */ - if (ARCH_IS_X86(qemuCaps->arch)) { + /* ACPI only works on x86 and aarch64 */ + if (ARCH_IS_X86(qemuCaps->arch) || + qemuCaps->arch =3D=3D VIR_ARCH_AARCH64) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); + } + + /* HPET and KVM PIT are x86 specific */ + if (ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/test= s/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml index c1e4679..af3a8e7 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml @@ -40,6 +40,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/test= s/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml index 20dfda2..4402ffa 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml @@ -40,6 +40,7 @@ + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args b/te= sts/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args index 5fdaa08..23276ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args @@ -15,4 +15,5 @@ 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 2caf1b9..f79c1c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args @@ -15,4 +15,5 @@ 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 3ae8e5f..fce9308 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args @@ -15,4 +15,5 @@ QEMU_AUDIO_DRV=3Dnone \ -nographic \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 23:05:59 2024 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 1490796789827116.70473374127289; Wed, 29 Mar 2017 07:13:09 -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 08A99C0096E7; Wed, 29 Mar 2017 14:13:08 +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 CD78F189EB; Wed, 29 Mar 2017 14:13:07 +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 7B47418521CD; Wed, 29 Mar 2017 14:13:07 +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 v2TE98Mr020840 for ; Wed, 29 Mar 2017 10:09:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id E4CE27D9EB; Wed, 29 Mar 2017 14:09:08 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C4637D9E0 for ; Wed, 29 Mar 2017 14:09:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 08A99C0096E7 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.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 08A99C0096E7 From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 16:08:55 +0200 Message-Id: <1490796536-4529-5-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 4/5] qemu: Enforce ACPI, UEFI requirements 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.32]); Wed, 29 Mar 2017 14:13:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Depending on the architecture, requirements for ACPI and UEFI can be different; more specifically, while on x86 UEFI requires ACPI, on aarch64 it's the other way around. Enforce these requirements when validating the domain, and make the error message more accurate by mentioning that they're not necessarily applicable to all architectures. Several aarch64 test cases had to be tweaked because they would have failed the validation step otherwise. --- src/qemu/qemu_command.c | 20 ++++------------= ---- src/qemu/qemu_domain.c | 20 ++++++++++++++++= ++++ .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 1 + .../qemuxml2argv-aarch64-aavmf-virtio-mmio.xml | 1 - .../qemuxml2argv-aarch64-cpu-passthrough.args | 1 + .../qemuxml2argv-aarch64-cpu-passthrough.xml | 1 - .../qemuxml2argv-aarch64-video-virtio-gpu-pci.args | 1 + .../qemuxml2argv-aarch64-video-virtio-gpu-pci.xml | 3 --- ...xml2argv-aarch64-virt-2.6-virtio-pci-default.args | 1 + ...uxml2argv-aarch64-virt-2.6-virtio-pci-default.xml | 1 - .../qemuxml2argv-aarch64-virt-default-nic.args | 1 + .../qemuxml2argv-aarch64-virt-default-nic.xml | 3 --- .../qemuxml2argv-aarch64-virt-virtio.args | 1 + .../qemuxml2argv-aarch64-virt-virtio.xml | 1 - .../qemuxml2argv-aarch64-virtio-pci-default.args | 1 + .../qemuxml2argv-aarch64-virtio-pci-default.xml | 1 - ...xml2argv-aarch64-virtio-pci-manual-addresses.args | 1 + ...uxml2argv-aarch64-virtio-pci-manual-addresses.xml | 1 - .../qemuxml2argv-balloon-mmio-deflate.args | 1 + .../qemuxml2argv-balloon-mmio-deflate.xml | 1 - .../qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml | 1 - .../qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml | 1 - .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 1 - ...ml2xmlout-aarch64-virtio-pci-manual-addresses.xml | 1 - 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 64d2d71..5cf383a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9324,18 +9324,16 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logMa= nager, } =20 =20 -static int +static void qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, - virDomainDefPtr def, - virQEMUCapsPtr qemuCaps) + virDomainDefPtr def) { - int ret =3D -1; virDomainLoaderDefPtr loader =3D def->os.loader; virBuffer buf =3D VIR_BUFFER_INITIALIZER; int unit =3D 0; =20 if (!loader) - return 0; + return; =20 switch ((virDomainLoader) loader->type) { case VIR_DOMAIN_LOADER_TYPE_ROM: @@ -9344,12 +9342,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, break; =20 case VIR_DOMAIN_LOADER_TYPE_PFLASH: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_ACPI) && - def->features[VIR_DOMAIN_FEATURE_ACPI] !=3D VIR_TRISTATE_SWITC= H_ON) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("ACPI must be enabled in order to use UEFI")); - goto cleanup; - } =20 if (loader->secure =3D=3D VIR_TRISTATE_BOOL_YES) { virCommandAddArgList(cmd, @@ -9387,10 +9379,7 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, break; } =20 - ret =3D 0; - cleanup: virBufferFreeAndReset(&buf); - return ret; } =20 =20 @@ -9827,8 +9816,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) goto error; =20 - if (qemuBuildDomainLoaderCommandLine(cmd, def, qemuCaps) < 0) - goto error; + qemuBuildDomainLoaderCommandLine(cmd, def); =20 if (!migrateURI && !snapshot && qemuDomainAlignMemorySizes(def) < 0) goto error; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 458bb5f..e41e8e4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2884,6 +2884,26 @@ qemuDomainDefValidate(const virDomainDef *def, goto cleanup; } =20 + /* On x86, UEFI requires ACPI */ + if (def->os.loader && + def->os.loader->type =3D=3D VIR_DOMAIN_LOADER_TYPE_PFLASH && + ARCH_IS_X86(def->os.arch) && + def->features[VIR_DOMAIN_FEATURE_ACPI] !=3D VIR_TRISTATE_SWITCH_ON= ) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("UEFI requires ACPI on this architecture")); + goto cleanup; + } + + /* On aarch64, ACPI requires UEFI */ + if (def->features[VIR_DOMAIN_FEATURE_ACPI] =3D=3D VIR_TRISTATE_SWITCH_= ON && + def->os.arch =3D=3D VIR_ARCH_AARCH64 && + (!def->os.loader || + def->os.loader->type !=3D VIR_DOMAIN_LOADER_TYPE_PFLASH)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("ACPI requires UEFI on this architecture")); + return -1; + } + if (def->os.loader && def->os.loader->secure =3D=3D VIR_TRISTATE_BOOL_YES) { /* These are the QEMU implementation limitations. But we diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.= args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index bf4b2f7..68fb61b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.= xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.xml index 8c7428c..5d72173 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.xml @@ -13,7 +13,6 @@ - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.ar= gs b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args index 52d2112..9c8c001 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c \ -drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.xm= l b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.xml index 4cdf387..0dda095 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.xml @@ -8,7 +8,6 @@ hvm - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-p= ci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.= args index 76ee977..2f8c516 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \ +-no-acpi \ -device ioh3420,port=3D0x8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifuncti= on=3Don,\ addr=3D0x1 \ -device ioh3420,port=3D0x9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,multifuncti= on=3Don,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-p= ci.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.x= ml index 4b52a73..d9a0128 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml @@ -7,9 +7,6 @@ hvm - - - cortex-a57 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pc= i-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virti= o-pci-default.args index df03c6e..e99d412 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-defau= lt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-defau= lt.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pc= i-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio= -pci-default.xml index e745101..43bc008 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-defau= lt.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-defau= lt.xml @@ -12,7 +12,6 @@ earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.a= rgs b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args index 29f65f6..47d7761 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -17,6 +17,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64-virt-default/monitor.sock,server,\ nowait \ +-no-acpi \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.x= ml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml index 3a6f098..17ddc90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml @@ -4,9 +4,6 @@ 1048576 1048576 1 - - - cortex-a53 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b= /tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args index b5b010c..5fef3b4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml b/= tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml index ad34615..2692e61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml @@ -12,7 +12,6 @@ earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default= .args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args index 46ac51d..23a5fff 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default= .xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.xml index 2a84a96..72bf0c9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.xml @@ -12,7 +12,6 @@ earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-= addresses.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-man= ual-addresses.args index 0640399..54244fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-address= es.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-address= es.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-= addresses.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manu= al-addresses.xml index 5e1b494..fee3258 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-address= es.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-address= es.xml @@ -13,7 +13,6 @@ - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args = b/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args index 10d1362..e568e3c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args @@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefconfig \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-no-acpi \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml b= /tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml index 1b5b48c..49b7d2c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml @@ -12,7 +12,6 @@ earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait - diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-m= mio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio= .xml index bea6599..9e72830 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml @@ -13,7 +13,6 @@ - diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-g= pu-pci.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-g= pu-pci.xml index 2c765e7..8590f48 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.= xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.= xml @@ -8,7 +8,6 @@ hvm - diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-def= ault.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-defau= lt.xml index 88a6a6a..e549642 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml @@ -13,7 +13,6 @@ - diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-man= ual-addresses.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-= pci-manual-addresses.xml index 83cf0d1..83d8dcc 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-add= resses.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-add= resses.xml @@ -13,7 +13,6 @@ - --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 23:05:59 2024 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 1490796794322669.0475766963702; Wed, 29 Mar 2017 07:13:14 -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 BAD93C05AA52; Wed, 29 Mar 2017 14:13:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 896B818992; Wed, 29 Mar 2017 14:13:12 +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 3CFB15EC60; Wed, 29 Mar 2017 14:13:12 +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 v2TE998P020845 for ; Wed, 29 Mar 2017 10:09:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id B8AC77D9EF; Wed, 29 Mar 2017 14:09:09 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FB687D9E0 for ; Wed, 29 Mar 2017 14:09:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BAD93C05AA52 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.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 BAD93C05AA52 From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 16:08:56 +0200 Message-Id: <1490796536-4529-6-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 5/5] tests: Test ACPI, UEFI requirements 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.32]); Wed, 29 Mar 2017 14:13:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Make sure every combination of ACPI and UEFI works, or fails to work, as expected. --- .../qemuxml2argv-aarch64-acpi-nouefi.args | 22 ++++++++++++++++++= +++ .../qemuxml2argv-aarch64-acpi-nouefi.xml | 22 ++++++++++++++++++= +++ .../qemuxml2argv-aarch64-acpi-uefi.args | 22 ++++++++++++++++++= +++ .../qemuxml2argv-aarch64-acpi-uefi.xml | 21 ++++++++++++++++++= ++ .../qemuxml2argv-aarch64-noacpi-nouefi.args | 22 ++++++++++++++++++= +++ .../qemuxml2argv-aarch64-noacpi-nouefi.xml | 19 ++++++++++++++++++ .../qemuxml2argv-aarch64-noacpi-uefi.args | 23 ++++++++++++++++++= ++++ .../qemuxml2argv-aarch64-noacpi-uefi.xml | 18 +++++++++++++++++ .../qemuxml2argv-q35-acpi-nouefi.args | 21 ++++++++++++++++++= ++ .../qemuxml2argv-q35-acpi-nouefi.xml | 22 ++++++++++++++++++= +++ .../qemuxml2argv-q35-acpi-uefi.args | 22 ++++++++++++++++++= +++ .../qemuxml2argv-q35-acpi-uefi.xml | 21 ++++++++++++++++++= ++ .../qemuxml2argv-q35-noacpi-nouefi.args | 22 ++++++++++++++++++= +++ .../qemuxml2argv-q35-noacpi-nouefi.xml | 19 ++++++++++++++++++ .../qemuxml2argv-q35-noacpi-uefi.xml | 18 +++++++++++++++++ tests/qemuxml2argvtest.c | 14 +++++++++++++ 16 files changed, 328 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi= .args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi= .xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.a= rgs create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.x= ml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-noue= fi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-noue= fi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi= .args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi= .xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.a= rgs create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.x= ml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-uefi.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.args b= /tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.args new file mode 100644 index 0000000..5d9e1fb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.args @@ -0,0 +1,22 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest \ +-S \ +-M virt \ +-cpu host \ +-m 1024 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-boot c \ +-kernel /var/lib/libvirt/images/guest.vmlinux \ +-initrd /var/lib/libvirt/images/guest.initramfs \ +-append 'console=3DttyAMA0 rw root=3D/dev/vda rootwait' diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.xml b/= tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.xml new file mode 100644 index 0000000..cda1b1b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-nouefi.xml @@ -0,0 +1,22 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /var/lib/libvirt/images/guest.vmlinuz + /var/lib/libvirt/images/guest.initramfs + console=3DttyAMA0 rw root=3D/dev/vda rootwait + + + + + + cortex-a57 + + + /usr/bin/qemu-system-aarch64 + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args b/t= ests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args new file mode 100644 index 0000000..36371ba --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args @@ -0,0 +1,22 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest \ +-S \ +-M virt \ +-cpu cortex-a57 \ +-drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,\ +readonly=3Don \ +-drive file=3D/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=3Dpflash,format= =3Draw,\ +unit=3D1 \ +-m 1024 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.xml b/te= sts/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.xml new file mode 100644 index 0000000..5de2eb5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.xml @@ -0,0 +1,21 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /usr/share/AAVMF/AAVMF_CODE.f= d + /var/lib/libvirt/qemu/nvram/guest_VARS.fd + + + + + + cortex-a57 + + + /usr/bin/qemu-system-aarch64 + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args= b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args new file mode 100644 index 0000000..301eda8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args @@ -0,0 +1,22 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest \ +-S \ +-M virt \ +-cpu cortex-a57 \ +-m 1024 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-kernel /var/lib/libvirt/images/guest.vmlinuz \ +-initrd /var/lib/libvirt/images/guest.initramfs \ +-append 'console=3DttyAMA0 rw root=3D/dev/vda rootwait' diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.xml = b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.xml new file mode 100644 index 0000000..e8551ed --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.xml @@ -0,0 +1,19 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /var/lib/libvirt/images/guest.vmlinuz + /var/lib/libvirt/images/guest.initramfs + console=3DttyAMA0 rw root=3D/dev/vda rootwait + + + cortex-a57 + + + /usr/bin/qemu-system-aarch64 + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args b= /tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args new file mode 100644 index 0000000..c62de75 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args @@ -0,0 +1,23 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest \ +-S \ +-M virt \ +-cpu cortex-a57 \ +-drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,\ +readonly=3Don \ +-drive file=3D/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=3Dpflash,format= =3Draw,\ +unit=3D1 \ +-m 1024 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-no-acpi \ +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.xml b/= tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.xml new file mode 100644 index 0000000..e66b805 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.xml @@ -0,0 +1,18 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /usr/share/AAVMF/AAVMF_CODE.f= d + /var/lib/libvirt/qemu/nvram/guest_VARS.fd + + + cortex-a57 + + + /usr/bin/qemu-system-aarch64 + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args b/tes= ts/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args new file mode 100644 index 0000000..eea422d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args @@ -0,0 +1,21 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest \ +-S \ +-M q35 \ +-cpu Haswell \ +-m 1024 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-boot c \ +-kernel /var/lib/libvirt/images/guest.vmlinuz \ +-initrd /var/lib/libvirt/images/guest.initramfs \ +-append 'rw root=3D/dev/vda rootwait' diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.xml b/test= s/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.xml new file mode 100644 index 0000000..7d735f9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.xml @@ -0,0 +1,22 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /var/lib/libvirt/images/guest.vmlinuz + /var/lib/libvirt/images/guest.initramfs + rw root=3D/dev/vda rootwait + + + + + + Haswell + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args b/tests= /qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args new file mode 100644 index 0000000..9dfa583 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args @@ -0,0 +1,22 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest \ +-S \ +-M q35 \ +-cpu Haswell \ +-drive file=3D/usr/share/OVMF/OVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,\ +readonly=3Don \ +-drive file=3D/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=3Dpflash,format= =3Draw,\ +unit=3D1 \ +-m 1024 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.xml b/tests/= qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.xml new file mode 100644 index 0000000..4eb5a46 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.xml @@ -0,0 +1,21 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd<= /loader> + /var/lib/libvirt/qemu/nvram/guest_VARS.fd + + + + + + Haswell + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args b/t= ests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args new file mode 100644 index 0000000..ba0f59c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args @@ -0,0 +1,22 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest \ +-S \ +-M q35 \ +-cpu Haswell \ +-m 1024 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-kernel /var/lib/libvirt/images/guest.vmlinuz \ +-initrd /var/lib/libvirt/images/guest.initramfs \ +-append 'rw root=3D/dev/vda rootwait' diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.xml b/te= sts/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.xml new file mode 100644 index 0000000..163b424 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.xml @@ -0,0 +1,19 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /var/lib/libvirt/images/guest.vmlinuz + /var/lib/libvirt/images/guest.initramfs + rw root=3D/dev/vda rootwait + + + Haswell + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-uefi.xml b/test= s/qemuxml2argvdata/qemuxml2argv-q35-noacpi-uefi.xml new file mode 100644 index 0000000..91c83c8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-uefi.xml @@ -0,0 +1,18 @@ + + guest + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd<= /loader> + /var/lib/libvirt/qemu/nvram/guest_VARS.fd + + + Haswell + + + /usr/bin/qemu-system-x86_64 + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 731b793..ad68556 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -757,6 +757,13 @@ mymain(void) QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_SMM_OPT, QEMU_CAPS_VIRTIO_SCSI); + + /* Make sure all combinations of ACPI and UEFI behave as expected */ + DO_TEST("q35-acpi-uefi", NONE); + DO_TEST_PARSE_ERROR("q35-noacpi-uefi", NONE); + DO_TEST("q35-noacpi-nouefi", NONE); + DO_TEST("q35-acpi-nouefi", NONE); + DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG); DO_TEST("clock-localtime", NONE); DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC); @@ -2318,6 +2325,13 @@ mymain(void) DO_TEST_FAILURE("aarch64-kvm-32-on-64", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); + + /* Make sure all combinations of ACPI and UEFI behave as expected */ + DO_TEST("aarch64-acpi-uefi", NONE); + DO_TEST("aarch64-noacpi-uefi", NONE); + DO_TEST("aarch64-noacpi-nouefi", NONE); + DO_TEST_PARSE_ERROR("aarch64-acpi-nouefi", NONE); + qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE); =20 DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY); --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 23:05:59 2024 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 1490878093891336.617189853028; Thu, 30 Mar 2017 05:48:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 66857C056800; Thu, 30 Mar 2017 12:48:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31E4371C9F; Thu, 30 Mar 2017 12:48:11 +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 1D5785EC60; Thu, 30 Mar 2017 12:48:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UCm8hs014692 for ; Thu, 30 Mar 2017 08:48:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 367137841C; Thu, 30 Mar 2017 12:48:08 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.34.129.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B1C2D78416 for ; Thu, 30 Mar 2017 12:48:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 66857C056800 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.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 66857C056800 From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 14:48:01 +0200 Message-Id: <1490878081-11249-1-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.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2.5/5] qemu: Remove redundant capabilities 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 30 Mar 2017 12:48:12 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that the NO_ACPI and NO_HPET capabilities are set automatically by virQEMUCapsInitQMPBasicArch() if appropriate for the architecture, they shouldn't be used manually to avoid masking bugs. --- tests/qemuxml2argvtest.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 731b793..5c0e1e8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -762,9 +762,8 @@ mymain(void) DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC); DO_TEST("clock-variable", QEMU_CAPS_RTC); DO_TEST("clock-france", QEMU_CAPS_RTC); - DO_TEST("clock-hpet-off", QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT); - DO_TEST("clock-catchup", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT); + DO_TEST("clock-hpet-off", QEMU_CAPS_RTC); + DO_TEST("clock-catchup", QEMU_CAPS_RTC); DO_TEST("cpu-kvmclock", QEMU_CAPS_ENABLE_KVM); DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM); DO_TEST("kvmclock", QEMU_CAPS_KVM); @@ -797,7 +796,7 @@ mymain(void) DO_TEST("pmu-feature-off", NONE); =20 DO_TEST("hugepages", QEMU_CAPS_MEM_PATH); - DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT, + DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -1990,7 +1989,6 @@ mymain(void) DO_TEST("q35-virt-manager-basic", QEMU_CAPS_KVM, QEMU_CAPS_RTC, - QEMU_CAPS_NO_KVM_PIT, QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, @@ -2322,7 +2320,7 @@ mymain(void) =20 DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("kvm-pit-discard", QEMU_CAPS_KVM_PIT_TICK_POLICY); - DO_TEST("no-kvm-pit-device", QEMU_CAPS_NO_KVM_PIT); + DO_TEST("no-kvm-pit-device", NONE); =20 DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC, QEMU_CAPS_NODEFCONFIG); --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list