1. Patchew
  2. Libvirt
  3. View series

[libvirt PATCH] schema: Add maxphysaddr element to hostcpu

Tim Wiederhake posted 1 patch 1 year, 8 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20220809162212.35724-1-twiederh@redhat.com
src/conf/schemas/cputypes.rng | 3 +++
1 file changed, 3 insertions(+)
[libvirt PATCH] schema: Add maxphysaddr element to hostcpu
Posted by Tim Wiederhake 1 year, 8 months ago 
The output of "virsh capabilities" was not conformant to the
capability.rng schema. Add the missing element to the schema.

Fixes: c647bf29afb9890c792172ecf7db2c9c27babbb6
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
---
 src/conf/schemas/cputypes.rng | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
index 4ae386c3c0..d02f2f88cf 100644
--- a/src/conf/schemas/cputypes.rng
+++ b/src/conf/schemas/cputypes.rng
@@ -387,6 +387,9 @@
         <optional>
           <ref name="cpuTopology"/>
         </optional>
+        <optional>
+          <ref name="cpuMaxPhysAddr"/>
+        </optional>
         <zeroOrMore>
           <element name="feature">
             <attribute name="name">
-- 
2.36.1
Re: [libvirt PATCH] schema: Add maxphysaddr element to hostcpu
Posted by Daniel P. Berrangé 1 year, 8 months ago 
On Tue, Aug 09, 2022 at 06:22:12PM +0200, Tim Wiederhake wrote:
> The output of "virsh capabilities" was not conformant to the
> capability.rng schema. Add the missing element to the schema.

The RNG files are applied against every XML file under tests/,
so if we have an unnoticed gap in an RNG file, that is in turn
a sign that we have insufficient XML files for in tests/

> 
> Fixes: c647bf29afb9890c792172ecf7db2c9c27babbb6
> Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
> ---
>  src/conf/schemas/cputypes.rng | 3 +++
>  1 file changed, 3 insertions(+)

> 
> diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
> index 4ae386c3c0..d02f2f88cf 100644
> --- a/src/conf/schemas/cputypes.rng
> +++ b/src/conf/schemas/cputypes.rng
> @@ -387,6 +387,9 @@
>          <optional>
>            <ref name="cpuTopology"/>
>          </optional>
> +        <optional>
> +          <ref name="cpuMaxPhysAddr"/>
> +        </optional>
>          <zeroOrMore>
>            <element name="feature">
>              <attribute name="name">

So this change is fine, but we also ought to have an XML file to
illustrate the usage


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Re: [libvirt PATCH] schema: Add maxphysaddr element to hostcpu
Posted by Tim Wiederhake 1 year, 8 months ago 
On Tue, 2022-08-09 at 17:35 +0100, Daniel P. Berrangé wrote:
> On Tue, Aug 09, 2022 at 06:22:12PM +0200, Tim Wiederhake wrote:
> > The output of "virsh capabilities" was not conformant to the
> > capability.rng schema. Add the missing element to the schema.
> 
> The RNG files are applied against every XML file under tests/,
> so if we have an unnoticed gap in an RNG file, that is in turn
> a sign that we have insufficient XML files for in tests/

This is the output of "virsh capabilities", not some input file. I
don't see a good way to test this (or mock for it) short of full
integration tests.

> > 
> > Fixes: c647bf29afb9890c792172ecf7db2c9c27babbb6
> > Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
> > ---
> >  src/conf/schemas/cputypes.rng | 3 +++
> >  1 file changed, 3 insertions(+)
> 
> > 
> > diff --git a/src/conf/schemas/cputypes.rng
> > b/src/conf/schemas/cputypes.rng
> > index 4ae386c3c0..d02f2f88cf 100644
> > --- a/src/conf/schemas/cputypes.rng
> > +++ b/src/conf/schemas/cputypes.rng
> > @@ -387,6 +387,9 @@
> >          <optional>
> >            <ref name="cpuTopology"/>
> >          </optional>
> > +        <optional>
> > +          <ref name="cpuMaxPhysAddr"/>
> > +        </optional>
> >          <zeroOrMore>
> >            <element name="feature">
> >              <attribute name="name">
> 
> So this change is fine, but we also ought to have an XML file to
> illustrate the usage

Is this a "reviewed-by"?

Thanks,
Tim

> 
> With regards,
> Daniel
Re: [libvirt PATCH] schema: Add maxphysaddr element to hostcpu
Posted by Daniel P. Berrangé 1 year, 8 months ago 
On Wed, Aug 10, 2022 at 06:29:25PM +0200, Tim Wiederhake wrote:
> On Tue, 2022-08-09 at 17:35 +0100, Daniel P. Berrangé wrote:
> > On Tue, Aug 09, 2022 at 06:22:12PM +0200, Tim Wiederhake wrote:
> > > The output of "virsh capabilities" was not conformant to the
> > > capability.rng schema. Add the missing element to the schema.
> > 
> > The RNG files are applied against every XML file under tests/,
> > so if we have an unnoticed gap in an RNG file, that is in turn
> > a sign that we have insufficient XML files for in tests/
> 
> This is the output of "virsh capabilities", not some input file. I
> don't see a good way to test this (or mock for it) short of full
> integration tests.

Any XML files in tests/capabilityschemadata/  will be validated
against the schema.


> > > Fixes: c647bf29afb9890c792172ecf7db2c9c27babbb6
> > > Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
> > > ---
> > >  src/conf/schemas/cputypes.rng | 3 +++
> > >  1 file changed, 3 insertions(+)
> > 
> > > 
> > > diff --git a/src/conf/schemas/cputypes.rng
> > > b/src/conf/schemas/cputypes.rng
> > > index 4ae386c3c0..d02f2f88cf 100644
> > > --- a/src/conf/schemas/cputypes.rng
> > > +++ b/src/conf/schemas/cputypes.rng
> > > @@ -387,6 +387,9 @@
> > >          <optional>
> > >            <ref name="cpuTopology"/>
> > >          </optional>
> > > +        <optional>
> > > +          <ref name="cpuMaxPhysAddr"/>
> > > +        </optional>
> > >          <zeroOrMore>
> > >            <element name="feature">
> > >              <attribute name="name">
> > 
> > So this change is fine, but we also ought to have an XML file to
> > illustrate the usage
> 
> Is this a "reviewed-by"?

Not without an example XML file being added to the test suite.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Re: [libvirt PATCH] schema: Add maxphysaddr element to hostcpu
Posted by Jim Fehlig 1 year, 8 months ago 
On 8/10/22 10:35, Daniel P. Berrangé wrote:
> On Wed, Aug 10, 2022 at 06:29:25PM +0200, Tim Wiederhake wrote:
>> On Tue, 2022-08-09 at 17:35 +0100, Daniel P. Berrangé wrote:
>>> On Tue, Aug 09, 2022 at 06:22:12PM +0200, Tim Wiederhake wrote:
>>>> The output of "virsh capabilities" was not conformant to the
>>>> capability.rng schema. Add the missing element to the schema.
>>>
>>> The RNG files are applied against every XML file under tests/,
>>> so if we have an unnoticed gap in an RNG file, that is in turn
>>> a sign that we have insufficient XML files for in tests/
>>
>> This is the output of "virsh capabilities", not some input file. I
>> don't see a good way to test this (or mock for it) short of full
>> integration tests.
> 
> Any XML files in tests/capabilityschemadata/  will be validated
> against the schema.
> 
> 
>>>> Fixes: c647bf29afb9890c792172ecf7db2c9c27babbb6
>>>> Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
>>>> ---
>>>>   src/conf/schemas/cputypes.rng | 3 +++
>>>>   1 file changed, 3 insertions(+)
>>>
>>>>
>>>> diff --git a/src/conf/schemas/cputypes.rng
>>>> b/src/conf/schemas/cputypes.rng
>>>> index 4ae386c3c0..d02f2f88cf 100644
>>>> --- a/src/conf/schemas/cputypes.rng
>>>> +++ b/src/conf/schemas/cputypes.rng
>>>> @@ -387,6 +387,9 @@
>>>>           <optional>
>>>>             <ref name="cpuTopology"/>
>>>>           </optional>
>>>> +        <optional>
>>>> +          <ref name="cpuMaxPhysAddr"/>
>>>> +        </optional>
>>>>           <zeroOrMore>
>>>>             <element name="feature">
>>>>               <attribute name="name">
>>>
>>> So this change is fine, but we also ought to have an XML file to
>>> illustrate the usage
>>
>> Is this a "reviewed-by"?
> 
> Not without an example XML file being added to the test suite.

Since I was responsible for the omission I also felt responsible to fix it, 
along with some other issues I found with the rng

https://listman.redhat.com/archives/libvir-list/2022-August/233677.html

Regards,
Jim

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.