[go-xml,1/2] Fix virtio-s390 address lookup

Message ID a7a45e6975b99ceb4815bcaa4dd2e2bc62764166.1576879072.git.crobinso@redhat.com
State New
Headers show
Series
  • Fix libvirt-go-xml test CI
Related show

Commit Message

Cole Robinson Dec. 20, 2019, 10:22 p.m.
It was comparing against spapr-vio

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
All this virtio-s390 stuff is kinda bogus though, because it is
never actually output in libvirt XML.

 domain.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.23.0

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

Comments

Daniel P. Berrangé Dec. 23, 2019, 10:02 a.m. | #1
On Fri, Dec 20, 2019 at 05:22:25PM -0500, Cole Robinson wrote:
> It was comparing against spapr-vio

> 

> Signed-off-by: Cole Robinson <crobinso@redhat.com>

> ---

> All this virtio-s390 stuff is kinda bogus though, because it is

> never actually output in libvirt XML.


Hmm, I wonder what I was thinking when i added that. I guess we can
just delete it all.

> 

>  domain.go | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/domain.go b/domain.go

> index 8c4d7a4..7552c4b 100644

> --- a/domain.go

> +++ b/domain.go

> @@ -5145,7 +5145,7 @@ func (a *DomainAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) err

>  	} else if typ == "ccid" {

>  		a.CCID = &DomainAddressCCID{}

>  		return d.DecodeElement(a.CCID, &start)

> -	} else if typ == "spapr-vio" {

> +	} else if typ == "virtio-s390" {

>  		a.VirtioS390 = &DomainAddressVirtioS390{}

>  		return d.DecodeElement(a.VirtioS390, &start)

>  	}

> -- 

> 2.23.0

> 

> --

> libvir-list mailing list

> libvir-list@redhat.com

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


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
Cole Robinson Dec. 23, 2019, 6:47 p.m. | #2
On 12/23/19 5:02 AM, Daniel P. Berrangé wrote:
> On Fri, Dec 20, 2019 at 05:22:25PM -0500, Cole Robinson wrote:
>> It was comparing against spapr-vio
>>
>> Signed-off-by: Cole Robinson <crobinso@redhat.com>
>> ---
>> All this virtio-s390 stuff is kinda bogus though, because it is
>> never actually output in libvirt XML.
> 
> Hmm, I wonder what I was thinking when i added that. I guess we can
> just delete it all.
> 

There's an argument for removing virtio-s390 from libvirt entirely (not
the XML bit, but the qemu implementation) Unclear if any supported
distros even support it anymore, it's been removed from qemu for a few
years IIRC (non-ccw virtio machine type)

- Cole

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

Patch

diff --git a/domain.go b/domain.go
index 8c4d7a4..7552c4b 100644
--- a/domain.go
+++ b/domain.go
@@ -5145,7 +5145,7 @@  func (a *DomainAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) err
 	} else if typ == "ccid" {
 		a.CCID = &DomainAddressCCID{}
 		return d.DecodeElement(a.CCID, &start)
-	} else if typ == "spapr-vio" {
+	} else if typ == "virtio-s390" {
 		a.VirtioS390 = &DomainAddressVirtioS390{}
 		return d.DecodeElement(a.VirtioS390, &start)
 	}