From nobody Thu Nov 21 18:04:13 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 1730793863216770.7052836829026; Tue, 5 Nov 2024 00:04:23 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 24C541367; Tue, 5 Nov 2024 03:04:22 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 279B312B0; Tue, 5 Nov 2024 02:59:04 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0937711E4; Tue, 5 Nov 2024 02:58:57 -0500 (EST) 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 51DD111ED for ; Tue, 5 Nov 2024 02:58:30 -0500 (EST) Received: from mx-prod-mc-05.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-66-nWD76nHANGq1Eje2gaxaHw-1; Tue, 05 Nov 2024 02:58:28 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BA6B21955EA1 for ; Tue, 5 Nov 2024 07:58:27 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DC087300018D for ; Tue, 5 Nov 2024 07:58:26 +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.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,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=1730793510; 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=yl1EVgDaj90lgOlASrhxbuWC5N0MmzyLTe6METMLCA8=; b=QaFDo2s9hSl5wLI9HB3XkKV6tOMiXdX9A35anxmYSAAuPw/+igSuNGYSyZIJUNwCvpyzWO ONIYzMEQFd8r0WK4T4ruauxe30tMMSW5ZOP1dqSi86zNv2VeE4gKNDSf8yWp7zF8+BxCJU hrSKkX7lpI+JEGTYWlMULCgLMR5IZTo= X-MC-Unique: nWD76nHANGq1Eje2gaxaHw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 10/13] qemuFirmwareMatchDomain: Don't base firmware selection on nvram image format Date: Tue, 5 Nov 2024 08:58:08 +0100 Message-ID: <246da7c5b3f55d2a025b947b4aedaa878afde15b.1730793407.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CEIPHCLL4XGHBE65FIUUJCY2UMOTRTII X-Message-ID-Hash: CEIPHCLL4XGHBE65FIUUJCY2UMOTRTII 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: 1730793864004116600 Content-Type: text/plain; charset="utf-8" Basing the selection on the format of the actual NVRAM image makes no sense as user may format the image themselves. Additionally it doesn't make much sense to even limit the firmware selection based on the nvram template itself. As format of the template is given and firmware images don't really provide any choice. Remove the limitation so that autoselection can pick a template regardless of the selected format or template format. Signed-off-by: Peter Krempa --- src/qemu/qemu_firmware.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index d9d21b4771..2d0ec0b4fa 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1332,13 +1332,6 @@ qemuFirmwareMatchDomain(const virDomainDef *def, flash->nvram_template.format); return false; } - if (loader && loader->nvram && loader->nvram->format && - STRNEQ(flash->nvram_template.format, virStorageFileFormatT= ypeToString(loader->nvram->format))) { - VIR_DEBUG("Discarding loader with mismatching nvram templa= te format '%s' !=3D '%s'", - flash->nvram_template.format, - virStorageFileFormatTypeToString(loader->nvram->= format)); - return false; - } } } else if (fw->mapping.device =3D=3D QEMU_FIRMWARE_DEVICE_MEMORY) { if (loader && loader->type && --=20 2.47.0