File Revert-vendor-update-the-dependecies.patch of Package kubevirt.40366
From d77e0421f8dafe36c72c26bf9622d9c319a87df5 Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@suse.com>
Date: Wed, 9 Jul 2025 16:25:35 -0600
Subject: [PATCH 3/3] Revert "vendor: update the dependecies"
From: Jim Fehlig <jfehlig@suse.com>
This reverts commit 54d25df2c729ae4a866a9a91d9c80cd61f5efef8.
References: bsc#1244548
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---
go.mod | 4 +-
go.sum | 8 +-
vendor/libvirt.org/go/libvirt/connect.go | 89 ++-----
vendor/libvirt.org/go/libvirt/domain.go | 246 +++++++-----------
.../go/libvirt/libvirt_generated_macros.h | 10 +-
vendor/libvirt.org/go/libvirt/lxc.go | 11 +-
vendor/libvirt.org/go/libvirt/qemu.go | 12 +-
vendor/libvirt.org/go/libvirt/secret.go | 11 +-
vendor/libvirt.org/go/libvirt/stream.go | 21 +-
vendor/libvirt.org/go/libvirtxml/domain.go | 41 +--
.../go/libvirtxml/domain_capabilities.go | 16 --
vendor/modules.txt | 4 +-
12 files changed, 144 insertions(+), 329 deletions(-)
diff --git a/go.mod b/go.mod
index f95020ee6d..0b4c4cf477 100644
--- a/go.mod
+++ b/go.mod
@@ -80,8 +80,8 @@ require (
kubevirt.io/client-go v0.0.0-00010101000000-000000000000
kubevirt.io/containerized-data-importer-api v1.58.0
kubevirt.io/qe-tools v0.1.8
- libvirt.org/go/libvirt v1.10009.1
- libvirt.org/go/libvirtxml v1.10009.0
+ libvirt.org/go/libvirt v1.10005.0
+ libvirt.org/go/libvirtxml v1.10005.0
mvdan.cc/sh/v3 v3.8.0
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
sigs.k8s.io/yaml v1.4.0
diff --git a/go.sum b/go.sum
index 660d7c499e..c25f6676dc 100644
--- a/go.sum
+++ b/go.sum
@@ -3505,10 +3505,10 @@ kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90/go.mod h1:018lASpFYBsYN6XwmA2TIrPCx6e0gviTd/ZNtSitKgc=
kubevirt.io/qe-tools v0.1.8 h1:Ar7qicmzHdd+Ia+6rjHDg3D7GReIyq7QFXoC4F7TjhQ=
kubevirt.io/qe-tools v0.1.8/go.mod h1:+Tr/WZGHIDQa/4pQgzM7+4J6YeVbUWAXESXtL2/zxqc=
-libvirt.org/go/libvirt v1.10009.1 h1:Z79EnxEVE190MeULGoq1GY0tb+O18FpYzUNYDHgkrN8=
-libvirt.org/go/libvirt v1.10009.1/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ=
-libvirt.org/go/libvirtxml v1.10009.0 h1:y60vA65jOAZSJedRoil1s2myVIy0NOfz0E6zhmYiN2g=
-libvirt.org/go/libvirtxml v1.10009.0/go.mod h1:7Oq2BLDstLr/XtoQD8Fr3mfDNrzlI3utYKySXF2xkng=
+libvirt.org/go/libvirt v1.10005.0 h1:KQv+SZNQvHJOG7B34TI2hyKnKW6hpXTEJFHUerYuGNI=
+libvirt.org/go/libvirt v1.10005.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ=
+libvirt.org/go/libvirtxml v1.10005.0 h1:bKv2wYaEunDdvE4mqO+vG0bp/iIeO0mI7A+0MfilNxw=
+libvirt.org/go/libvirtxml v1.10005.0/go.mod h1:7Oq2BLDstLr/XtoQD8Fr3mfDNrzlI3utYKySXF2xkng=
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
diff --git a/vendor/libvirt.org/go/libvirt/connect.go b/vendor/libvirt.org/go/libvirt/connect.go
index 7b0b73c177..b44fa89f8c 100644
--- a/vendor/libvirt.org/go/libvirt/connect.go
+++ b/vendor/libvirt.org/go/libvirt/connect.go
@@ -396,29 +396,23 @@ func connectAuthCallback(ccredlist C.virConnectCredentialPtr, ncred C.uint, call
// See also https://libvirt.org/html/libvirt-libvirt-host.html#virConnectOpenAuth
func NewConnectWithAuth(uri string, auth *ConnectAuth, flags ConnectFlags) (*Connect, error) {
var cUri *C.char
- var err C.virError
- var ptr C.virConnectPtr
+
+ ccredtype := make([]C.int, len(auth.CredType))
+
+ for i := 0; i < len(auth.CredType); i++ {
+ ccredtype[i] = C.int(auth.CredType[i])
+ }
if uri != "" {
cUri = C.CString(uri)
defer C.free(unsafe.Pointer(cUri))
}
- if auth == nil || len(auth.CredType) == 0 {
- ptr = C.virConnectOpenAuthWrapper(cUri, nil, C.uint(flags), &err)
- } else {
- ccredtype := make([]C.int, len(auth.CredType))
-
- for i := 0; i < len(auth.CredType); i++ {
- ccredtype[i] = C.int(auth.CredType[i])
- }
-
- callbackID := registerCallbackId(auth.Callback)
-
- ptr = C.virConnectOpenAuthHelper(cUri, &ccredtype[0], C.uint(len(auth.CredType)), C.int(callbackID), C.uint(flags), &err)
- freeCallbackId(callbackID)
- }
+ callbackID := registerCallbackId(auth.Callback)
+ var err C.virError
+ ptr := C.virConnectOpenAuthHelper(cUri, &ccredtype[0], C.uint(len(auth.CredType)), C.int(callbackID), C.uint(flags), &err)
+ freeCallbackId(callbackID)
if ptr == nil {
return nil, makeError(&err)
}
@@ -967,17 +961,12 @@ func (c *Connect) DomainCreateXML(xmlConfig string, flags DomainCreateFlags) (*D
func (c *Connect) DomainCreateXMLWithFiles(xmlConfig string, files []os.File, flags DomainCreateFlags) (*Domain, error) {
cXml := C.CString(string(xmlConfig))
defer C.free(unsafe.Pointer(cXml))
- nfiles := len(files)
- cfiles := make([]C.int, nfiles)
- for i := 0; i < nfiles; i++ {
+ cfiles := make([]C.int, len(files))
+ for i := 0; i < len(files); i++ {
cfiles[i] = C.int(files[i].Fd())
}
var err C.virError
- var cfilesPtr *C.int = nil
- if nfiles > 0 {
- cfilesPtr = &cfiles[0]
- }
- ptr := C.virDomainCreateXMLWithFilesWrapper(c.ptr, cXml, C.uint(nfiles), cfilesPtr, C.uint(flags), &err)
+ ptr := C.virDomainCreateXMLWithFilesWrapper(c.ptr, cXml, C.uint(len(files)), (&cfiles[0]), C.uint(flags), &err)
if ptr == nil {
return nil, makeError(&err)
}
@@ -1852,9 +1841,8 @@ func (c *Connect) InterfaceChangeRollback(flags uint32) error {
// See also https://libvirt.org/html/libvirt-libvirt-host.html#virNodeAllocPages
func (c *Connect) AllocPages(pageSizes map[int]int64, startCell int, cellCount uint, flags NodeAllocPagesFlags) (int, error) {
- npageSizes := len(pageSizes)
- cpages := make([]C.uint, npageSizes)
- ccounts := make([]C.ulonglong, npageSizes)
+ cpages := make([]C.uint, len(pageSizes))
+ ccounts := make([]C.ulonglong, len(pageSizes))
i := 0
for key, val := range pageSizes {
@@ -1864,14 +1852,8 @@ func (c *Connect) AllocPages(pageSizes map[int]int64, startCell int, cellCount u
}
var err C.virError
- var cpagesPtr *C.uint = nil
- var ccountsPtr *C.ulonglong = nil
- if npageSizes > 0 {
- cpagesPtr = &cpages[0]
- ccountsPtr = &ccounts[0]
- }
- ret := C.virNodeAllocPagesWrapper(c.ptr, C.uint(len(pageSizes)), cpagesPtr, ccountsPtr,
- C.int(startCell), C.uint(cellCount), C.uint(flags), &err)
+ ret := C.virNodeAllocPagesWrapper(c.ptr, C.uint(len(pageSizes)), (*C.uint)(unsafe.Pointer(&cpages[0])),
+ (*C.ulonglong)(unsafe.Pointer(&ccounts[0])), C.int(startCell), C.uint(cellCount), C.uint(flags), &err)
if ret == -1 {
return 0, makeError(&err)
}
@@ -1993,23 +1975,16 @@ func (c *Connect) GetFreeMemory() (uint64, error) {
// See also https://libvirt.org/html/libvirt-libvirt-host.html#virNodeGetFreePages
func (c *Connect) GetFreePages(pageSizes []uint64, startCell int, maxCells uint, flags uint32) ([]uint64, error) {
- npageSizes := len(pageSizes)
- cpageSizes := make([]C.uint, npageSizes)
- ccounts := make([]C.ulonglong, npageSizes*int(maxCells))
+ cpageSizes := make([]C.uint, len(pageSizes))
+ ccounts := make([]C.ulonglong, len(pageSizes)*int(maxCells))
for i := 0; i < len(pageSizes); i++ {
cpageSizes[i] = C.uint(pageSizes[i])
}
var err C.virError
- var cpageSizesPtr *C.uint = nil
- var ccountsPtr *C.ulonglong = nil
- if npageSizes > 0 {
- cpageSizesPtr = &cpageSizes[0]
- ccountsPtr = &ccounts[0]
- }
- ret := C.virNodeGetFreePagesWrapper(c.ptr, C.uint(len(pageSizes)), cpageSizesPtr, C.int(startCell),
- C.uint(maxCells), ccountsPtr, C.uint(flags), &err)
+ ret := C.virNodeGetFreePagesWrapper(c.ptr, C.uint(len(pageSizes)), (*C.uint)(unsafe.Pointer(&cpageSizes[0])), C.int(startCell),
+ C.uint(maxCells), (*C.ulonglong)(unsafe.Pointer(&ccounts[0])), C.uint(flags), &err)
if ret == -1 {
return []uint64{}, makeError(&err)
}
@@ -2242,19 +2217,14 @@ func (c *Connect) DomainSaveImageGetXMLDesc(file string, flags DomainSaveImageXM
// See also https://libvirt.org/html/libvirt-libvirt-host.html#virConnectBaselineCPU
func (c *Connect) BaselineCPU(xmlCPUs []string, flags ConnectBaselineCPUFlags) (string, error) {
- nxmlCPUs := len(xmlCPUs)
- cxmlCPUs := make([]*C.char, nxmlCPUs)
- for i := 0; i < nxmlCPUs; i++ {
+ cxmlCPUs := make([]*C.char, len(xmlCPUs))
+ for i := 0; i < len(xmlCPUs); i++ {
cxmlCPUs[i] = C.CString(xmlCPUs[i])
defer C.free(unsafe.Pointer(cxmlCPUs[i]))
}
var err C.virError
- var cxmlCPUsPtr **C.char = nil
- if nxmlCPUs > 0 {
- cxmlCPUsPtr = &cxmlCPUs[0]
- }
- ret := C.virConnectBaselineCPUWrapper(c.ptr, cxmlCPUsPtr, C.uint(nxmlCPUs), C.uint(flags), &err)
+ ret := C.virConnectBaselineCPUWrapper(c.ptr, &cxmlCPUs[0], C.uint(len(xmlCPUs)), C.uint(flags), &err)
if ret == nil {
return "", makeError(&err)
}
@@ -2283,20 +2253,15 @@ func (c *Connect) BaselineHypervisorCPU(emulator string, arch string, machine st
cvirttype = C.CString(virttype)
defer C.free(unsafe.Pointer(cvirttype))
}
- nxmlCPUs := len(xmlCPUs)
- cxmlCPUs := make([]*C.char, nxmlCPUs)
- for i := 0; i < nxmlCPUs; i++ {
+ cxmlCPUs := make([]*C.char, len(xmlCPUs))
+ for i := 0; i < len(xmlCPUs); i++ {
cxmlCPUs[i] = C.CString(xmlCPUs[i])
defer C.free(unsafe.Pointer(cxmlCPUs[i]))
}
var err C.virError
- var cxmlCPUsPtr **C.char = nil
- if nxmlCPUs > 0 {
- cxmlCPUsPtr = &cxmlCPUs[0]
- }
ret := C.virConnectBaselineHypervisorCPUWrapper(c.ptr, cemulator, carch, cmachine, cvirttype,
- cxmlCPUsPtr, C.uint(len(xmlCPUs)), C.uint(flags), &err)
+ &cxmlCPUs[0], C.uint(len(xmlCPUs)), C.uint(flags), &err)
if ret == nil {
return "", makeError(&err)
}
diff --git a/vendor/libvirt.org/go/libvirt/domain.go b/vendor/libvirt.org/go/libvirt/domain.go
index 11a3fb1433..e225a4a68f 100644
--- a/vendor/libvirt.org/go/libvirt/domain.go
+++ b/vendor/libvirt.org/go/libvirt/domain.go
@@ -1061,18 +1061,12 @@ func (d *Domain) CreateWithFlags(flags DomainCreateFlags) error {
// See also https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithFiles
func (d *Domain) CreateWithFiles(files []os.File, flags DomainCreateFlags) error {
- nfiles := len(files)
- cfiles := make([]C.int, nfiles)
- for i := 0; i < nfiles; i++ {
+ cfiles := make([]C.int, len(files))
+ for i := 0; i < len(files); i++ {
cfiles[i] = C.int(files[i].Fd())
}
-
var err C.virError
- var cfilesPtr *C.int = nil
- if nfiles > 0 {
- cfilesPtr = &cfiles[0]
- }
- result := C.virDomainCreateWithFilesWrapper(d.ptr, C.uint(nfiles), cfilesPtr, C.uint(flags), &err)
+ result := C.virDomainCreateWithFilesWrapper(d.ptr, C.uint(len(files)), &cfiles[0], C.uint(flags), &err)
if result == -1 {
return makeError(&err)
}
@@ -1744,17 +1738,7 @@ func (d *Domain) Screenshot(stream *Stream, screen, flags uint32) (string, error
// See also https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSendKey
func (d *Domain) SendKey(codeset, holdtime uint, keycodes []uint, flags uint32) error {
var err C.virError
- nkeycodes := len(keycodes)
- ckeycodes := make([]C.uint, nkeycodes)
- for i, keycode := range keycodes {
- ckeycodes[i] = C.uint(keycode)
- }
-
- var ckeycodesPtr *C.uint = nil
- if nkeycodes > 0 {
- ckeycodesPtr = &ckeycodes[0]
- }
- result := C.virDomainSendKeyWrapper(d.ptr, C.uint(codeset), C.uint(holdtime), ckeycodesPtr, C.int(nkeycodes), C.uint(flags), &err)
+ result := C.virDomainSendKeyWrapper(d.ptr, C.uint(codeset), C.uint(holdtime), (*C.uint)(unsafe.Pointer(&keycodes[0])), C.int(len(keycodes)), C.uint(flags), &err)
if result == -1 {
return makeError(&err)
}
@@ -1939,14 +1923,12 @@ func (d *Domain) InterfaceStats(path string) (*DomainInterfaceStats, error) {
// See also https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats
func (d *Domain) MemoryStats(nrStats uint32, flags uint32) ([]DomainMemoryStat, error) {
- cstats := make([]C.virDomainMemoryStatStruct, nrStats)
+ ptr := make([]C.virDomainMemoryStatStruct, nrStats)
var err C.virError
- var cstatsPtr *C.virDomainMemoryStatStruct = nil
- if nrStats > 0 {
- cstatsPtr = &cstats[0]
- }
- result := C.virDomainMemoryStatsWrapper(d.ptr, cstatsPtr, C.uint(nrStats), C.uint(flags), &err)
+ result := C.virDomainMemoryStatsWrapper(
+ d.ptr, (C.virDomainMemoryStatPtr)(unsafe.Pointer(&ptr[0])),
+ C.uint(nrStats), C.uint(flags), &err)
if result == -1 {
return []DomainMemoryStat{}, makeError(&err)
@@ -1955,8 +1937,8 @@ func (d *Domain) MemoryStats(nrStats uint32, flags uint32) ([]DomainMemoryStat,
out := make([]DomainMemoryStat, 0)
for i := 0; i < int(result); i++ {
out = append(out, DomainMemoryStat{
- Tag: int32(cstats[i].tag),
- Val: uint64(cstats[i].val),
+ Tag: int32(ptr[i].tag),
+ Val: uint64(ptr[i].val),
})
}
return out, nil
@@ -2057,11 +2039,7 @@ func (d *Domain) PinVcpu(vcpu uint, cpuMap []bool) error {
}
var err C.virError
- var ccpumapPtr *C.uchar = nil
- if maplen > 0 {
- ccpumapPtr = &ccpumap[0]
- }
- result := C.virDomainPinVcpuWrapper(d.ptr, C.uint(vcpu), ccpumapPtr, C.int(maplen), &err)
+ result := C.virDomainPinVcpuWrapper(d.ptr, C.uint(vcpu), &ccpumap[0], C.int(maplen), &err)
if result == -1 {
return makeError(&err)
@@ -2083,11 +2061,7 @@ func (d *Domain) PinVcpuFlags(vcpu uint, cpuMap []bool, flags DomainModification
}
var err C.virError
- var ccpumapPtr *C.uchar = nil
- if maplen > 0 {
- ccpumapPtr = &ccpumap[0]
- }
- result := C.virDomainPinVcpuFlagsWrapper(d.ptr, C.uint(vcpu), ccpumapPtr, C.int(maplen), C.uint(flags), &err)
+ result := C.virDomainPinVcpuFlagsWrapper(d.ptr, C.uint(vcpu), &ccpumap[0], C.int(maplen), C.uint(flags), &err)
if result == -1 {
return makeError(&err)
@@ -2399,12 +2373,8 @@ func (d *Domain) BlockPeek(disk string, offset uint64, size uint64, flags uint32
defer C.free(unsafe.Pointer(cdisk))
data := make([]byte, size)
var err C.virError
-
- var dataPtr unsafe.Pointer = nil
- if size > 0 {
- dataPtr = unsafe.Pointer(&data[0])
- }
- ret := C.virDomainBlockPeekWrapper(d.ptr, cdisk, C.ulonglong(offset), C.size_t(size), dataPtr, C.uint(flags), &err)
+ ret := C.virDomainBlockPeekWrapper(d.ptr, cdisk, C.ulonglong(offset), C.size_t(size),
+ unsafe.Pointer(&data[0]), C.uint(flags), &err)
if ret == -1 {
return []byte{}, makeError(&err)
}
@@ -2416,12 +2386,8 @@ func (d *Domain) BlockPeek(disk string, offset uint64, size uint64, flags uint32
func (d *Domain) MemoryPeek(start uint64, size uint64, flags DomainMemoryFlags) ([]byte, error) {
data := make([]byte, size)
var err C.virError
-
- var dataPtr unsafe.Pointer = nil
- if size > 0 {
- dataPtr = unsafe.Pointer(&data[0])
- }
- ret := C.virDomainMemoryPeekWrapper(d.ptr, C.ulonglong(start), C.size_t(size), dataPtr, C.uint(flags), &err)
+ ret := C.virDomainMemoryPeekWrapper(d.ptr, C.ulonglong(start), C.size_t(size),
+ unsafe.Pointer(&data[0]), C.uint(flags), &err)
if ret == -1 {
return []byte{}, makeError(&err)
}
@@ -2483,51 +2449,48 @@ func (d *Domain) Migrate2(dconn *Connect, dxml string, flags DomainMigrateFlags,
}
type DomainMigrateParameters struct {
- URISet bool
- URI string
- DestNameSet bool
- DestName string
- DestXMLSet bool
- DestXML string
- PersistXMLSet bool
- PersistXML string
- BandwidthSet bool
- Bandwidth uint64
- GraphicsURISet bool
- GraphicsURI string
- ListenAddressSet bool
- ListenAddress string
- MigrateDisksSet bool
- MigrateDisks []string
- DisksPortSet bool
- DisksPort int
- CompressionSet bool
- Compression string
- CompressionMTLevelSet bool
- CompressionMTLevel int
- CompressionMTThreadsSet bool
- CompressionMTThreads int
- CompressionMTDThreadsSet bool
- CompressionMTDThreads int
- CompressionXBZRLECacheSet bool
- CompressionXBZRLECache uint64
- AutoConvergeInitialSet bool
- AutoConvergeInitial int
- AutoConvergeIncrementSet bool
- AutoConvergeIncrement int
- ParallelConnectionsSet bool
- ParallelConnections int
- TLSDestinationSet bool
- TLSDestination string
- DisksURISet bool
- DisksURI string
- CompressionZlibLevelSet bool
- CompressionZlibLevel int
- CompressionZstdLevelSet bool
- CompressionZstdLevel int
- MigrateDisksDetectZeroesSet bool
- MigrateDisksDetectZeroes bool // Deprecated: wrong type & unused. Delete in v2.nnn
- MigrateDisksDetectZeroesList []string
+ URISet bool
+ URI string
+ DestNameSet bool
+ DestName string
+ DestXMLSet bool
+ DestXML string
+ PersistXMLSet bool
+ PersistXML string
+ BandwidthSet bool
+ Bandwidth uint64
+ GraphicsURISet bool
+ GraphicsURI string
+ ListenAddressSet bool
+ ListenAddress string
+ MigrateDisksSet bool
+ MigrateDisks []string
+ DisksPortSet bool
+ DisksPort int
+ CompressionSet bool
+ Compression string
+ CompressionMTLevelSet bool
+ CompressionMTLevel int
+ CompressionMTThreadsSet bool
+ CompressionMTThreads int
+ CompressionMTDThreadsSet bool
+ CompressionMTDThreads int
+ CompressionXBZRLECacheSet bool
+ CompressionXBZRLECache uint64
+ AutoConvergeInitialSet bool
+ AutoConvergeInitial int
+ AutoConvergeIncrementSet bool
+ AutoConvergeIncrement int
+ ParallelConnectionsSet bool
+ ParallelConnections int
+ TLSDestinationSet bool
+ TLSDestination string
+ DisksURISet bool
+ DisksURI string
+ CompressionZlibLevelSet bool
+ CompressionZlibLevel int
+ CompressionZstdLevelSet bool
+ CompressionZstdLevel int
}
func getMigrateParameterFieldInfo(params *DomainMigrateParameters) map[string]typedParamsFieldInfo {
@@ -2620,10 +2583,6 @@ func getMigrateParameterFieldInfo(params *DomainMigrateParameters) map[string]ty
set: ¶ms.CompressionZstdLevelSet,
i: ¶ms.CompressionZstdLevel,
},
- C.VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES: typedParamsFieldInfo{
- set: ¶ms.MigrateDisksDetectZeroesSet,
- sl: ¶ms.MigrateDisksDetectZeroesList,
- },
}
}
@@ -3148,12 +3107,8 @@ func (d *Domain) GetDiskErrors(flags uint32) ([]DomainDiskError, error) {
maxerrors := ret
cerrors := make([]C.virDomainDiskError, maxerrors)
- var cerrorsPtr *C.virDomainDiskError = nil
- if maxerrors > 0 {
- cerrorsPtr = &cerrors[0]
- }
- ret = C.virDomainGetDiskErrorsWrapper(d.ptr, cerrorsPtr, C.uint(maxerrors), C.uint(flags), &err)
+ ret = C.virDomainGetDiskErrorsWrapper(d.ptr, (*C.virDomainDiskError)(unsafe.Pointer(&cerrors[0])), C.uint(maxerrors), C.uint(flags), &err)
if ret == -1 {
return []DomainDiskError{}, makeError(&err)
}
@@ -3256,8 +3211,6 @@ type DomainJobInfo struct {
DiskTempTotal uint64
ErrorMessageSet bool
ErrorMessage string
- VFIODataTransferredSet bool
- VFIODataTransferred uint64
}
// See also https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetJobInfo
@@ -3439,10 +3392,6 @@ func getDomainJobInfoFieldInfo(params *DomainJobInfo) map[string]typedParamsFiel
set: ¶ms.ErrorMessageSet,
s: ¶ms.ErrorMessage,
},
- C.VIR_DOMAIN_JOB_VFIO_DATA_TRANSFERRED: typedParamsFieldInfo{
- set: ¶ms.VFIODataTransferredSet,
- ul: ¶ms.VFIODataTransferred,
- },
}
}
@@ -4248,20 +4197,19 @@ func (d *Domain) HasCurrentSnapshot(flags uint32) (bool, error) {
func (d *Domain) FSFreeze(mounts []string, flags uint32) error {
var err C.virError
var ret C.int
- nmounts := len(mounts)
- cmounts := make([](*C.char), nmounts)
+ if len(mounts) == 0 {
+ ret = C.virDomainFSFreezeWrapper(d.ptr, nil, 0, C.uint(flags), &err)
+ } else {
+ cmounts := make([](*C.char), len(mounts))
- for i := 0; i < nmounts; i++ {
- cmounts[i] = C.CString(mounts[i])
- defer C.free(unsafe.Pointer(cmounts[i]))
- }
+ for i := 0; i < len(mounts); i++ {
+ cmounts[i] = C.CString(mounts[i])
+ defer C.free(unsafe.Pointer(cmounts[i]))
+ }
- var cmountsPtr **C.char = nil
- if nmounts > 0 {
- cmountsPtr = &cmounts[0]
+ nmounts := len(mounts)
+ ret = C.virDomainFSFreezeWrapper(d.ptr, (**C.char)(unsafe.Pointer(&cmounts[0])), C.uint(nmounts), C.uint(flags), &err)
}
-
- ret = C.virDomainFSFreezeWrapper(d.ptr, cmountsPtr, C.uint(nmounts), C.uint(flags), &err)
if ret == -1 {
return makeError(&err)
}
@@ -4273,21 +4221,19 @@ func (d *Domain) FSFreeze(mounts []string, flags uint32) error {
func (d *Domain) FSThaw(mounts []string, flags uint32) error {
var err C.virError
var ret C.int
- nmounts := len(mounts)
-
- cmounts := make([](*C.char), nmounts)
-
- for i := 0; i < nmounts; i++ {
- cmounts[i] = C.CString(mounts[i])
- defer C.free(unsafe.Pointer(cmounts[i]))
+ if len(mounts) == 0 {
+ ret = C.virDomainFSThawWrapper(d.ptr, nil, 0, C.uint(flags), &err)
+ } else {
+ cmounts := make([](*C.char), len(mounts))
+
+ for i := 0; i < len(mounts); i++ {
+ cmounts[i] = C.CString(mounts[i])
+ defer C.free(unsafe.Pointer(cmounts[i]))
+ }
+
+ nmounts := len(mounts)
+ ret = C.virDomainFSThawWrapper(d.ptr, (**C.char)(unsafe.Pointer(&cmounts[0])), C.uint(nmounts), C.uint(flags), &err)
}
-
- var cmountsPtr **C.char = nil
- if nmounts > 0 {
- cmountsPtr = &cmounts[0]
- }
-
- ret = C.virDomainFSThawWrapper(d.ptr, cmountsPtr, C.uint(nmounts), C.uint(flags), &err)
if ret == -1 {
return makeError(&err)
}
@@ -4589,11 +4535,7 @@ func (d *Domain) PinEmulator(cpumap []bool, flags DomainModificationImpact) erro
}
var err C.virError
- var ccpumapPtr *C.uchar = nil
- if maplen > 0 {
- ccpumapPtr = &ccpumaps[0]
- }
- ret := C.virDomainPinEmulatorWrapper(d.ptr, ccpumapPtr, C.int(maplen), C.uint(flags), &err)
+ ret := C.virDomainPinEmulatorWrapper(d.ptr, &ccpumaps[0], C.int(maplen), C.uint(flags), &err)
if ret == -1 {
return makeError(&err)
}
@@ -4615,11 +4557,7 @@ func (d *Domain) PinIOThread(iothreadid uint, cpumap []bool, flags DomainModific
}
var err C.virError
- var ccpumapPtr *C.uchar = nil
- if maplen > 0 {
- ccpumapPtr = &ccpumaps[0]
- }
- ret := C.virDomainPinIOThreadWrapper(d.ptr, C.uint(iothreadid), ccpumapPtr, C.int(maplen), C.uint(flags), &err)
+ ret := C.virDomainPinIOThreadWrapper(d.ptr, C.uint(iothreadid), &ccpumaps[0], C.int(maplen), C.uint(flags), &err)
if ret == -1 {
return makeError(&err)
}
@@ -5743,13 +5681,8 @@ func (d *Domain) AuthorizedSSHKeysSet(user string, keys []string, flags DomainAu
}
nkeys := len(keys)
- var cKeysPtr **C.char = nil
- if nkeys > 0 {
- cKeysPtr = (**C.char)(unsafe.Pointer(&ckeys[0]))
- }
-
var err C.virError
- ret := C.virDomainAuthorizedSSHKeysSetWrapper(d.ptr, cuser, cKeysPtr, C.uint(nkeys), C.uint(flags), &err)
+ ret := C.virDomainAuthorizedSSHKeysSetWrapper(d.ptr, cuser, (**C.char)(unsafe.Pointer(&ckeys[0])), C.uint(nkeys), C.uint(flags), &err)
if ret == -1 {
return makeError(&err)
}
@@ -5789,19 +5722,14 @@ func (d *Domain) StartDirtyRateCalc(secs int, flags DomainDirtyRateCalcFlags) er
}
func (d *Domain) FDAssociate(name string, files []os.File, flags DomainFDAssociateFlags) error {
- nfiles := len(files)
- cfiles := make([]C.int, nfiles)
- for i := 0; i < nfiles; i++ {
+ cfiles := make([]C.int, len(files))
+ for i := 0; i < len(files); i++ {
cfiles[i] = C.int(files[i].Fd())
}
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
var err C.virError
- var cfilesPtr *C.int = nil
- if nfiles > 0 {
- cfilesPtr = &cfiles[0]
- }
- result := C.virDomainFDAssociateWrapper(d.ptr, cname, C.uint(nfiles), cfilesPtr, C.uint(flags), &err)
+ result := C.virDomainFDAssociateWrapper(d.ptr, cname, C.uint(len(files)), &cfiles[0], C.uint(flags), &err)
if result == -1 {
return makeError(&err)
}
diff --git a/vendor/libvirt.org/go/libvirt/libvirt_generated_macros.h b/vendor/libvirt.org/go/libvirt/libvirt_generated_macros.h
index 531a468799..2b3107aeca 100644
--- a/vendor/libvirt.org/go/libvirt/libvirt_generated_macros.h
+++ b/vendor/libvirt.org/go/libvirt/libvirt_generated_macros.h
@@ -29,7 +29,7 @@
#pragma once
#if !LIBVIR_CHECK_VERSION(0, 0, 1)
-# define LIBVIR_VERSION_NUMBER 10009000
+# define LIBVIR_VERSION_NUMBER 10005000
#endif
#if !LIBVIR_CHECK_VERSION(5, 8, 0)
@@ -432,10 +432,6 @@
# define VIR_DOMAIN_JOB_TIME_REMAINING "time_remaining"
#endif
-#if !LIBVIR_CHECK_VERSION(10, 6, 0)
-# define VIR_DOMAIN_JOB_VFIO_DATA_TRANSFERRED "vfio_data_transferred"
-#endif
-
#if !LIBVIR_CHECK_VERSION(8, 0, 0)
# define VIR_DOMAIN_LAUNCH_SECURITY_SEV_API_MAJOR "sev-api-major"
#endif
@@ -784,10 +780,6 @@
# define VIR_MIGRATE_PARAM_MIGRATE_DISKS "migrate_disks"
#endif
-#if !LIBVIR_CHECK_VERSION(10, 9, 0)
-# define VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES "migrate_disks_detect_zeroes"
-#endif
-
#if !LIBVIR_CHECK_VERSION(5, 2, 0)
# define VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS "parallel.connections"
#endif
diff --git a/vendor/libvirt.org/go/libvirt/lxc.go b/vendor/libvirt.org/go/libvirt/lxc.go
index d3af3f5dc8..4c86adfd9a 100644
--- a/vendor/libvirt.org/go/libvirt/lxc.go
+++ b/vendor/libvirt.org/go/libvirt/lxc.go
@@ -68,18 +68,13 @@ func (d *Domain) LxcOpenNamespace(flags uint32) ([]os.File, error) {
func (d *Domain) LxcEnterNamespace(fdlist []os.File, flags uint32) ([]os.File, error) {
var coldfdlist *C.int
var ncoldfdlist C.uint
- nfdlist := len(fdlist)
- cfdlist := make([]C.int, nfdlist)
- for i := 0; i < nfdlist; i++ {
+ cfdlist := make([]C.int, len(fdlist))
+ for i := 0; i < len(fdlist); i++ {
cfdlist[i] = C.int(fdlist[i].Fd())
}
var err C.virError
- var cfdlistPtr *C.int = nil
- if nfdlist > 0 {
- cfdlistPtr = &cfdlist[0]
- }
- ret := C.virDomainLxcEnterNamespaceWrapper(d.ptr, C.uint(nfdlist), cfdlistPtr, &ncoldfdlist, &coldfdlist, C.uint(flags), &err)
+ ret := C.virDomainLxcEnterNamespaceWrapper(d.ptr, C.uint(len(fdlist)), &cfdlist[0], &ncoldfdlist, &coldfdlist, C.uint(flags), &err)
if ret == -1 {
return []os.File{}, makeError(&err)
}
diff --git a/vendor/libvirt.org/go/libvirt/qemu.go b/vendor/libvirt.org/go/libvirt/qemu.go
index 37c5aa04a1..d83e517150 100644
--- a/vendor/libvirt.org/go/libvirt/qemu.go
+++ b/vendor/libvirt.org/go/libvirt/qemu.go
@@ -100,9 +100,9 @@ func (d *Domain) QemuMonitorCommand(command string, flags DomainQemuMonitorComma
// See also https://libvirt.org/html/libvirt-libvirt-qemu.html#virDomainQemuMonitorCommandWithFiles
func (d *Domain) QemuMonitorCommandWithFiles(command string, infiles []os.File, flags DomainQemuMonitorCommandFlags) (string, []*os.File, error) {
- ninfiles := len(infiles)
- cinfiles := make([]C.int, ninfiles)
- for i := 0; i < ninfiles; i++ {
+ cninfiles := C.uint(len(infiles))
+ cinfiles := make([]C.int, len(infiles))
+ for i := 0; i < len(infiles); i++ {
cinfiles[i] = C.int(infiles[i].Fd())
}
cCommand := C.CString(command)
@@ -112,12 +112,8 @@ func (d *Domain) QemuMonitorCommandWithFiles(command string, infiles []os.File,
var cnoutfiles C.uint
var coutfiles *C.int
var err C.virError
- var cinfilesPtr *C.int = nil
- if ninfiles > 0 {
- cinfilesPtr = &cinfiles[0]
- }
result := C.virDomainQemuMonitorCommandWithFilesWrapper(d.ptr, cCommand,
- C.uint(ninfiles), cinfilesPtr, &cnoutfiles, &coutfiles,
+ cninfiles, &cinfiles[0], &cnoutfiles, &coutfiles,
&cResult, C.uint(flags), &err)
if result != 0 {
diff --git a/vendor/libvirt.org/go/libvirt/secret.go b/vendor/libvirt.org/go/libvirt/secret.go
index 1a006c1c6d..ac5a13a0fd 100644
--- a/vendor/libvirt.org/go/libvirt/secret.go
+++ b/vendor/libvirt.org/go/libvirt/secret.go
@@ -176,19 +176,14 @@ func (s *Secret) GetValue(flags uint32) ([]byte, error) {
// See also https://libvirt.org/html/libvirt-libvirt-secret.html#virSecretSetValue
func (s *Secret) SetValue(value []byte, flags uint32) error {
- nvalue := len(value)
- cvalue := make([]C.uchar, nvalue)
+ cvalue := make([]C.uchar, len(value))
- for i := 0; i < nvalue; i++ {
+ for i := 0; i < len(value); i++ {
cvalue[i] = C.uchar(value[i])
}
var err C.virError
- var cvaluePtr *C.uchar = nil
- if nvalue > 0 {
- cvaluePtr = &cvalue[0]
- }
- result := C.virSecretSetValueWrapper(s.ptr, cvaluePtr, C.size_t(nvalue), C.uint(flags), &err)
+ result := C.virSecretSetValueWrapper(s.ptr, &cvalue[0], C.size_t(len(value)), C.uint(flags), &err)
if result == -1 {
return makeError(&err)
diff --git a/vendor/libvirt.org/go/libvirt/stream.go b/vendor/libvirt.org/go/libvirt/stream.go
index c2e0869f49..f15dae9ba5 100644
--- a/vendor/libvirt.org/go/libvirt/stream.go
+++ b/vendor/libvirt.org/go/libvirt/stream.go
@@ -107,13 +107,8 @@ func (c *Stream) Ref() error {
// See also https://libvirt.org/html/libvirt-libvirt-stream.html#virStreamRecv
func (v *Stream) Recv(p []byte) (int, error) {
- np := len(p)
var err C.virError
- var pPtr *C.char = nil
- if np > 0 {
- pPtr = (*C.char)(unsafe.Pointer(&p[0]))
- }
- n := C.virStreamRecvWrapper(v.ptr, pPtr, C.size_t(np), &err)
+ n := C.virStreamRecvWrapper(v.ptr, (*C.char)(unsafe.Pointer(&p[0])), C.size_t(len(p)), &err)
if n < 0 {
return 0, makeError(&err)
}
@@ -126,13 +121,8 @@ func (v *Stream) Recv(p []byte) (int, error) {
// See also https://libvirt.org/html/libvirt-libvirt-stream.html#virStreamRecvFlags
func (v *Stream) RecvFlags(p []byte, flags StreamRecvFlagsValues) (int, error) {
- np := len(p)
var err C.virError
- var pPtr *C.char = nil
- if np > 0 {
- pPtr = (*C.char)(unsafe.Pointer(&p[0]))
- }
- n := C.virStreamRecvFlagsWrapper(v.ptr, pPtr, C.size_t(np), C.uint(flags), &err)
+ n := C.virStreamRecvFlagsWrapper(v.ptr, (*C.char)(unsafe.Pointer(&p[0])), C.size_t(len(p)), C.uint(flags), &err)
if n < 0 {
return 0, makeError(&err)
}
@@ -157,13 +147,8 @@ func (v *Stream) RecvHole(flags uint32) (int64, error) {
// See also https://libvirt.org/html/libvirt-libvirt-stream.html#virStreamSend
func (v *Stream) Send(p []byte) (int, error) {
- np := len(p)
var err C.virError
- var pPtr *C.char = nil
- if np > 0 {
- pPtr = (*C.char)(unsafe.Pointer(&p[0]))
- }
- n := C.virStreamSendWrapper(v.ptr, pPtr, C.size_t(np), &err)
+ n := C.virStreamSendWrapper(v.ptr, (*C.char)(unsafe.Pointer(&p[0])), C.size_t(len(p)), &err)
if n < 0 {
return 0, makeError(&err)
}
diff --git a/vendor/libvirt.org/go/libvirtxml/domain.go b/vendor/libvirt.org/go/libvirtxml/domain.go
index ccf3ca90d9..f3710dde9f 100644
--- a/vendor/libvirt.org/go/libvirtxml/domain.go
+++ b/vendor/libvirt.org/go/libvirtxml/domain.go
@@ -516,10 +516,6 @@ type DomainFilesystemBinaryThreadPool struct {
Size uint `xml:"size,attr,omitempty"`
}
-type DomainFilesystemBinaryOpenFiles struct {
- Max uint `xml:"max,attr,"`
-}
-
type DomainFilesystemBinary struct {
Path string `xml:"path,attr,omitempty"`
XAttr string `xml:"xattr,attr,omitempty"`
@@ -527,7 +523,6 @@ type DomainFilesystemBinary struct {
Sandbox *DomainFilesystemBinarySandbox `xml:"sandbox"`
Lock *DomainFilesystemBinaryLock `xml:"lock"`
ThreadPool *DomainFilesystemBinaryThreadPool `xml:"thread_pool"`
- OpenFiles *DomainFilesystemBinaryOpenFiles `xml:"openfiles"`
}
type DomainFilesystemIDMapEntry struct {
@@ -671,9 +666,9 @@ type DomainInterfaceSourceNull struct {
type DomainInterfaceSourceVDS struct {
SwitchID string `xml:"switchid,attr"`
- PortID int `xml:"portid,attr,omitempty"`
- PortGroupID string `xml:"portgroupid,attr,omitempty"`
- ConnectionID int `xml:"connectionid,attr,omitempty"`
+ PortID int `xml:"portid,attr"`
+ PortGroupID string `xml:"portgroupid,attr"`
+ ConnectionID int `xml:"connectionid,attr"`
}
type DomainInterfaceSourceLocal struct {
@@ -1989,12 +1984,11 @@ type DomainIOMMU struct {
}
type DomainIOMMUDriver struct {
- IntRemap string `xml:"intremap,attr,omitempty"`
- CachingMode string `xml:"caching_mode,attr,omitempty"`
- EIM string `xml:"eim,attr,omitempty"`
- IOTLB string `xml:"iotlb,attr,omitempty"`
- AWBits uint `xml:"aw_bits,attr,omitempty"`
- DMATranslation string `xml:"dma_translation,attr,omitempty"`
+ IntRemap string `xml:"intremap,attr,omitempty"`
+ CachingMode string `xml:"caching_mode,attr,omitempty"`
+ EIM string `xml:"eim,attr,omitempty"`
+ IOTLB string `xml:"iotlb,attr,omitempty"`
+ AWBits uint `xml:"aw_bits,attr,omitempty"`
}
type DomainNVRAM struct {
@@ -2056,7 +2050,6 @@ type DomainTPMBackendEmulator struct {
Version string `xml:"version,attr,omitempty"`
Encryption *DomainTPMBackendEncryption `xml:"encryption"`
PersistentState string `xml:"persistent_state,attr,omitempty"`
- Debug uint `xml:"debug,attr,omitempty"`
ActivePCRBanks *DomainTPMBackendPCRBanks `xml:"active_pcr_banks"`
}
@@ -2136,20 +2129,6 @@ type DomainCryptoBackendBuiltIn struct {
type DomainCryptoBackendLKCF struct {
}
-type DomainPStore struct {
- Backend string `xml:"backend,attr"`
- Path string `xml:"path"`
- Size DomainPStoreSize `xml:"size"`
- ACPI *DomainDeviceACPI `xml:"acpi"`
- Alias *DomainAlias `xml:"alias"`
- Address *DomainAddress `xml:"address"`
-}
-
-type DomainPStoreSize struct {
- Size uint64 `xml:",chardata"`
- Unit string `xml:"unit,attr"`
-}
-
type DomainDeviceList struct {
Emulator string `xml:"emulator,omitempty"`
Disks []DomainDisk `xml:"disk"`
@@ -2182,7 +2161,6 @@ type DomainDeviceList struct {
IOMMU *DomainIOMMU `xml:"iommu"`
VSock *DomainVSock `xml:"vsock"`
Crypto []DomainCrypto `xml:"crypto"`
- PStore *DomainPStore `xml:"pstore"`
}
type DomainMemory struct {
@@ -2589,8 +2567,6 @@ type DomainFeatureHyperV struct {
IPI *DomainFeatureState `xml:"ipi"`
EVMCS *DomainFeatureState `xml:"evmcs"`
AVIC *DomainFeatureState `xml:"avic"`
- EMSRBitmap *DomainFeatureState `xml:"emsr_bitmap"`
- XMMInput *DomainFeatureState `xml:"xmm_input"`
}
type DomainFeatureKVMDirtyRing struct {
@@ -2782,7 +2758,6 @@ type DomainFeatureList struct {
TCG *DomainFeatureTCG `xml:"tcg"`
AsyncTeardown *DomainFeatureAsyncTeardown `xml:"async-teardown"`
RAS *DomainFeatureState `xml:"ras"`
- PS2 *DomainFeatureState `xml:"ps2"`
}
type DomainCPUTuneShares struct {
diff --git a/vendor/libvirt.org/go/libvirtxml/domain_capabilities.go b/vendor/libvirt.org/go/libvirtxml/domain_capabilities.go
index 5b1cb0548e..879e51da93 100644
--- a/vendor/libvirt.org/go/libvirtxml/domain_capabilities.go
+++ b/vendor/libvirt.org/go/libvirtxml/domain_capabilities.go
@@ -80,7 +80,6 @@ type DomainCapsCPUMode struct {
Vendor string `xml:"vendor,omitempty"`
MaxPhysAddr *DomainCapsCPUMaxPhysAddr `xml:"maxphysaddr"`
Features []DomainCapsCPUFeature `xml:"feature"`
- Blockers []DomainCapsCPUBlockers `xml:"blockers"`
Enums []DomainCapsEnum `xml:"enum"`
}
@@ -97,15 +96,6 @@ type DomainCapsCPUFeature struct {
Name string `xml:"name,attr"`
}
-type DomainCapsCPUBlockers struct {
- Model string `xml:"model,attr"`
- Features []DomainCapsCPUBlockedFeature `xml:"feature"`
-}
-
-type DomainCapsCPUBlockedFeature struct {
- Name string `xml:"name,attr"`
-}
-
type DomainCapsEnum struct {
Name string `xml:"name,attr"`
Values []string `xml:"value"`
@@ -127,7 +117,6 @@ type DomainCapsDevices struct {
Redirdev *DomainCapsDevice `xml:"redirdev"`
Channel *DomainCapsDevice `xml:"channel"`
Crypto *DomainCapsDevice `xml:"crypto"`
- Interface *DomainCapsDevice `xml:"interface"`
}
type DomainCapsDevice struct {
@@ -143,7 +132,6 @@ type DomainCapsFeatures struct {
Backup *DomainCapsFeatureBackup `xml:"backup"`
AsyncTeardown *DomainCapsFeatureAsyncTeardown `xml:"async-teardown"`
S390PV *DomainCapsFeatureS390PV `xml:"s390-pv"`
- PS2 *DomainCapsFeaturePS2 `xml:"ps2"`
SEV *DomainCapsFeatureSEV `xml:"sev"`
SGX *DomainCapsFeatureSGX `xml:"sgx"`
HyperV *DomainCapsFeatureHyperV `xml:"hyperv"`
@@ -179,10 +167,6 @@ type DomainCapsFeatureS390PV struct {
Supported string `xml:"supported,attr"`
}
-type DomainCapsFeaturePS2 struct {
- Supported string `xml:"supported,attr"`
-}
-
type DomainCapsFeatureSEV struct {
Supported string `xml:"supported,attr"`
CBitPos uint `xml:"cbitpos,omitempty"`
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 40b635a4d0..99299b01e8 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1321,10 +1321,10 @@ kubevirt.io/controller-lifecycle-operator-sdk/api
## explicit; go 1.16
kubevirt.io/qe-tools/pkg/ginkgo-reporters
kubevirt.io/qe-tools/pkg/polarion-xml
-# libvirt.org/go/libvirt v1.10009.1
+# libvirt.org/go/libvirt v1.10005.0
## explicit; go 1.11
libvirt.org/go/libvirt
-# libvirt.org/go/libvirtxml v1.10009.0
+# libvirt.org/go/libvirtxml v1.10005.0
## explicit; go 1.11
libvirt.org/go/libvirtxml
# mvdan.cc/editorconfig v0.2.1-0.20231228180347-1925077f8eb2
--
2.43.0
