101 lines
3.0 KiB
Diff
101 lines
3.0 KiB
Diff
From b6ec9f3779a824879defc43172e1cc6e3aac4c29 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <b6ec9f3779a824879defc43172e1cc6e3aac4c29.1772815313.git.jdenemar@redhat.com>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Mon, 23 Feb 2026 13:57:32 +0100
|
|
Subject: [PATCH] schema: Introduce osnvram define
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This moves the definition of the <nvram> element out of the
|
|
fairly complex oshvm define and will make it easier to later
|
|
add the <varstore> element without making things unmanageable.
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
(cherry picked from commit b5da97c5b9b95b8b099e1c5aa7f04c17df636e70)
|
|
|
|
https://issues.redhat.com/browse/RHEL-82645
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
---
|
|
src/conf/schemas/domaincommon.rng | 54 +++++++++++++++++--------------
|
|
1 file changed, 29 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
|
|
index 152aa489f5..92f82c8fbf 100644
|
|
--- a/src/conf/schemas/domaincommon.rng
|
|
+++ b/src/conf/schemas/domaincommon.rng
|
|
@@ -349,31 +349,7 @@
|
|
</element>
|
|
</optional>
|
|
<optional>
|
|
- <element name="nvram">
|
|
- <optional>
|
|
- <attribute name="template">
|
|
- <ref name="absFilePath"/>
|
|
- </attribute>
|
|
- </optional>
|
|
- <optional>
|
|
- <attribute name="templateFormat">
|
|
- <ref name="pflashFormatTypes"/>
|
|
- </attribute>
|
|
- </optional>
|
|
- <optional>
|
|
- <ref name="pflashFormat"/>
|
|
- </optional>
|
|
- <optional>
|
|
- <choice>
|
|
- <group>
|
|
- <ref name="absFilePath"/>
|
|
- </group>
|
|
- <group>
|
|
- <ref name="diskSource"/>
|
|
- </group>
|
|
- </choice>
|
|
- </optional>
|
|
- </element>
|
|
+ <ref name="osnvram"/>
|
|
</optional>
|
|
<optional>
|
|
<ref name="osbootkernel"/>
|
|
@@ -452,6 +428,34 @@
|
|
</element>
|
|
</define>
|
|
|
|
+ <define name="osnvram">
|
|
+ <element name="nvram">
|
|
+ <optional>
|
|
+ <attribute name="template">
|
|
+ <ref name="absFilePath"/>
|
|
+ </attribute>
|
|
+ </optional>
|
|
+ <optional>
|
|
+ <attribute name="templateFormat">
|
|
+ <ref name="pflashFormatTypes"/>
|
|
+ </attribute>
|
|
+ </optional>
|
|
+ <optional>
|
|
+ <ref name="pflashFormat"/>
|
|
+ </optional>
|
|
+ <optional>
|
|
+ <choice>
|
|
+ <group>
|
|
+ <ref name="absFilePath"/>
|
|
+ </group>
|
|
+ <group>
|
|
+ <ref name="diskSource"/>
|
|
+ </group>
|
|
+ </choice>
|
|
+ </optional>
|
|
+ </element>
|
|
+ </define>
|
|
+
|
|
<define name="osexe">
|
|
<element name="os">
|
|
<interleave>
|
|
--
|
|
2.53.0
|