From nobody Sun Nov 24 00:15:37 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 1730793841536248.7412216546045; Tue, 5 Nov 2024 00:04:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7C46C136D; Tue, 5 Nov 2024 03:04:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5A5551185; Tue, 5 Nov 2024 02:59:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 84A301292; 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 E829C11C3 for ; Tue, 5 Nov 2024 02:58:28 -0500 (EST) Received: from mx-prod-mc-02.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-104-uxpGEhZJMyGiv4soRqz4hQ-1; Tue, 05 Nov 2024 02:58:27 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 573101955EA7 for ; Tue, 5 Nov 2024 07:58:26 +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 86A42300019D for ; Tue, 5 Nov 2024 07:58:25 +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=1730793508; 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=rbH1VU4xxeRsFS9yn78qUivzNjA0mORchQeIAw+fGak=; b=JWheBtL19igmjzXuqSs7jWuHm7gfFVMkrAn4DLUmWWqiJZwEiPwqpwIyy5sh4ixIciwdKE mmKwGUq+csnPBsWmBrRwo909duoJJLG/lzeQkhn7lYdtdgw9YYZ6pHhkCt93mij+wzEDlt TKypm0pWy7gx/XKIg2GbmgbkH5/DLOA= X-MC-Unique: uxpGEhZJMyGiv4soRqz4hQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 09/13] qemuPrepareNVRAM: Refuse conversion of NVRAM backing file format Date: Tue, 5 Nov 2024 08:58:07 +0100 Message-ID: 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: QTEJONKKSZ6QBBBI5OOQOTLU6DXJ47VX X-Message-ID-Hash: QTEJONKKSZ6QBBBI5OOQOTLU6DXJ47VX 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: 1730793841794116600 Content-Type: text/plain; charset="utf-8" Refuse situations where the user configures a different format for a file-backed nvram than the template file has. At this point it's still required that the NVRAM and firmware share format, but that is going to be relaxed, thus we need to refuse configurations that the code can't handle. Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7a40e09d47..d134de532c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4624,6 +4624,12 @@ qemuPrepareNVRAM(virQEMUDriver *driver, return -1; } + if (loader->nvram->format !=3D loader->nvramTemplateFormat) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("conversion of the nvram template to another targ= et format is not supported")); + return -1; + } + if ((srcFD =3D virFileOpenAs(loader->nvramTemplate, O_RDONLY, 0, -1, -1, 0)) < 0) { virReportSystemError(-srcFD, --=20 2.47.0