From nobody Mon Feb 9 05:55:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632394581332151.1363028397493; Thu, 23 Sep 2021 03:56:21 -0700 (PDT) Received: from localhost ([::1]:35650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTMOq-0003nJ-Bs for importer@patchew.org; Thu, 23 Sep 2021 06:56:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTMNd-000338-Rz for qemu-devel@nongnu.org; Thu, 23 Sep 2021 06:55:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTMNZ-0000I4-1i for qemu-devel@nongnu.org; Thu, 23 Sep 2021 06:55:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-229-Clbu-Dw2MBOOfayiWzx4JQ-1; Thu, 23 Sep 2021 06:54:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4DF34100D682; Thu, 23 Sep 2021 10:54:55 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 195925BAE3; Thu, 23 Sep 2021 10:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632394499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jdQn1pvWNugLjJxmtDpoSu09DEkLuIitMFkQVqfrlls=; b=H2zyHLXn0a1Z24pJghOqJFa6xQd+tLsKkIN28MVwZctUyJ2l3eeAbECq7JNdZzQ2aTzXEe LI0e7r4PhpDxd170ikZH6ENJ5llYRpmRSMVVR23tlTBbAYkin3vHjVJq+KXq1re0C1dzAb 4wCc6HgSxZI7Rs0NNnB5G1Fesjn73+s= X-MC-Unique: Clbu-Dw2MBOOfayiWzx4JQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 0/2] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs Date: Thu, 23 Sep 2021 06:54:51 -0400 Message-Id: <20210923105451.3845510-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.473, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, berrange@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1632394581904100001 Content-Type: text/plain; charset="utf-8" Compared to v1, this adds another patch in front, so that tests are not disabled unnecessarily by --disable-blobs. Paolo Bonzini (2): meson: unpack edk2 firmware even if --disable-blobs tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs meson.build | 14 +++++++------- pc-bios/descriptors/meson.build | 4 ++-- pc-bios/meson.build | 5 +++-- tests/qtest/meson.build | 6 +++--- 4 files changed, 15 insertions(+), 14 deletions(-) --=20 2.27.0 From ae2af96bfb54cdef880b5bf3eb651574dba1c5d9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 23 Sep 2021 06:25:23 -0400 Subject: [PATCH v2 1/2] meson: unpack edk2 firmware even if --disable-blobs The edk2 firmware blobs are needed to run bios-tables-test. Unpack them if any UEFI-enabled target is selected, so that the test can run. This is a bit more than is actually necessary, since bios-tables-test does not run for all UEFI-enabled targets, but it is the easiest way to write this logic. Signed-off-by: Paolo Bonzini --- meson.build | 16 ++++++++-------- pc-bios/descriptors/meson.build | 4 ++-- pc-bios/meson.build | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 3945a6cc2d..4cd8b67ad0 100644 --- a/meson.build +++ b/meson.build @@ -95,15 +95,15 @@ if targetos !=3D 'darwin' endif =20 edk2_targets =3D [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_= 64-softmmu' ] -install_edk2_blobs =3D false -if get_option('install_blobs') - foreach target : target_dirs - install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets - endforeach -endif +unpack_edk2_blobs =3D false +foreach target : edk2_targets + if target in target_dirs + bzip2 =3D find_program('bzip2', required: get_option('install_blobs')) + unpack_edk2_blobs =3D bzip2.found() + break + endif +endforeach =20 -bzip2 =3D find_program('bzip2', required: install_edk2_blobs) - ################## # Compiler flags # ################## diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild index 29efa16d99..66f85d01c4 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -1,4 +1,4 @@ -if install_edk2_blobs +if unpack_edk2_blobs and get_option('install_blobs') foreach f: [ '50-edk2-i386-secure.json', '50-edk2-x86_64-secure.json', @@ -10,7 +10,7 @@ if install_edk2_blobs configure_file(input: files(f), output: f, configuration: {'DATADIR': get_option('prefix') / qemu_= datadir}, - install: get_option('install_blobs'), + install: true, install_dir: qemu_datadir / 'firmware') endforeach endif diff --git a/pc-bios/meson.build b/pc-bios/meson.build index f2b32598af..a3b3d87891 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -1,4 +1,4 @@ -if install_edk2_blobs +if unpack_edk2_blobs fds =3D [ 'edk2-aarch64-code.fd', 'edk2-arm-code.fd', --=20 2.27.0 From 18a1be0cea50d3321612da484335842ac9961d6b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 23 Sep 2021 04:09:08 -0400 Subject: [PATCH v2 2/2] tests: qtest: bios-tables-test depends on the unpac= ked edk2 ROMs Skip the test if bzip2 is not available, and run it after they are uncompressed. Signed-off-by: Paolo Bonzini --- pc-bios/meson.build | 3 ++- tests/qtest/meson.build | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pc-bios/meson.build b/pc-bios/meson.build index a3b3d87891..a44c9bc127 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -1,3 +1,4 @@ +roms =3D [] if unpack_edk2_blobs fds =3D [ 'edk2-aarch64-code.fd', @@ -11,7 +12,7 @@ if unpack_edk2_blobs ] =20 foreach f : fds - custom_target(f, + roms +=3D custom_target(f, build_by_default: have_system, output: f, input: '@0@.bz2'.format(f), diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index e1f4df3df8..c9d8458062 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -68,12 +68,12 @@ qtests_i386 =3D \ (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : [= ]) + \ (config_all_devices.has_key('CONFIG_E1000E_PCI_EXPRESS') ? ['fuzz-e1000e= -test'] : []) + \ (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) = + \ + (unpack_edk2_blobs ? ['bios-tables-test'] : []) + = \ qtests_pci + = \ ['fdc-test', 'ide-test', 'hd-geo-test', 'boot-order-test', - 'bios-tables-test', 'rtc-test', 'i440fx-test', 'fw_cfg-test', @@ -180,7 +180,7 @@ qtests_arm =3D \ =20 # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-tes= t unconditional qtests_aarch64 =3D \ - (cpu !=3D 'arm' ? ['bios-tables-test'] : []) + = \ + (cpu !=3D 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + = \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-= test'] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-= swtpm-test'] : []) + \ ['arm-cpu-features', @@ -269,7 +269,7 @@ foreach dir : target_dirs qtest_emulator =3D emulators['qemu-system-' + target_base] target_qtests =3D get_variable('qtests_' + target_base, []) + qtests_gen= eric =20 - test_deps =3D [] + test_deps =3D roms qtest_env =3D environment() if have_tools qtest_env.set('QTEST_QEMU_IMG', './qemu-img') --=20 2.27.0