From 807e4c375a61aee0160c4cf19ae5aa71535a168d Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 27 Jan 2023 19:12:33 +0100
Subject: [PATCH] conf: Accept QCOW2 firmware format

All of the drivers will reject this value, at least for now.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/domain_conf.c            | 6 ++++--
 src/conf/schemas/domaincommon.rng | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 27c53e9b76..34d38f9958 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16778,7 +16778,8 @@ virDomainLoaderDefParseXMLNvram(virDomainLoaderDef *loader,
                               &format, VIR_STORAGE_FILE_RAW) < 0) {
         return -1;
     }
-    if (format != VIR_STORAGE_FILE_RAW) {
+    if (format != VIR_STORAGE_FILE_RAW &&
+        format != VIR_STORAGE_FILE_QCOW2) {
         virReportError(VIR_ERR_XML_ERROR,
                        _("Unsupported nvram format '%s'"),
                        virStorageFileFormatTypeToString(format));
@@ -16866,7 +16867,8 @@ virDomainLoaderDefParseXMLLoader(virDomainLoaderDef *loader,
                               &format, VIR_STORAGE_FILE_RAW) < 0) {
         return -1;
     }
-    if (format != VIR_STORAGE_FILE_RAW) {
+    if (format != VIR_STORAGE_FILE_RAW &&
+        format != VIR_STORAGE_FILE_QCOW2) {
         virReportError(VIR_ERR_XML_ERROR,
                        _("Unsupported loader format '%s'"),
                        virStorageFileFormatTypeToString(format));
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index fca7ff9940..790bba0f7f 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -7548,6 +7548,7 @@
     <attribute name="format">
       <choice>
         <value>raw</value>
+        <value>qcow2</value>
       </choice>
     </attribute>
   </define>
-- 
2.47.2