From nobody Thu Oct 31 00:21:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1722423870550252.25684807763582; Wed, 31 Jul 2024 04:04:30 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 568C8137C; Wed, 31 Jul 2024 07:04:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 786001419; Wed, 31 Jul 2024 07:02:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 91B1A13A2; Wed, 31 Jul 2024 07:02:39 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id DF247BC3 for ; Wed, 31 Jul 2024 07:02:35 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-152-bCCBuXWuNWuFFNyl5tbkjQ-1; Wed, 31 Jul 2024 07:02:34 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0DB091955D4E for ; Wed, 31 Jul 2024 11:02:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA0951955D42 for ; Wed, 31 Jul 2024 11:02:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722423755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EUxWdmm4Y6YF1b6bj0/sMmampXXekJNr7T3cldElkA4=; b=gHgEatKpTWNDiOO8J74kbKejaAxfmE+DGrZF0kcW4B95llAfv37yIC1A7RrgIWa+T9Fpp2 WbBrGB2YoBuygKQ1725I02hYFTcRi4NM8vgE3kQ1H+QeTm2Lqoyl42ib4tF9OdLCzzJ9g7 2L9TF93AGt1X+1bHr1dz284wR+4ryEg= X-MC-Unique: bCCBuXWuNWuFFNyl5tbkjQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/2] qemuxmlconftest: Add tests for the ACPI stripping hack on s390 Date: Wed, 31 Jul 2024 13:02:27 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: O64VVCFZQWBOF4CUA4JRAHCEYMJAR2AR X-Message-ID-Hash: O64VVCFZQWBOF4CUA4JRAHCEYMJAR2AR X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1722423871692116600 Content-Type: text/plain; charset="utf-8" Replace the 'misc-acpi' case by testing a bunch of architectures for how ACPI is handled including a test for the s390 ACPI strip hack added in previous commit. Signed-off-by: Peter Krempa Reviewed-by: Boris Fiuczynski --- .../aarch64-nousb-acpi.aarch64-latest.err | 1 + tests/qemuxmlconfdata/aarch64-nousb-acpi.xml | 18 +++++++ ...ngarch64-virt-acpi.loongarch64-latest.args | 31 +++++++++++ ...ongarch64-virt-acpi.loongarch64-latest.xml | 26 +++++++++ .../qemuxmlconfdata/loongarch64-virt-acpi.xml | 15 ++++++ .../misc-acpi.x86_64-latest.args | 34 ------------ .../misc-acpi.x86_64-latest.xml | 41 -------------- tests/qemuxmlconfdata/misc-acpi.xml | 33 ------------ .../riscv64-virt-acpi.riscv64-latest.args | 33 ++++++++++++ .../riscv64-virt-acpi.riscv64-latest.xml | 36 +++++++++++++ tests/qemuxmlconfdata/riscv64-virt-acpi.xml | 15 ++++++ .../s390x-ccw-acpi.s390x-latest.args | 32 +++++++++++ .../s390x-ccw-acpi.s390x-latest.xml | 27 ++++++++++ tests/qemuxmlconfdata/s390x-ccw-acpi.xml | 15 ++++++ .../x86_64-q35-acpi.x86_64-latest.args | 38 +++++++++++++ .../x86_64-q35-acpi.x86_64-latest.xml | 53 +++++++++++++++++++ tests/qemuxmlconfdata/x86_64-q35-acpi.xml | 15 ++++++ tests/qemuxmlconftest.c | 13 ++++- 18 files changed, 367 insertions(+), 109 deletions(-) create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-acpi.aarch64-latest= .err create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-acpi.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64= -latest.args create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64= -latest.xml create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-acpi.xml delete mode 100644 tests/qemuxmlconfdata/misc-acpi.x86_64-latest.args delete mode 100644 tests/qemuxmlconfdata/misc-acpi.x86_64-latest.xml delete mode 100644 tests/qemuxmlconfdata/misc-acpi.xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.= args create mode 100644 tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.= xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-acpi.xml create mode 100644 tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/s390x-ccw-acpi.xml create mode 100644 tests/qemuxmlconfdata/x86_64-q35-acpi.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/x86_64-q35-acpi.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/x86_64-q35-acpi.xml diff --git a/tests/qemuxmlconfdata/aarch64-nousb-acpi.aarch64-latest.err b/= tests/qemuxmlconfdata/aarch64-nousb-acpi.aarch64-latest.err new file mode 100644 index 0000000000..5f379d56ce --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-nousb-acpi.aarch64-latest.err @@ -0,0 +1 @@ +unsupported configuration: machine type 'borzoi' does not support ACPI diff --git a/tests/qemuxmlconfdata/aarch64-nousb-acpi.xml b/tests/qemuxmlco= nfdata/aarch64-nousb-acpi.xml new file mode 100644 index 0000000000..0930b3a862 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-nousb-acpi.xml @@ -0,0 +1,18 @@ + + aarch64test + 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f + 1048576 + 1 + + + hvm + + + + + + + /usr/bin/qemu-system-aarch64 + + + diff --git a/tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest= .args b/tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest.args new file mode 100644 index 0000000000..e59d833ca9 --- /dev/null +++ b/tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-loongarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dloongarch.r= am,acpi=3Don \ +-accel tcg \ +-cpu la464 \ +-m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"loongarch.ram","size":4294= 967296}' \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest= .xml b/tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest.xml new file mode 100644 index 0000000000..d3ce68c3a3 --- /dev/null +++ b/tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest.xml @@ -0,0 +1,26 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + 4194304 + 4194304 + 4 + + hvm + + + + + + + la464 + + + destroy + restart + destroy + + /usr/bin/qemu-system-loongarch64 + + + diff --git a/tests/qemuxmlconfdata/loongarch64-virt-acpi.xml b/tests/qemuxm= lconfdata/loongarch64-virt-acpi.xml new file mode 100644 index 0000000000..1d83f93d88 --- /dev/null +++ b/tests/qemuxmlconfdata/loongarch64-virt-acpi.xml @@ -0,0 +1,15 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + 4194304 + 4 + + + + + hvm + + + /usr/bin/qemu-system-loongarch64 + + diff --git a/tests/qemuxmlconfdata/misc-acpi.x86_64-latest.args b/tests/qem= uxmlconfdata/misc-acpi.x86_64-latest.args deleted file mode 100644 index c4e09c0af2..0000000000 --- a/tests/qemuxmlconfdata/misc-acpi.x86_64-latest.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ --accel tcg \ --cpu qemu64 \ --m size=3D219136k \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/misc-acpi.x86_64-latest.xml b/tests/qemu= xmlconfdata/misc-acpi.x86_64-latest.xml deleted file mode 100644 index 176926bb60..0000000000 --- a/tests/qemuxmlconfdata/misc-acpi.x86_64-latest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - - - - qemu64 - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - -
- - -
- - - - -