Misc XML schema fixes for libxl

[libvirt] [PATCH] Misc XML schema fixes for libxl

Posted by Daniel P. Berrange 7 years, 5 months ago

The libxlxml2domconfigdata directory was not covered in the RNG schema
tests. This hid a few bugs in both the libxl XML files and the RNG
schema itself.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 docs/schemas/domaincommon.rng              | 3 ++-
 tests/libxlxml2domconfigdata/basic-hvm.xml | 2 +-
 tests/libxlxml2domconfigdata/vnuma-hvm.xml | 2 +-
 tests/virschematest.c                      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index f1808065b2..4f739abfb2 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1169,7 +1169,7 @@
       <optional>
         <element name="bootloader">
           <choice>
-            <ref name="absFilePath"/>
+            <text/>
             <empty/>
           </choice>
         </element>
@@ -2764,6 +2764,7 @@
                 <choice>
                   <value>kvm</value>
                   <value>vfio</value>
+                  <value>xen</value>
                 </choice>
               </attribute>
             </group>
diff --git a/tests/libxlxml2domconfigdata/basic-hvm.xml b/tests/libxlxml2domconfigdata/basic-hvm.xml
index d8cd2a283e..68c2ef08af 100644
--- a/tests/libxlxml2domconfigdata/basic-hvm.xml
+++ b/tests/libxlxml2domconfigdata/basic-hvm.xml
@@ -8,7 +8,7 @@
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
-  <clock sync='utc'/>
+  <clock offset='utc'/>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.xml b/tests/libxlxml2domconfigdata/vnuma-hvm.xml
index 28ad923e8f..6e265e31a9 100644
--- a/tests/libxlxml2domconfigdata/vnuma-hvm.xml
+++ b/tests/libxlxml2domconfigdata/vnuma-hvm.xml
@@ -8,7 +8,7 @@
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
-  <clock sync='utc'/>
+  <clock offset='utc'/>
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
diff --git a/tests/virschematest.c b/tests/virschematest.c
index 9dc4dc5ed8..f1d11437e0 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -221,7 +221,7 @@ mymain(void)
                 "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
                 "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata",
                 "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",
-                "genericxml2xmloutdata", "xlconfigdata",
+                "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",
                 "qemuhotplugtestdomains");
     DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata");
     DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin",
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Misc XML schema fixes for libxl

Posted by Jim Fehlig 7 years, 5 months ago

On 11/29/2017 10:44 AM, Daniel P. Berrange wrote:
> The libxlxml2domconfigdata directory was not covered in the RNG schema
> tests. This hid a few bugs in both the libxl XML files and the RNG
> schema itself.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>   docs/schemas/domaincommon.rng              | 3 ++-
>   tests/libxlxml2domconfigdata/basic-hvm.xml | 2 +-
>   tests/libxlxml2domconfigdata/vnuma-hvm.xml | 2 +-
>   tests/virschematest.c                      | 2 +-
>   4 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
> index f1808065b2..4f739abfb2 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -1169,7 +1169,7 @@
>         <optional>
>           <element name="bootloader">
>             <choice>
> -            <ref name="absFilePath"/>
> +            <text/>
>               <empty/>
>             </choice>
>           </element>
> @@ -2764,6 +2764,7 @@
>                   <choice>
>                     <value>kvm</value>
>                     <value>vfio</value>
> +                  <value>xen</value>
>                   </choice>
>                 </attribute>
>               </group>
> diff --git a/tests/libxlxml2domconfigdata/basic-hvm.xml b/tests/libxlxml2domconfigdata/basic-hvm.xml
> index d8cd2a283e..68c2ef08af 100644
> --- a/tests/libxlxml2domconfigdata/basic-hvm.xml
> +++ b/tests/libxlxml2domconfigdata/basic-hvm.xml
> @@ -8,7 +8,7 @@
>     <on_poweroff>destroy</on_poweroff>
>     <on_reboot>restart</on_reboot>
>     <on_crash>destroy</on_crash>
> -  <clock sync='utc'/>
> +  <clock offset='utc'/>
>     <os>
>       <type>hvm</type>
>       <loader>/usr/lib/xen/boot/hvmloader</loader>
> diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.xml b/tests/libxlxml2domconfigdata/vnuma-hvm.xml
> index 28ad923e8f..6e265e31a9 100644
> --- a/tests/libxlxml2domconfigdata/vnuma-hvm.xml
> +++ b/tests/libxlxml2domconfigdata/vnuma-hvm.xml
> @@ -8,7 +8,7 @@
>     <on_poweroff>destroy</on_poweroff>
>     <on_reboot>restart</on_reboot>
>     <on_crash>destroy</on_crash>
> -  <clock sync='utc'/>
> +  <clock offset='utc'/>
>     <os>
>       <type>hvm</type>
>       <loader>/usr/lib/xen/boot/hvmloader</loader>
> diff --git a/tests/virschematest.c b/tests/virschematest.c
> index 9dc4dc5ed8..f1d11437e0 100644
> --- a/tests/virschematest.c
> +++ b/tests/virschematest.c
> @@ -221,7 +221,7 @@ mymain(void)
>                   "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
>                   "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata",
>                   "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",
> -                "genericxml2xmloutdata", "xlconfigdata",
> +                "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",
>                   "qemuhotplugtestdomains");
>       DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata");
>       DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin",
> 

Reviewed-by: Jim Fehlig <jfehlig@suse.com>

Regards,
Jim

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list