From nobody Mon Feb 9 21:21:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1676457909; cv=none; d=zohomail.com; s=zohoarc; b=Qf5tAMb39B10XvF9Lwrq281HNbJD4tgkLVGQqjM5mO26zxwiTL5ZWmmMjmWzDsH2uWRMxYK5yUiy/mRJG1F0pnCQGvs9tXUfg48GvdFp4JkzFs6z+koNOHk/+bk5GLv4b1aLxD05uzd6gph87MDEHFToErEIwnd/oIelBFme6Lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457909; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dMeD08Xy3C2l0wn/wH9BGnW8gMFEO1aTYkY7YZjk+Dg=; b=QHc1dh3u7dvQQYwrsAbeSRoZ6QW7Yb5JJORahWemjlMXpkVtuG0BlpKpVzQe6tdLd9Nd0cTmb0HMbv/ZJ7k7oSG9IrSqsQtd1VZHMrO9ZpM6bOHQFzpIHcLIBVTuheFHaBG1vcjnvlhne7sPlBmQRgwmfS7JDGEswQ8mLUBLxjs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1676457909955460.3264018083089; Wed, 15 Feb 2023 02:45:09 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-596-ec86oV2oNvy2hnJlZvQhmw-1; Wed, 15 Feb 2023 05:43:21 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5D9D81C84E; Wed, 15 Feb 2023 10:43:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D238A404CD88; Wed, 15 Feb 2023 10:43:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 253011946A6C; Wed, 15 Feb 2023 10:43:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 20BF11946588 for ; Wed, 15 Feb 2023 10:42:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1B9B71415108; Wed, 15 Feb 2023 10:42:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D955140EBF4 for ; Wed, 15 Feb 2023 10:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457904; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dMeD08Xy3C2l0wn/wH9BGnW8gMFEO1aTYkY7YZjk+Dg=; b=Ckk/kK4WL48hyahU+4fRcAH3PVrcHhHxC0DEz1t6Vj/ogtJ87KKDnePRDqnS3zGiuOW+Sr URq3xAa7OpumlX8tOLuvAn9YB946C3ERH8BIiPHNA/H9XQ+VaSAY7kUVjFmmeIchpJAzx7 8HMci0/GqToH9L63pKqohniLlKo4j88= X-MC-Unique: ec86oV2oNvy2hnJlZvQhmw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 29/33] qemu: Add support for QCOW2 format firmware Date: Wed, 15 Feb 2023 11:42:26 +0100 Message-Id: <20230215104230.980815-30-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1676457910604100001 Content-Type: text/plain; charset="utf-8"; x-default="true" https://bugzilla.redhat.com/show_bug.cgi?id=3D2161965 Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 14 ++++++++++---- .../firmware-auto-efi-aarch64.aarch64-latest.args | 8 ++++---- .../virtio-iommu-aarch64.aarch64-latest.args | 8 ++++---- .../firmware-auto-efi-aarch64.aarch64-latest.xml | 4 ++-- .../virtio-iommu-aarch64.aarch64-latest.xml | 4 ++-- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 01efb60e69..9de4166772 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1013,6 +1013,8 @@ qemuFirmwareEnsureNVRAM(virDomainDef *def, =20 if (format =3D=3D VIR_STORAGE_FILE_RAW) ext =3D ".fd"; + if (format =3D=3D VIR_STORAGE_FILE_QCOW2) + ext =3D ".qcow2"; =20 loader->nvram->path =3D g_strdup_printf("%s/%s_VARS%s", cfg->nvramDir, def->name, @@ -1173,7 +1175,8 @@ qemuFirmwareMatchDomain(const virDomainDef *def, } } =20 - if (STRNEQ(flash->executable.format, "raw")) { + if (STRNEQ(flash->executable.format, "raw") && + STRNEQ(flash->executable.format, "qcow2")) { VIR_DEBUG("Discarding loader with unsupported flash format '%s= '", flash->executable.format); return false; @@ -1186,7 +1189,8 @@ qemuFirmwareMatchDomain(const virDomainDef *def, return false; } if (flash->mode =3D=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) { - if (STRNEQ(flash->nvram_template.format, "raw")) { + if (STRNEQ(flash->nvram_template.format, "raw") && + STRNEQ(flash->nvram_template.format, "qcow2")) { VIR_DEBUG("Discarding loader with unsupported nvram templa= te format '%s'", flash->nvram_template.format); return false; @@ -1596,14 +1600,16 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, return -1; =20 if (loader && - loader->format !=3D VIR_STORAGE_FILE_RAW) { + loader->format !=3D VIR_STORAGE_FILE_RAW && + loader->format !=3D VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported loader format '%s'"), virStorageFileFormatTypeToString(loader->format)); return -1; } if (nvram && - nvram->format !=3D VIR_STORAGE_FILE_RAW) { + nvram->format !=3D VIR_STORAGE_FILE_RAW && + nvram->format !=3D VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported nvram format '%s'"), virStorageFileFormatTypeToString(nvram->format)); diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-lates= t.args b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.ar= gs index 05b27e84e8..8ebd1b8a26 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args @@ -10,10 +10,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.qcow2"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage"}' \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ diff --git a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.arg= s b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args index a88078818d..4d2df70378 100644 --- a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args @@ -10,10 +10,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"disca= rd":"unmap"}' \ --blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.qcow2"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"qcow2","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"di= scard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"qcow2","file":"libvirt-pflash1-storage"}' \ -machine virt-6.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-lat= est.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest= .xml index b53f39a72e..2eb5ab05fe 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml @@ -6,8 +6,8 @@ 1 hvm - /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qe= mu/nvram/guest_VARS.fd + /usr/share/A= AVMF/AAVMF_CODE.qcow2 + /var/lib/libvirt/qemu/nvram/guest_VARS.qcow2 diff --git a/tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.x= ml b/tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml index 2813e742d1..9e4f81fde8 100644 --- a/tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml @@ -6,8 +6,8 @@ 1 hvm - /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qe= mu/nvram/guest_VARS.fd + /usr/share/A= AVMF/AAVMF_CODE.qcow2 + /var/lib/libvirt/qemu/nvram/guest_VARS.qcow2 --=20 2.39.1