1. Patchew
  2. Libvirt
  3. View series

[libvirt] [PATCH] Remove non-existant 'wiremode' attribute

Daniel P. Berrange posted 1 patch 6 years, 4 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20171129180104.12076-1-berrange@redhat.com
docs/schemas/domaincommon.rng                     | 3 ---
tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml | 2 +-
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml   | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
[libvirt] [PATCH] Remove non-existant 'wiremode' attribute
Posted by Daniel P. Berrange 6 years, 4 months ago 
The 'wiremode' attribute exists in a couple of Xen XML files, but no code has
ever parsed that value. It was later added to the RNG schema too, again despite
there not being any code which parses it.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 docs/schemas/domaincommon.rng                     | 3 ---
 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml | 2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml   | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 4f739abfb2..1e936f03d3 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3686,9 +3686,6 @@
         <optional>
           <attribute name="service"/>
         </optional>
-        <optional>
-          <attribute name="wiremode"/>
-        </optional>
         <optional>
           <attribute name="channel"/>
         </optional>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
index 667ecbd4c2..3f0176e768 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
@@ -32,7 +32,7 @@
       <target dev='ioemu:hda'/>
     </disk>
     <parallel type='tcp'>
-      <source mode='connect' host='localhost' service='9999' wiremode='raw'/>
+      <source mode='connect' host='localhost' service='9999'/>
       <target port='0'/>
     </parallel>
     <graphics type='vnc' port='5917' keymap='ja'/>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
index 72915b0a39..69603fea3a 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
@@ -32,7 +32,7 @@
       <target dev='ioemu:hda'/>
     </disk>
     <serial type='tcp'>
-      <source mode='bind' host='localhost' service='9999' wiremode='raw'/>
+      <source mode='bind' host='localhost' service='9999'/>
       <target port='0'/>
     </serial>
     <graphics type='vnc' port='5917' keymap='ja'/>
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] Remove non-existant 'wiremode' attribute
Posted by Jim Fehlig 6 years, 4 months ago 
On 11/29/2017 11:01 AM, Daniel P. Berrange wrote:
> The 'wiremode' attribute exists in a couple of Xen XML files, but no code has
> ever parsed that value. It was later added to the RNG schema too, again despite
> there not being any code which parses it.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>   docs/schemas/domaincommon.rng                     | 3 ---
>   tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml | 2 +-
>   tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml   | 2 +-
>   3 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
> index 4f739abfb2..1e936f03d3 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -3686,9 +3686,6 @@
>           <optional>
>             <attribute name="service"/>
>           </optional>
> -        <optional>
> -          <attribute name="wiremode"/>
> -        </optional>
>           <optional>
>             <attribute name="channel"/>
>           </optional>
> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
> index 667ecbd4c2..3f0176e768 100644
> --- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
> +++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
> @@ -32,7 +32,7 @@
>         <target dev='ioemu:hda'/>
>       </disk>
>       <parallel type='tcp'>
> -      <source mode='connect' host='localhost' service='9999' wiremode='raw'/>
> +      <source mode='connect' host='localhost' service='9999'/>
>         <target port='0'/>
>       </parallel>
>       <graphics type='vnc' port='5917' keymap='ja'/>
> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
> index 72915b0a39..69603fea3a 100644
> --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
> +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
> @@ -32,7 +32,7 @@
>         <target dev='ioemu:hda'/>
>       </disk>
>       <serial type='tcp'>
> -      <source mode='bind' host='localhost' service='9999' wiremode='raw'/>
> +      <source mode='bind' host='localhost' service='9999'/>
>         <target port='0'/>
>       </serial>
>       <graphics type='vnc' port='5917' keymap='ja'/>
> 

Wow, old cruft. How did you stumble across these?

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
Re: [libvirt] [PATCH] Remove non-existant 'wiremode' attribute
Posted by Daniel P. Berrange 6 years, 4 months ago 
On Wed, Nov 29, 2017 at 05:51:13PM -0700, Jim Fehlig wrote:
> On 11/29/2017 11:01 AM, Daniel P. Berrange wrote:
> > The 'wiremode' attribute exists in a couple of Xen XML files, but no code has
> > ever parsed that value. It was later added to the RNG schema too, again despite
> > there not being any code which parses it.
> > 
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> >   docs/schemas/domaincommon.rng                     | 3 ---
> >   tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml | 2 +-
> >   tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml   | 2 +-
> >   3 files changed, 2 insertions(+), 5 deletions(-)
> > 
> > diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
> > index 4f739abfb2..1e936f03d3 100644
> > --- a/docs/schemas/domaincommon.rng
> > +++ b/docs/schemas/domaincommon.rng
> > @@ -3686,9 +3686,6 @@
> >           <optional>
> >             <attribute name="service"/>
> >           </optional>
> > -        <optional>
> > -          <attribute name="wiremode"/>
> > -        </optional>
> >           <optional>
> >             <attribute name="channel"/>
> >           </optional>
> > diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
> > index 667ecbd4c2..3f0176e768 100644
> > --- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
> > +++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
> > @@ -32,7 +32,7 @@
> >         <target dev='ioemu:hda'/>
> >       </disk>
> >       <parallel type='tcp'>
> > -      <source mode='connect' host='localhost' service='9999' wiremode='raw'/>
> > +      <source mode='connect' host='localhost' service='9999'/>
> >         <target port='0'/>
> >       </parallel>
> >       <graphics type='vnc' port='5917' keymap='ja'/>
> > diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
> > index 72915b0a39..69603fea3a 100644
> > --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
> > +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
> > @@ -32,7 +32,7 @@
> >         <target dev='ioemu:hda'/>
> >       </disk>
> >       <serial type='tcp'>
> > -      <source mode='bind' host='localhost' service='9999' wiremode='raw'/>
> > +      <source mode='bind' host='localhost' service='9999'/>
> >         <target port='0'/>
> >       </serial>
> >       <graphics type='vnc' port='5917' keymap='ja'/>
> > 
> 
> Wow, old cruft. How did you stumble across these?

I've got a test case for the libvirt-go-xml code that attempts to do
roundtrip parsing of every single domain XML file in libvirt.git. I
used to it identify which bits of the schema I hadn't implemented,
but now unexpectedly it found bits of XML in our samples that should
not exist :-)

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 :|

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

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.