diff --git a/go.mod b/go.mod index b19eac06d0..a9fdb5241c 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( k8s.io/api v0.27.4 k8s.io/apimachinery v0.27.4 k8s.io/client-go v0.27.4 - libvirt.org/go/libvirtxml v1.9008.0 + libvirt.org/go/libvirtxml v1.10000.0 ) require ( diff --git a/go.sum b/go.sum index eee62feb2e..d35f069cc1 100644 --- a/go.sum +++ b/go.sum @@ -1093,8 +1093,8 @@ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5F k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc= k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -libvirt.org/go/libvirtxml v1.9008.0 h1:xo2U9SqUsufTFtbyjiqs6oDdF329cvtRdqttWN7eojk= -libvirt.org/go/libvirtxml v1.9008.0/go.mod h1:7Oq2BLDstLr/XtoQD8Fr3mfDNrzlI3utYKySXF2xkng= +libvirt.org/go/libvirtxml v1.10000.0 h1:KPZXcmqUoJaJai95et+TEZegUQkFzCJgf1A59BOWpZQ= +libvirt.org/go/libvirtxml v1.10000.0/go.mod h1:7Oq2BLDstLr/XtoQD8Fr3mfDNrzlI3utYKySXF2xkng= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/libvirt.org/go/libvirtxml/domain.go b/vendor/libvirt.org/go/libvirtxml/domain.go index 967729a3af..ede42e9141 100644 --- a/vendor/libvirt.org/go/libvirtxml/domain.go +++ b/vendor/libvirt.org/go/libvirtxml/domain.go @@ -276,6 +276,19 @@ type DomainDiskMetadataCacheSize struct { Value int `xml:",cdata"` } +type DomainDiskIOThreads struct { + IOThread []DomainDiskIOThread `xml:"iothread"` +} + +type DomainDiskIOThread struct { + ID uint `xml:"id,attr"` + Queues []DomainDiskIOThreadQueue `xml:"queue"` +} + +type DomainDiskIOThreadQueue struct { + ID uint `xml:"id,attr"` +} + type DomainDiskDriver struct { Name string `xml:"name,attr,omitempty"` Type string `xml:"type,attr,omitempty"` @@ -289,6 +302,7 @@ type DomainDiskDriver struct { Discard string `xml:"discard,attr,omitempty"` DiscardNoUnref string `xml:"discard_no_unref,attr,omitempty"` IOThread *uint `xml:"iothread,attr"` + IOThreads *DomainDiskIOThreads `xml:"iothreads"` DetectZeros string `xml:"detect_zeroes,attr,omitempty"` Queues *uint `xml:"queues,attr"` QueueSize *uint `xml:"queue_size,attr"` @@ -510,6 +524,17 @@ type DomainFilesystemBinary struct { ThreadPool *DomainFilesystemBinaryThreadPool `xml:"thread_pool"` } +type DomainFilesystemIDMapEntry struct { + Start uint `xml:"start,attr"` + Target uint `xml:"target,attr"` + Count uint `xml:"count,attr"` +} + +type DomainFilesystemIDMap struct { + UID []DomainFilesystemIDMapEntry `xml:"uid"` + GID []DomainFilesystemIDMapEntry `xml:"gid"` +} + type DomainFilesystem struct { XMLName xml.Name `xml:"filesystem"` AccessMode string `xml:"accessmode,attr,omitempty"` @@ -519,6 +544,7 @@ type DomainFilesystem struct { DMode string `xml:"dmode,attr,omitempty"` Driver *DomainFilesystemDriver `xml:"driver"` Binary *DomainFilesystemBinary `xml:"binary"` + IDMap *DomainFilesystemIDMap `xml:"idmap"` Source *DomainFilesystemSource `xml:"source"` Target *DomainFilesystemTarget `xml:"target"` ReadOnly *DomainFilesystemReadOnly `xml:"readonly"` @@ -1523,6 +1549,7 @@ type DomainAudio struct { SPICE *DomainAudioSPICE `xml:"-"` File *DomainAudioFile `xml:"-"` DBus *DomainAudioDBus `xml:"-"` + PipeWire *DomainAudioPipeWire `xml:"-"` } type DomainAudioChannel struct { @@ -1610,6 +1637,19 @@ type DomainAudioPulseAudioChannel struct { Latency uint `xml:"latency,attr,omitempty"` } +type DomainAudioPipeWire struct { + RuntimeDir string `xml:"runtimeDir,attr,omitempty"` + Input *DomainAudioPulseAudioChannel `xml:"input"` + Output *DomainAudioPulseAudioChannel `xml:"output"` +} + +type DomainAudioPipeWireChannel struct { + DomainAudioChannel + Name string `xml:"name,attr,omitempty"` + StreamName string `xml:"streamName,attr,omitempty"` + Latency uint `xml:"latency,attr,omitempty"` +} + type DomainAudioSDL struct { Driver string `xml:"driver,attr,omitempty"` Input *DomainAudioSDLChannel `xml:"input"` @@ -1752,7 +1792,8 @@ type DomainHostdevSubsysPCISource struct { } type DomainHostdevSubsysPCIDriver struct { - Name string `xml:"name,attr,omitempty"` + Name string `xml:"name,attr,omitempty"` + Model string `xml:"model,attr,omitempty"` } type DomainHostdevSubsysPCI struct { @@ -5765,6 +5806,11 @@ func (a *DomainAudio) MarshalXML(e *xml.Encoder, start xml.StartElement) error { xml.Name{Local: "type"}, "dbus", }) return e.EncodeElement(a.DBus, start) + } else if a.PipeWire != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "pipewire", + }) + return e.EncodeElement(a.PipeWire, start) } return nil } @@ -5872,6 +5918,14 @@ func (a *DomainAudio) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error } a.DBus = &dbus return nil + } else if typ == "pipewire" { + var pipewire DomainAudioPipeWire + err := d.DecodeElement(&pipewire, &start) + if err != nil { + return err + } + a.PipeWire = &pipewire + return nil } return nil } diff --git a/vendor/libvirt.org/go/libvirtxml/network.go b/vendor/libvirt.org/go/libvirtxml/network.go index a5039e859b..365eb5c242 100644 --- a/vendor/libvirt.org/go/libvirtxml/network.go +++ b/vendor/libvirt.org/go/libvirtxml/network.go @@ -111,7 +111,8 @@ type NetworkForward struct { } type NetworkForwardDriver struct { - Name string `xml:"name,attr"` + Name string `xml:"name,attr,omitempty"` + Model string `xml:"model,attr,omitempty"` } type NetworkForwardPF struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 16c926faef..d6fb308437 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1333,7 +1333,7 @@ k8s.io/utils/integer k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/strings/slices -# libvirt.org/go/libvirtxml v1.9008.0 +# libvirt.org/go/libvirtxml v1.10000.0 ## explicit; go 1.11 libvirt.org/go/libvirtxml # sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd