[libvirt PATCH 28/33] conf: Accept QCOW2 firmware format
All of the drivers will reject this value.
Signed-off-by: Andrea Bolognani <abologna(a)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 528426511e..d1c347dafc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16769,7 +16769,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));
@@ -16857,7 +16858,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 150543e076..f3d2a786cc 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.39.1