There are many reasons why we need to create wrappers around the native
libvirt public APIs, and multiple reasons may apply to the same
function. Using a standard "Wrapper" suffix will clarify it.
Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
api_test.go | 2 +-
connect.go | 28 ++++++++---------
connect_compat.go | 28 ++++++++---------
connect_compat.h | 28 ++++++++---------
domain.go | 64 +++++++++++++++++++-------------------
domain_compat.go | 62 ++++++++++++++++++------------------
domain_compat.h | 62 ++++++++++++++++++------------------
lxc.go | 2 +-
lxc_compat.go | 2 +-
lxc_compat.h | 2 +-
network.go | 4 +--
network_compat.go | 6 ++--
network_compat.h | 6 ++--
network_events.go | 2 +-
node_device_compat.go | 2 +-
node_device_compat.h | 2 +-
node_device_events.go | 2 +-
nwfilter_binding.go | 12 +++----
nwfilter_binding_compat.go | 12 +++----
nwfilter_binding_compat.h | 12 +++----
qemu.go | 2 +-
qemu_compat.go | 2 +-
qemu_compat.h | 2 +-
secret_compat.go | 2 +-
secret_compat.h | 2 +-
secret_events.go | 2 +-
storage_pool_compat.go | 2 +-
storage_pool_compat.h | 2 +-
storage_pool_events.go | 2 +-
storage_volume.go | 2 +-
storage_volume_compat.go | 2 +-
storage_volume_compat.h | 2 +-
stream.go | 6 ++--
stream_compat.go | 6 ++--
stream_compat.h | 6 ++--
35 files changed, 191 insertions(+), 191 deletions(-)
diff --git a/api_test.go b/api_test.go
index ad94335..a16a1eb 100644
--- a/api_test.go
+++ b/api_test.go
@@ -394,7 +394,7 @@ func ProcessFile(path string) []string {
defer file.Close()
- re, err := regexp.Compile("C\\.((vir|VIR|LIBVIR)[a-zA-Z0-9_]+?)(Compat|Wrapper)?\\b")
+ re, err := regexp.Compile("C\\.((vir|VIR|LIBVIR)[a-zA-Z0-9_]+?)(Wrapper)?\\b")
if err != nil {
panic(err)
}
diff --git a/connect.go b/connect.go
index 793e3c4..98ab7ab 100644
--- a/connect.go
+++ b/connect.go
@@ -833,7 +833,7 @@ func (c *Connect) DomainDefineXMLFlags(xmlConfig string, flags DomainDefineFlags
}
cXml := C.CString(string(xmlConfig))
defer C.free(unsafe.Pointer(cXml))
- ptr := C.virDomainDefineXMLFlagsCompat(c.ptr, cXml, C.uint(flags))
+ ptr := C.virDomainDefineXMLFlagsWrapper(c.ptr, cXml, C.uint(flags))
if ptr == nil {
return nil, GetLastError()
}
@@ -1210,7 +1210,7 @@ func (c *Connect) LookupStoragePoolByTargetPath(path string) (*StoragePool, erro
}
cPath := C.CString(path)
defer C.free(unsafe.Pointer(cPath))
- ptr := C.virStoragePoolLookupByTargetPathCompat(c.ptr, cPath)
+ ptr := C.virStoragePoolLookupByTargetPathWrapper(c.ptr, cPath)
if ptr == nil {
return nil, GetLastError()
}
@@ -1274,7 +1274,7 @@ func (c *Connect) LookupNWFilterBindingByPortDev(name string) (*NWFilterBinding,
}
cName := C.CString(name)
defer C.free(unsafe.Pointer(cName))
- ptr := C.virNWFilterBindingLookupByPortDevCompat(c.ptr, cName)
+ ptr := C.virNWFilterBindingLookupByPortDevWrapper(c.ptr, cName)
if ptr == nil {
return nil, GetLastError()
}
@@ -1478,7 +1478,7 @@ func (c *Connect) ListAllNWFilterBindings(flags uint32) ([]NWFilterBinding, erro
if C.LIBVIR_VERSION_NUMBER < 4005000 {
return []NWFilterBinding{}, GetNotImplementedError("virConnectListAllNWFilterBindings")
}
- numNWFilters := C.virConnectListAllNWFilterBindingsCompat(c.ptr, (**C.virNWFilterBindingPtr)(&cList), C.uint(flags))
+ numNWFilters := C.virConnectListAllNWFilterBindingsWrapper(c.ptr, (**C.virNWFilterBindingPtr)(&cList), C.uint(flags))
if numNWFilters == -1 {
return nil, GetLastError()
}
@@ -1601,7 +1601,7 @@ func (c *Connect) AllocPages(pageSizes map[int]int64, startCell int, cellCount u
i++
}
- ret := C.virNodeAllocPagesCompat(c.ptr, C.uint(len(pageSizes)), (*C.uint)(unsafe.Pointer(&cpages)),
+ ret := C.virNodeAllocPagesWrapper(c.ptr, C.uint(len(pageSizes)), (*C.uint)(unsafe.Pointer(&cpages)),
(*C.ulonglong)(unsafe.Pointer(&ccounts)), C.int(startCell), C.uint(cellCount), C.uint(flags))
if ret == -1 {
return 0, GetLastError()
@@ -1730,7 +1730,7 @@ func (c *Connect) GetFreePages(pageSizes []uint64, startCell int, maxCells uint,
cpageSizes[i] = C.uint(pageSizes[i])
}
- ret := C.virNodeGetFreePagesCompat(c.ptr, C.uint(len(pageSizes)), (*C.uint)(unsafe.Pointer(&cpageSizes)), C.int(startCell),
+ ret := C.virNodeGetFreePagesWrapper(c.ptr, C.uint(len(pageSizes)), (*C.uint)(unsafe.Pointer(&cpageSizes)), C.int(startCell),
C.uint(maxCells), (*C.ulonglong)(unsafe.Pointer(&ccounts)), C.uint(flags))
if ret == -1 {
return []uint64{}, GetLastError()
@@ -2013,7 +2013,7 @@ func (c *Connect) BaselineHypervisorCPU(emulator string, arch string, machine st
defer C.free(unsafe.Pointer(cxmlCPUs[i]))
}
- ret := C.virConnectBaselineHypervisorCPUCompat(c.ptr, cemulator, carch, cmachine, cvirttype,
+ ret := C.virConnectBaselineHypervisorCPUWrapper(c.ptr, cemulator, carch, cmachine, cvirttype,
&cxmlCPUs[0], C.uint(len(xmlCPUs)), C.uint(flags))
if ret == nil {
return "", GetLastError()
@@ -2064,7 +2064,7 @@ func (c *Connect) CompareHypervisorCPU(emulator string, arch string, machine str
cxmlDesc := C.CString(xmlDesc)
defer C.free(unsafe.Pointer(cxmlDesc))
- ret := C.virConnectCompareHypervisorCPUCompat(c.ptr, cemulator, carch, cmachine, cvirttype, cxmlDesc, C.uint(flags))
+ ret := C.virConnectCompareHypervisorCPUWrapper(c.ptr, cemulator, carch, cmachine, cvirttype, cxmlDesc, C.uint(flags))
if ret == C.VIR_CPU_COMPARE_ERROR {
return CPU_COMPARE_ERROR, GetLastError()
}
@@ -2155,7 +2155,7 @@ func (c *Connect) GetDomainCapabilities(emulatorbin string, arch string, machine
defer C.free(unsafe.Pointer(cvirttype))
}
- ret := C.virConnectGetDomainCapabilitiesCompat(c.ptr, cemulatorbin, carch, cmachine, cvirttype, C.uint(flags))
+ ret := C.virConnectGetDomainCapabilitiesWrapper(c.ptr, cemulatorbin, carch, cmachine, cvirttype, C.uint(flags))
if ret == nil {
return "", GetLastError()
}
@@ -2674,15 +2674,15 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, statsTypes DomainStatsTypes,
cdoms[i] = doms[i].ptr
}
- ret = C.virDomainListGetStatsCompat(&cdoms[0], C.uint(statsTypes), &cstats, C.uint(flags))
+ ret = C.virDomainListGetStatsWrapper(&cdoms[0], C.uint(statsTypes), &cstats, C.uint(flags))
} else {
- ret = C.virConnectGetAllDomainStatsCompat(c.ptr, C.uint(statsTypes), &cstats, C.uint(flags))
+ ret = C.virConnectGetAllDomainStatsWrapper(c.ptr, C.uint(statsTypes), &cstats, C.uint(flags))
}
if ret == -1 {
return []DomainStats{}, GetLastError()
}
- defer C.virDomainStatsRecordListFreeCompat(cstats)
+ defer C.virDomainStatsRecordListFreeWrapper(cstats)
stats := make([]DomainStats, ret)
for i := 0; i < int(ret); i++ {
@@ -2849,7 +2849,7 @@ func (c *Connect) GetSEVInfo(flags uint32) (*NodeSEVParameters, error) {
var cparams *C.virTypedParameter
var nparams C.int
- ret := C.virNodeGetSEVInfoCompat(c.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
+ ret := C.virNodeGetSEVInfoWrapper(c.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
if ret == -1 {
return nil, GetLastError()
}
@@ -2871,7 +2871,7 @@ func (c *Connect) NWFilterBindingCreateXML(xmlConfig string, flags uint32) (*NWF
}
cXml := C.CString(string(xmlConfig))
defer C.free(unsafe.Pointer(cXml))
- ptr := C.virNWFilterBindingCreateXMLCompat(c.ptr, cXml, C.uint(flags))
+ ptr := C.virNWFilterBindingCreateXMLWrapper(c.ptr, cXml, C.uint(flags))
if ptr == nil {
return nil, GetLastError()
}
diff --git a/connect_compat.go b/connect_compat.go
index 6220eef..1ecbef2 100644
--- a/connect_compat.go
+++ b/connect_compat.go
@@ -32,7 +32,7 @@ package libvirt
#include <assert.h>
#include "connect_compat.h"
-int virNodeGetFreePagesCompat(virConnectPtr conn,
+int virNodeGetFreePagesWrapper(virConnectPtr conn,
unsigned int npages,
unsigned int *pages,
int startcell,
@@ -47,7 +47,7 @@ int virNodeGetFreePagesCompat(virConnectPtr conn,
#endif
}
-char * virConnectGetDomainCapabilitiesCompat(virConnectPtr conn,
+char * virConnectGetDomainCapabilitiesWrapper(virConnectPtr conn,
const char *emulatorbin,
const char *arch,
const char *machine,
@@ -61,7 +61,7 @@ char * virConnectGetDomainCapabilitiesCompat(virConnectPtr conn,
#endif
}
-int virConnectGetAllDomainStatsCompat(virConnectPtr conn,
+int virConnectGetAllDomainStatsWrapper(virConnectPtr conn,
unsigned int stats,
virDomainStatsRecordPtr **retStats,
unsigned int flags)
@@ -73,7 +73,7 @@ int virConnectGetAllDomainStatsCompat(virConnectPtr conn,
#endif
}
-int virDomainListGetStatsCompat(virDomainPtr *doms,
+int virDomainListGetStatsWrapper(virDomainPtr *doms,
unsigned int stats,
virDomainStatsRecordPtr **retStats,
unsigned int flags)
@@ -85,11 +85,11 @@ int virDomainListGetStatsCompat(virDomainPtr *doms,
#endif
}
-void virDomainStatsRecordListFreeCompat(virDomainStatsRecordPtr *stats)
+void virDomainStatsRecordListFreeWrapper(virDomainStatsRecordPtr *stats)
{
}
-int virNodeAllocPagesCompat(virConnectPtr conn,
+int virNodeAllocPagesWrapper(virConnectPtr conn,
unsigned int npages,
unsigned int *pageSizes,
unsigned long long *pageCounts,
@@ -105,7 +105,7 @@ int virNodeAllocPagesCompat(virConnectPtr conn,
}
-virDomainPtr virDomainDefineXMLFlagsCompat(virConnectPtr conn,
+virDomainPtr virDomainDefineXMLFlagsWrapper(virConnectPtr conn,
const char *xml,
unsigned int flags)
{
@@ -116,7 +116,7 @@ virDomainPtr virDomainDefineXMLFlagsCompat(virConnectPtr conn,
#endif
}
-virStoragePoolPtr virStoragePoolLookupByTargetPathCompat(virConnectPtr conn,
+virStoragePoolPtr virStoragePoolLookupByTargetPathWrapper(virConnectPtr conn,
const char *path)
{
#if LIBVIR_VERSION_NUMBER < 4001000
@@ -126,7 +126,7 @@ virStoragePoolPtr virStoragePoolLookupByTargetPathCompat(virConnectPtr conn,
#endif
}
-char *virConnectBaselineHypervisorCPUCompat(virConnectPtr conn,
+char *virConnectBaselineHypervisorCPUWrapper(virConnectPtr conn,
const char *emulator,
const char *arch,
const char *machine,
@@ -142,7 +142,7 @@ char *virConnectBaselineHypervisorCPUCompat(virConnectPtr conn,
#endif
}
-int virConnectCompareHypervisorCPUCompat(virConnectPtr conn,
+int virConnectCompareHypervisorCPUWrapper(virConnectPtr conn,
const char *emulator,
const char *arch,
const char *machine,
@@ -157,7 +157,7 @@ int virConnectCompareHypervisorCPUCompat(virConnectPtr conn,
#endif
}
-int virNodeGetSEVInfoCompat(virConnectPtr conn,
+int virNodeGetSEVInfoWrapper(virConnectPtr conn,
virTypedParameterPtr *params,
int *nparams,
unsigned int flags)
@@ -169,7 +169,7 @@ int virNodeGetSEVInfoCompat(virConnectPtr conn,
#endif
}
-int virConnectListAllNWFilterBindingsCompat(virConnectPtr conn,
+int virConnectListAllNWFilterBindingsWrapper(virConnectPtr conn,
virNWFilterBindingPtr **bindings,
unsigned int flags)
{
@@ -180,7 +180,7 @@ int virConnectListAllNWFilterBindingsCompat(virConnectPtr conn,
#endif
}
-virNWFilterBindingPtr virNWFilterBindingCreateXMLCompat(virConnectPtr conn,
+virNWFilterBindingPtr virNWFilterBindingCreateXMLWrapper(virConnectPtr conn,
const char *xml,
unsigned int flags)
{
@@ -191,7 +191,7 @@ virNWFilterBindingPtr virNWFilterBindingCreateXMLCompat(virConnectPtr conn,
#endif
}
-virNWFilterBindingPtr virNWFilterBindingLookupByPortDevCompat(virConnectPtr conn,
+virNWFilterBindingPtr virNWFilterBindingLookupByPortDevWrapper(virConnectPtr conn,
const char *portdev)
{
#if LIBVIR_VERSION_NUMBER < 4005000
diff --git a/connect_compat.h b/connect_compat.h
index 4696e46..09cbe22 100644
--- a/connect_compat.h
+++ b/connect_compat.h
@@ -47,7 +47,7 @@
#define VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE 1 << 0
#endif
-int virNodeGetFreePagesCompat(virConnectPtr conn,
+int virNodeGetFreePagesWrapper(virConnectPtr conn,
unsigned int npages,
unsigned int *pages,
int startcell,
@@ -58,7 +58,7 @@ int virNodeGetFreePagesCompat(virConnectPtr conn,
/* 1.2.7 */
-char * virConnectGetDomainCapabilitiesCompat(virConnectPtr conn,
+char * virConnectGetDomainCapabilitiesWrapper(virConnectPtr conn,
const char *emulatorbin,
const char *arch,
const char *machine,
@@ -118,17 +118,17 @@ struct _virDomainStatsRecord {
};
#endif
-int virConnectGetAllDomainStatsCompat(virConnectPtr conn,
+int virConnectGetAllDomainStatsWrapper(virConnectPtr conn,
unsigned int stats,
virDomainStatsRecordPtr **retStats,
unsigned int flags);
-int virDomainListGetStatsCompat(virDomainPtr *doms,
+int virDomainListGetStatsWrapper(virDomainPtr *doms,
unsigned int stats,
virDomainStatsRecordPtr **retStats,
unsigned int flags);
-void virDomainStatsRecordListFreeCompat(virDomainStatsRecordPtr *stats);
+void virDomainStatsRecordListFreeWrapper(virDomainStatsRecordPtr *stats);
/* 1.2.9 */
@@ -140,7 +140,7 @@ void virDomainStatsRecordListFreeCompat(virDomainStatsRecordPtr *stats);
#define VIR_NODE_ALLOC_PAGES_SET 1 << 0
#endif
-int virNodeAllocPagesCompat(virConnectPtr conn,
+int virNodeAllocPagesWrapper(virConnectPtr conn,
unsigned int npages,
unsigned int *pageSizes,
unsigned long long *pageCounts,
@@ -178,7 +178,7 @@ int virNodeAllocPagesCompat(virConnectPtr conn,
#define VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING 1 << 30
#endif
-virDomainPtr virDomainDefineXMLFlagsCompat(virConnectPtr conn,
+virDomainPtr virDomainDefineXMLFlagsWrapper(virConnectPtr conn,
const char *xml,
unsigned int flags);
@@ -214,12 +214,12 @@ virDomainPtr virDomainDefineXMLFlagsCompat(virConnectPtr conn,
/* 4.1.0 */
-virStoragePoolPtr virStoragePoolLookupByTargetPathCompat(virConnectPtr conn,
+virStoragePoolPtr virStoragePoolLookupByTargetPathWrapper(virConnectPtr conn,
const char *path);
/* 4.4.0 */
-char *virConnectBaselineHypervisorCPUCompat(virConnectPtr conn,
+char *virConnectBaselineHypervisorCPUWrapper(virConnectPtr conn,
const char *emulator,
const char *arch,
const char *machine,
@@ -228,7 +228,7 @@ char *virConnectBaselineHypervisorCPUCompat(virConnectPtr conn,
unsigned int ncpus,
unsigned int flags);
-int virConnectCompareHypervisorCPUCompat(virConnectPtr conn,
+int virConnectCompareHypervisorCPUWrapper(virConnectPtr conn,
const char *emulator,
const char *arch,
const char *machine,
@@ -238,7 +238,7 @@ int virConnectCompareHypervisorCPUCompat(virConnectPtr conn,
/* 4.5.0 */
-int virNodeGetSEVInfoCompat(virConnectPtr conn,
+int virNodeGetSEVInfoWrapper(virConnectPtr conn,
virTypedParameterPtr *params,
int *nparams,
unsigned int flags);
@@ -263,15 +263,15 @@ int virNodeGetSEVInfoCompat(virConnectPtr conn,
typedef struct _virNWFilterBinding *virNWFilterBindingPtr;
#endif
-int virConnectListAllNWFilterBindingsCompat(virConnectPtr conn,
+int virConnectListAllNWFilterBindingsWrapper(virConnectPtr conn,
virNWFilterBindingPtr **bindings,
unsigned int flags);
-virNWFilterBindingPtr virNWFilterBindingCreateXMLCompat(virConnectPtr conn,
+virNWFilterBindingPtr virNWFilterBindingCreateXMLWrapper(virConnectPtr conn,
const char *xml,
unsigned int flags);
-virNWFilterBindingPtr virNWFilterBindingLookupByPortDevCompat(virConnectPtr conn,
+virNWFilterBindingPtr virNWFilterBindingLookupByPortDevWrapper(virConnectPtr conn,
const char *portdev);
#ifndef VIR_CONNECT_GET_ALL_DOMAINS_STATS_NOWAIT
diff --git a/domain.go b/domain.go
index cc0285b..75c3458 100644
--- a/domain.go
+++ b/domain.go
@@ -1502,7 +1502,7 @@ func (d *Domain) DetachDeviceAlias(alias string, flags DomainDeviceModifyFlags)
cAlias := C.CString(alias)
defer C.free(unsafe.Pointer(cAlias))
- result := C.virDomainDetachDeviceAliasCompat(d.ptr, cAlias, C.uint(flags))
+ result := C.virDomainDetachDeviceAliasWrapper(d.ptr, cAlias, C.uint(flags))
if result == -1 {
return GetLastError()
}
@@ -1873,7 +1873,7 @@ func (d *Domain) ListAllInterfaceAddresses(src DomainInterfaceAddressesSource) (
}
var cList *C.virDomainInterfacePtr
- numIfaces := int(C.virDomainInterfaceAddressesCompat(d.ptr, (**C.virDomainInterfacePtr)(&cList), C.uint(src), 0))
+ numIfaces := int(C.virDomainInterfaceAddressesWrapper(d.ptr, (**C.virDomainInterfacePtr)(&cList), C.uint(src), 0))
if numIfaces == -1 {
return nil, GetLastError()
}
@@ -1900,7 +1900,7 @@ func (d *Domain) ListAllInterfaceAddresses(src DomainInterfaceAddressesSource) (
ifaces[i].Addrs[k].Prefix = uint(caddr.prefix)
}
- C.virDomainInterfaceFreeCompat(ciface)
+ C.virDomainInterfaceFreeWrapper(ciface)
}
C.free(unsafe.Pointer(cList))
return ifaces, nil
@@ -2044,7 +2044,7 @@ func (d *Domain) BlockCopy(disk string, destxml string, params *DomainBlockCopyP
defer C.virTypedParamsClear((*C.virTypedParameter)(unsafe.Pointer(&(*cparams)[0])), C.int(nparams))
- ret := C.virDomainBlockCopyCompat(d.ptr, cdisk, cdestxml, (*C.virTypedParameter)(unsafe.Pointer(&(*cparams)[0])), C.int(nparams), C.uint(flags))
+ ret := C.virDomainBlockCopyWrapper(d.ptr, cdisk, cdestxml, (*C.virTypedParameter)(unsafe.Pointer(&(*cparams)[0])), C.int(nparams), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -2452,7 +2452,7 @@ func (d *Domain) MigrateGetMaxDowntime(flags uint32) (uint64, error) {
return 0, GetNotImplementedError("virDomainMigrateGetMaxDowntime")
}
- ret := C.virDomainMigrateGetMaxDowntimeCompat(d.ptr, &downtimeLen, C.uint(flags))
+ ret := C.virDomainMigrateGetMaxDowntimeWrapper(d.ptr, &downtimeLen, C.uint(flags))
if ret == -1 {
return 0, GetLastError()
}
@@ -2466,7 +2466,7 @@ func (d *Domain) MigrateStartPostCopy(flags uint32) error {
return GetNotImplementedError("virDomainMigrateStartPostCopy")
}
- ret := C.virDomainMigrateStartPostCopyCompat(d.ptr, C.uint(flags))
+ ret := C.virDomainMigrateStartPostCopyWrapper(d.ptr, C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -3456,7 +3456,7 @@ func (d *Domain) GetPerfEvents(flags DomainModificationImpact) (*DomainPerfEvent
var cparams *C.virTypedParameter
var nparams C.int
- ret := C.virDomainGetPerfEventsCompat(d.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
+ ret := C.virDomainGetPerfEventsWrapper(d.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
if ret == -1 {
return nil, GetLastError()
}
@@ -3481,7 +3481,7 @@ func (d *Domain) SetPerfEvents(params *DomainPerfEvents, flags DomainModificatio
var cparams *C.virTypedParameter
var nparams C.int
- ret := C.virDomainGetPerfEventsCompat(d.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
+ ret := C.virDomainGetPerfEventsWrapper(d.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -3493,7 +3493,7 @@ func (d *Domain) SetPerfEvents(params *DomainPerfEvents, flags DomainModificatio
return err
}
- ret = C.virDomainSetPerfEventsCompat(d.ptr, cparams, nparams, C.uint(flags))
+ ret = C.virDomainSetPerfEventsWrapper(d.ptr, cparams, nparams, C.uint(flags))
return nil
}
@@ -3770,7 +3770,7 @@ func (d *Domain) GetTime(flags uint32) (int64, uint, error) {
}
var secs C.longlong
var nsecs C.uint
- ret := C.virDomainGetTimeCompat(d.ptr, &secs, &nsecs, C.uint(flags))
+ ret := C.virDomainGetTimeWrapper(d.ptr, &secs, &nsecs, C.uint(flags))
if ret == -1 {
return 0, 0, GetLastError()
}
@@ -3784,7 +3784,7 @@ func (d *Domain) SetTime(secs int64, nsecs uint, flags DomainSetTimeFlags) error
return GetNotImplementedError("virDomainSetTime")
}
- ret := C.virDomainSetTimeCompat(d.ptr, C.longlong(secs), C.uint(nsecs), C.uint(flags))
+ ret := C.virDomainSetTimeWrapper(d.ptr, C.longlong(secs), C.uint(nsecs), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -3803,7 +3803,7 @@ func (d *Domain) SetUserPassword(user string, password string, flags DomainSetUs
defer C.free(unsafe.Pointer(cuser))
defer C.free(unsafe.Pointer(cpassword))
- ret := C.virDomainSetUserPasswordCompat(d.ptr, cuser, cpassword, C.uint(flags))
+ ret := C.virDomainSetUserPasswordWrapper(d.ptr, cuser, cpassword, C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -3850,7 +3850,7 @@ func (d *Domain) Rename(name string, flags uint32) error {
}
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
- ret := C.virDomainRenameCompat(d.ptr, cname, C.uint(flags))
+ ret := C.virDomainRenameWrapper(d.ptr, cname, C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -3909,7 +3909,7 @@ func (d *Domain) CoreDumpWithFormat(to string, format DomainCoreDumpFormat, flag
cto := C.CString(to)
defer C.free(unsafe.Pointer(cto))
- ret := C.virDomainCoreDumpWithFormatCompat(d.ptr, cto, C.uint(format), C.uint(flags))
+ ret := C.virDomainCoreDumpWithFormatWrapper(d.ptr, cto, C.uint(format), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -3942,7 +3942,7 @@ func (d *Domain) FSFreeze(mounts []string, flags uint32) error {
}
nmounts := len(mounts)
- ret := C.virDomainFSFreezeCompat(d.ptr, (**C.char)(unsafe.Pointer(&cmounts[0])), C.uint(nmounts), C.uint(flags))
+ ret := C.virDomainFSFreezeWrapper(d.ptr, (**C.char)(unsafe.Pointer(&cmounts[0])), C.uint(nmounts), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -3963,7 +3963,7 @@ func (d *Domain) FSThaw(mounts []string, flags uint32) error {
}
nmounts := len(mounts)
- ret := C.virDomainFSThawCompat(d.ptr, (**C.char)(unsafe.Pointer(&cmounts[0])), C.uint(nmounts), C.uint(flags))
+ ret := C.virDomainFSThawWrapper(d.ptr, (**C.char)(unsafe.Pointer(&cmounts[0])), C.uint(nmounts), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4001,7 +4001,7 @@ func (d *Domain) GetFSInfo(flags uint32) ([]DomainFSInfo, error) {
}
var cfsinfolist **C.virDomainFSInfo
- ret := C.virDomainGetFSInfoCompat(d.ptr, (**C.virDomainFSInfoPtr)(unsafe.Pointer(&cfsinfolist)), C.uint(flags))
+ ret := C.virDomainGetFSInfoWrapper(d.ptr, (**C.virDomainFSInfoPtr)(unsafe.Pointer(&cfsinfolist)), C.uint(flags))
if ret == -1 {
return []DomainFSInfo{}, GetLastError()
}
@@ -4023,7 +4023,7 @@ func (d *Domain) GetFSInfo(flags uint32) ([]DomainFSInfo, error) {
DevAlias: aliases,
}
- C.virDomainFSInfoFreeCompat(cfsinfo)
+ C.virDomainFSInfoFreeWrapper(cfsinfo)
}
C.free(unsafe.Pointer(cfsinfolist))
@@ -4055,7 +4055,7 @@ func (d *Domain) AddIOThread(id uint, flags DomainModificationImpact) error {
if C.LIBVIR_VERSION_NUMBER < 1002015 {
return GetNotImplementedError("virDomainAddIOThread")
}
- ret := C.virDomainAddIOThreadCompat(d.ptr, C.uint(id), C.uint(flags))
+ ret := C.virDomainAddIOThreadWrapper(d.ptr, C.uint(id), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4068,7 +4068,7 @@ func (d *Domain) DelIOThread(id uint, flags DomainModificationImpact) error {
if C.LIBVIR_VERSION_NUMBER < 1002015 {
return GetNotImplementedError("virDomainDelIOThread")
}
- ret := C.virDomainDelIOThreadCompat(d.ptr, C.uint(id), C.uint(flags))
+ ret := C.virDomainDelIOThreadWrapper(d.ptr, C.uint(id), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4114,7 +4114,7 @@ func (d *Domain) GetIOThreadInfo(flags DomainModificationImpact) ([]DomainIOThre
}
var cinfolist **C.virDomainIOThreadInfo
- ret := C.virDomainGetIOThreadInfoCompat(d.ptr, (**C.virDomainIOThreadInfoPtr)(unsafe.Pointer(&cinfolist)), C.uint(flags))
+ ret := C.virDomainGetIOThreadInfoWrapper(d.ptr, (**C.virDomainIOThreadInfoPtr)(unsafe.Pointer(&cinfolist)), C.uint(flags))
if ret == -1 {
return []DomainIOThreadInfo{}, GetLastError()
}
@@ -4139,7 +4139,7 @@ func (d *Domain) GetIOThreadInfo(flags DomainModificationImpact) ([]DomainIOThre
CpuMap: cpumap,
}
- C.virDomainIOThreadInfoFreeCompat(cinfo)
+ C.virDomainIOThreadInfoFreeWrapper(cinfo)
}
C.free(unsafe.Pointer(cinfolist))
@@ -4225,7 +4225,7 @@ func (d *Domain) PinIOThread(iothreadid uint, cpumap []bool, flags DomainModific
}
}
- ret := C.virDomainPinIOThreadCompat(d.ptr, C.uint(iothreadid), &ccpumaps[0], C.int(maplen), C.uint(flags))
+ ret := C.virDomainPinIOThreadWrapper(d.ptr, C.uint(iothreadid), &ccpumaps[0], C.int(maplen), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4277,7 +4277,7 @@ func (d *Domain) OpenGraphicsFD(idx uint, flags DomainOpenGraphicsFlags) (*os.Fi
if C.LIBVIR_VERSION_NUMBER < 1002008 {
return nil, GetNotImplementedError("virDomainOpenGraphicsFD")
}
- ret := C.virDomainOpenGraphicsFDCompat(d.ptr, C.uint(idx), C.uint(flags))
+ ret := C.virDomainOpenGraphicsFDWrapper(d.ptr, C.uint(idx), C.uint(flags))
if ret == -1 {
return nil, GetLastError()
}
@@ -4412,7 +4412,7 @@ func (d *Domain) GetGuestVcpus(flags uint32) (*DomainGuestVcpus, error) {
var cparams C.virTypedParameterPtr
var nparams C.uint
- ret := C.virDomainGetGuestVcpusCompat(d.ptr, &cparams, &nparams, C.uint(flags))
+ ret := C.virDomainGetGuestVcpusWrapper(d.ptr, &cparams, &nparams, C.uint(flags))
if ret == -1 {
return nil, GetLastError()
}
@@ -4452,7 +4452,7 @@ func (d *Domain) SetGuestVcpus(cpus []bool, state bool, flags uint32) error {
}
ccpumap := C.CString(cpumap)
defer C.free(unsafe.Pointer(ccpumap))
- ret := C.virDomainSetGuestVcpusCompat(d.ptr, ccpumap, cstate, C.uint(flags))
+ ret := C.virDomainSetGuestVcpusWrapper(d.ptr, ccpumap, cstate, C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4485,7 +4485,7 @@ func (d *Domain) SetVcpu(cpus []bool, state bool, flags uint32) error {
}
ccpumap := C.CString(cpumap)
defer C.free(unsafe.Pointer(ccpumap))
- ret := C.virDomainSetVcpuCompat(d.ptr, ccpumap, cstate, C.uint(flags))
+ ret := C.virDomainSetVcpuWrapper(d.ptr, ccpumap, cstate, C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4501,7 +4501,7 @@ func (d *Domain) SetBlockThreshold(dev string, threshold uint64, flags uint32) e
cdev := C.CString(dev)
defer C.free(unsafe.Pointer(cdev))
- ret := C.virDomainSetBlockThresholdCompat(d.ptr, cdev, C.ulonglong(threshold), C.uint(flags))
+ ret := C.virDomainSetBlockThresholdWrapper(d.ptr, cdev, C.ulonglong(threshold), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4517,7 +4517,7 @@ func (d *Domain) ManagedSaveDefineXML(xml string, flags uint32) error {
cxml := C.CString(xml)
defer C.free(unsafe.Pointer(cxml))
- ret := C.virDomainManagedSaveDefineXMLCompat(d.ptr, cxml, C.uint(flags))
+ ret := C.virDomainManagedSaveDefineXMLWrapper(d.ptr, cxml, C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4531,7 +4531,7 @@ func (d *Domain) ManagedSaveGetXMLDesc(flags uint32) (string, error) {
return "", GetNotImplementedError("virDomainManagedSaveGetXMLDesc")
}
- ret := C.virDomainManagedSaveGetXMLDescCompat(d.ptr, C.uint(flags))
+ ret := C.virDomainManagedSaveGetXMLDescWrapper(d.ptr, C.uint(flags))
if ret == nil {
return "", GetLastError()
}
@@ -4566,7 +4566,7 @@ func (d *Domain) SetLifecycleAction(lifecycleType uint32, action uint32, flags u
return GetNotImplementedError("virDomainSetLifecycleAction")
}
- ret := C.virDomainSetLifecycleActionCompat(d.ptr, C.uint(lifecycleType), C.uint(action), C.uint(flags))
+ ret := C.virDomainSetLifecycleActionWrapper(d.ptr, C.uint(lifecycleType), C.uint(action), C.uint(flags))
if ret == -1 {
return GetLastError()
}
@@ -4600,7 +4600,7 @@ func (d *Domain) GetLaunchSecurityInfo(flags uint32) (*DomainLaunchSecurityParam
var cparams *C.virTypedParameter
var nparams C.int
- ret := C.virDomainGetLaunchSecurityInfoCompat(d.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
+ ret := C.virDomainGetLaunchSecurityInfoWrapper(d.ptr, (*C.virTypedParameterPtr)(unsafe.Pointer(&cparams)), &nparams, C.uint(flags))
if ret == -1 {
return nil, GetLastError()
}
diff --git a/domain_compat.go b/domain_compat.go
index 73a6db9..345c28a 100644
--- a/domain_compat.go
+++ b/domain_compat.go
@@ -32,7 +32,7 @@ package libvirt
#include <assert.h>
#include "domain_compat.h"
-int virDomainCoreDumpWithFormatCompat(virDomainPtr domain,
+int virDomainCoreDumpWithFormatWrapper(virDomainPtr domain,
const char *to,
unsigned int dumpformat,
unsigned int flags)
@@ -45,7 +45,7 @@ int virDomainCoreDumpWithFormatCompat(virDomainPtr domain,
}
-int virDomainGetTimeCompat(virDomainPtr dom,
+int virDomainGetTimeWrapper(virDomainPtr dom,
long long *seconds,
unsigned int *nseconds,
unsigned int flags)
@@ -57,7 +57,7 @@ int virDomainGetTimeCompat(virDomainPtr dom,
#endif
}
-int virDomainSetTimeCompat(virDomainPtr dom,
+int virDomainSetTimeWrapper(virDomainPtr dom,
long long seconds,
unsigned int nseconds,
unsigned int flags)
@@ -69,7 +69,7 @@ int virDomainSetTimeCompat(virDomainPtr dom,
#endif
}
-int virDomainFSFreezeCompat(virDomainPtr dom,
+int virDomainFSFreezeWrapper(virDomainPtr dom,
const char **mountpoints,
unsigned int nmountpoints,
unsigned int flags)
@@ -81,7 +81,7 @@ int virDomainFSFreezeCompat(virDomainPtr dom,
#endif
}
-int virDomainFSThawCompat(virDomainPtr dom,
+int virDomainFSThawWrapper(virDomainPtr dom,
const char **mountpoints,
unsigned int nmountpoints,
unsigned int flags)
@@ -93,7 +93,7 @@ int virDomainFSThawCompat(virDomainPtr dom,
#endif
}
-int virDomainBlockCopyCompat(virDomainPtr dom, const char *disk,
+int virDomainBlockCopyWrapper(virDomainPtr dom, const char *disk,
const char *destxml,
virTypedParameterPtr params,
int nparams,
@@ -106,7 +106,7 @@ int virDomainBlockCopyCompat(virDomainPtr dom, const char *disk,
#endif
}
-int virDomainOpenGraphicsFDCompat(virDomainPtr dom,
+int virDomainOpenGraphicsFDWrapper(virDomainPtr dom,
unsigned int idx,
unsigned int flags)
{
@@ -117,11 +117,11 @@ int virDomainOpenGraphicsFDCompat(virDomainPtr dom,
#endif
}
-void virDomainFSInfoFreeCompat(virDomainFSInfoPtr info)
+void virDomainFSInfoFreeWrapper(virDomainFSInfoPtr info)
{
}
-int virDomainGetFSInfoCompat(virDomainPtr dom,
+int virDomainGetFSInfoWrapper(virDomainPtr dom,
virDomainFSInfoPtr **info,
unsigned int flags)
{
@@ -132,7 +132,7 @@ int virDomainGetFSInfoCompat(virDomainPtr dom,
#endif
}
-int virDomainInterfaceAddressesCompat(virDomainPtr dom,
+int virDomainInterfaceAddressesWrapper(virDomainPtr dom,
virDomainInterfacePtr **ifaces,
unsigned int source,
unsigned int flags)
@@ -144,15 +144,15 @@ int virDomainInterfaceAddressesCompat(virDomainPtr dom,
#endif
}
-void virDomainInterfaceFreeCompat(virDomainInterfacePtr iface)
+void virDomainInterfaceFreeWrapper(virDomainInterfacePtr iface)
{
}
-void virDomainIOThreadInfoFreeCompat(virDomainIOThreadInfoPtr info)
+void virDomainIOThreadInfoFreeWrapper(virDomainIOThreadInfoPtr info)
{
}
-int virDomainGetIOThreadInfoCompat(virDomainPtr domain,
+int virDomainGetIOThreadInfoWrapper(virDomainPtr domain,
virDomainIOThreadInfoPtr **info,
unsigned int flags)
{
@@ -162,7 +162,7 @@ int virDomainGetIOThreadInfoCompat(virDomainPtr domain,
return virDomainGetIOThreadInfo(domain, info, flags);
#endif
}
-int virDomainPinIOThreadCompat(virDomainPtr domain,
+int virDomainPinIOThreadWrapper(virDomainPtr domain,
unsigned int iothread_id,
unsigned char *cpumap,
int maplen,
@@ -175,7 +175,7 @@ int virDomainPinIOThreadCompat(virDomainPtr domain,
#endif
}
-int virDomainAddIOThreadCompat(virDomainPtr domain,
+int virDomainAddIOThreadWrapper(virDomainPtr domain,
unsigned int iothread_id,
unsigned int flags)
{
@@ -187,7 +187,7 @@ int virDomainAddIOThreadCompat(virDomainPtr domain,
}
-int virDomainDelIOThreadCompat(virDomainPtr domain,
+int virDomainDelIOThreadWrapper(virDomainPtr domain,
unsigned int iothread_id,
unsigned int flags)
{
@@ -199,7 +199,7 @@ int virDomainDelIOThreadCompat(virDomainPtr domain,
}
-int virDomainSetUserPasswordCompat(virDomainPtr dom,
+int virDomainSetUserPasswordWrapper(virDomainPtr dom,
const char *user,
const char *password,
unsigned int flags)
@@ -212,7 +212,7 @@ int virDomainSetUserPasswordCompat(virDomainPtr dom,
}
-int virDomainRenameCompat(virDomainPtr dom,
+int virDomainRenameWrapper(virDomainPtr dom,
const char *new_name,
unsigned int flags)
{
@@ -224,7 +224,7 @@ int virDomainRenameCompat(virDomainPtr dom,
}
-int virDomainGetPerfEventsCompat(virDomainPtr dom,
+int virDomainGetPerfEventsWrapper(virDomainPtr dom,
virTypedParameterPtr *params,
int *nparams,
unsigned int flags)
@@ -237,7 +237,7 @@ int virDomainGetPerfEventsCompat(virDomainPtr dom,
}
-int virDomainSetPerfEventsCompat(virDomainPtr dom,
+int virDomainSetPerfEventsWrapper(virDomainPtr dom,
virTypedParameterPtr params,
int nparams,
unsigned int flags)
@@ -250,7 +250,7 @@ int virDomainSetPerfEventsCompat(virDomainPtr dom,
}
-int virDomainMigrateStartPostCopyCompat(virDomainPtr domain,
+int virDomainMigrateStartPostCopyWrapper(virDomainPtr domain,
unsigned int flags)
{
#if LIBVIR_VERSION_NUMBER < 1003003
@@ -261,7 +261,7 @@ int virDomainMigrateStartPostCopyCompat(virDomainPtr domain,
}
-int virDomainGetGuestVcpusCompat(virDomainPtr domain,
+int virDomainGetGuestVcpusWrapper(virDomainPtr domain,
virTypedParameterPtr *params,
unsigned int *nparams,
unsigned int flags)
@@ -274,7 +274,7 @@ int virDomainGetGuestVcpusCompat(virDomainPtr domain,
}
-int virDomainSetGuestVcpusCompat(virDomainPtr domain,
+int virDomainSetGuestVcpusWrapper(virDomainPtr domain,
const char *cpumap,
int state,
unsigned int flags)
@@ -286,7 +286,7 @@ int virDomainSetGuestVcpusCompat(virDomainPtr domain,
#endif
}
-int virDomainSetVcpuCompat(virDomainPtr domain,
+int virDomainSetVcpuWrapper(virDomainPtr domain,
const char *cpumap,
int state,
unsigned int flags)
@@ -299,7 +299,7 @@ int virDomainSetVcpuCompat(virDomainPtr domain,
}
-int virDomainSetBlockThresholdCompat(virDomainPtr domain,
+int virDomainSetBlockThresholdWrapper(virDomainPtr domain,
const char *dev,
unsigned long long threshold,
unsigned int flags)
@@ -311,7 +311,7 @@ int virDomainSetBlockThresholdCompat(virDomainPtr domain,
#endif
}
-int virDomainMigrateGetMaxDowntimeCompat(virDomainPtr domain,
+int virDomainMigrateGetMaxDowntimeWrapper(virDomainPtr domain,
unsigned long long *downtime,
unsigned int flags)
{
@@ -323,7 +323,7 @@ int virDomainMigrateGetMaxDowntimeCompat(virDomainPtr domain,
}
-char *virDomainManagedSaveGetXMLDescCompat(virDomainPtr domain,
+char *virDomainManagedSaveGetXMLDescWrapper(virDomainPtr domain,
unsigned int flags)
{
#if LIBVIR_VERSION_NUMBER < 3007000
@@ -334,7 +334,7 @@ char *virDomainManagedSaveGetXMLDescCompat(virDomainPtr domain,
}
-int virDomainManagedSaveDefineXMLCompat(virDomainPtr domain,
+int virDomainManagedSaveDefineXMLWrapper(virDomainPtr domain,
const char *dxml,
unsigned int flags)
{
@@ -345,7 +345,7 @@ int virDomainManagedSaveDefineXMLCompat(virDomainPtr domain,
#endif
}
-int virDomainSetLifecycleActionCompat(virDomainPtr domain,
+int virDomainSetLifecycleActionWrapper(virDomainPtr domain,
unsigned int type,
unsigned int action,
unsigned int flags)
@@ -357,7 +357,7 @@ int virDomainSetLifecycleActionCompat(virDomainPtr domain,
#endif
}
-int virDomainDetachDeviceAliasCompat(virDomainPtr domain,
+int virDomainDetachDeviceAliasWrapper(virDomainPtr domain,
const char *alias,
unsigned int flags)
{
@@ -368,7 +368,7 @@ int virDomainDetachDeviceAliasCompat(virDomainPtr domain,
#endif
}
-int virDomainGetLaunchSecurityInfoCompat(virDomainPtr domain,
+int virDomainGetLaunchSecurityInfoWrapper(virDomainPtr domain,
virTypedParameterPtr *params,
int *nparams,
unsigned int flags)
diff --git a/domain_compat.h b/domain_compat.h
index 345505c..3a868fe 100644
--- a/domain_compat.h
+++ b/domain_compat.h
@@ -68,7 +68,7 @@
#define VIR_MIGRATE_AUTO_CONVERGE 1 << 13
#endif
-int virDomainCoreDumpWithFormatCompat(virDomainPtr domain,
+int virDomainCoreDumpWithFormatWrapper(virDomainPtr domain,
const char *to,
unsigned int dumpformat,
unsigned int flags);
@@ -88,22 +88,22 @@ int virDomainCoreDumpWithFormatCompat(virDomainPtr domain,
#define VIR_DOMAIN_TIME_SYNC 1 << 0
#endif
-int virDomainGetTimeCompat(virDomainPtr dom,
+int virDomainGetTimeWrapper(virDomainPtr dom,
long long *seconds,
unsigned int *nseconds,
unsigned int flags);
-int virDomainSetTimeCompat(virDomainPtr dom,
+int virDomainSetTimeWrapper(virDomainPtr dom,
long long seconds,
unsigned int nseconds,
unsigned int flags);
-int virDomainFSFreezeCompat(virDomainPtr dom,
+int virDomainFSFreezeWrapper(virDomainPtr dom,
const char **mountpoints,
unsigned int nmountpoints,
unsigned int flags);
-int virDomainFSThawCompat(virDomainPtr dom,
+int virDomainFSThawWrapper(virDomainPtr dom,
const char **mountpoints,
unsigned int nmountpoints,
unsigned int flags);
@@ -161,13 +161,13 @@ int virDomainFSThawCompat(virDomainPtr dom,
#define VIR_DOMAIN_STATS_STATE 1 << 0
#endif
-int virDomainBlockCopyCompat(virDomainPtr dom, const char *disk,
+int virDomainBlockCopyWrapper(virDomainPtr dom, const char *disk,
const char *destxml,
virTypedParameterPtr params,
int nparams,
unsigned int flags);
-int virDomainOpenGraphicsFDCompat(virDomainPtr dom,
+int virDomainOpenGraphicsFDWrapper(virDomainPtr dom,
unsigned int idx,
unsigned int flags);
@@ -374,9 +374,9 @@ struct _virDomainFSInfo {
};
#endif
-void virDomainFSInfoFreeCompat(virDomainFSInfoPtr info);
+void virDomainFSInfoFreeWrapper(virDomainFSInfoPtr info);
-int virDomainGetFSInfoCompat(virDomainPtr dom,
+int virDomainGetFSInfoWrapper(virDomainPtr dom,
virDomainFSInfoPtr **info,
unsigned int flags);
@@ -450,19 +450,19 @@ struct _virDomainInterface {
};
#endif
-int virDomainInterfaceAddressesCompat(virDomainPtr dom,
+int virDomainInterfaceAddressesWrapper(virDomainPtr dom,
virDomainInterfacePtr **ifaces,
unsigned int source,
unsigned int flags);
-void virDomainInterfaceFreeCompat(virDomainInterfacePtr iface);
+void virDomainInterfaceFreeWrapper(virDomainInterfacePtr iface);
-void virDomainIOThreadInfoFreeCompat(virDomainIOThreadInfoPtr info);
+void virDomainIOThreadInfoFreeWrapper(virDomainIOThreadInfoPtr info);
-int virDomainGetIOThreadInfoCompat(virDomainPtr domain,
+int virDomainGetIOThreadInfoWrapper(virDomainPtr domain,
virDomainIOThreadInfoPtr **info,
unsigned int flags);
-int virDomainPinIOThreadCompat(virDomainPtr domain,
+int virDomainPinIOThreadWrapper(virDomainPtr domain,
unsigned int iothread_id,
unsigned char *cpumap,
int maplen,
@@ -483,10 +483,10 @@ int virDomainPinIOThreadCompat(virDomainPtr domain,
#define VIR_DOMAIN_EVENT_ID_DEVICE_ADDED 19
#endif
-int virDomainAddIOThreadCompat(virDomainPtr domain,
+int virDomainAddIOThreadWrapper(virDomainPtr domain,
unsigned int iothread_id,
unsigned int flags);
-int virDomainDelIOThreadCompat(virDomainPtr domain,
+int virDomainDelIOThreadWrapper(virDomainPtr domain,
unsigned int iothread_id,
unsigned int flags);
@@ -497,7 +497,7 @@ int virDomainDelIOThreadCompat(virDomainPtr domain,
#define VIR_DOMAIN_PASSWORD_ENCRYPTED 1 << 0
#endif
-int virDomainSetUserPasswordCompat(virDomainPtr dom,
+int virDomainSetUserPasswordWrapper(virDomainPtr dom,
const char *user,
const char *password,
unsigned int flags);
@@ -528,7 +528,7 @@ int virDomainSetUserPasswordCompat(virDomainPtr dom,
#define VIR_DOMAIN_EVENT_UNDEFINED_RENAMED 1
#endif
-int virDomainRenameCompat(virDomainPtr dom,
+int virDomainRenameWrapper(virDomainPtr dom,
const char *new_name,
unsigned int flags);
@@ -617,15 +617,15 @@ int virDomainRenameCompat(virDomainPtr dom,
#define VIR_DOMAIN_TUNABLE_CPU_GLOBAL_QUOTA "cputune.global_quota"
#endif
-int virDomainGetPerfEventsCompat(virDomainPtr dom,
+int virDomainGetPerfEventsWrapper(virDomainPtr dom,
virTypedParameterPtr *params,
int *nparams,
unsigned int flags);
-int virDomainSetPerfEventsCompat(virDomainPtr dom,
+int virDomainSetPerfEventsWrapper(virDomainPtr dom,
virTypedParameterPtr params,
int nparams,
unsigned int flags);
-int virDomainMigrateStartPostCopyCompat(virDomainPtr domain,
+int virDomainMigrateStartPostCopyWrapper(virDomainPtr domain,
unsigned int flags);
@@ -685,12 +685,12 @@ int virDomainMigrateStartPostCopyCompat(virDomainPtr domain,
#define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment"
#endif
-int virDomainGetGuestVcpusCompat(virDomainPtr domain,
+int virDomainGetGuestVcpusWrapper(virDomainPtr domain,
virTypedParameterPtr *params,
unsigned int *nparams,
unsigned int flags);
-int virDomainSetGuestVcpusCompat(virDomainPtr domain,
+int virDomainSetGuestVcpusWrapper(virDomainPtr domain,
const char *cpumap,
int state,
unsigned int flags);
@@ -878,7 +878,7 @@ int virDomainSetGuestVcpusCompat(virDomainPtr domain,
/* 3.1.0 */
-int virDomainSetVcpuCompat(virDomainPtr domain,
+int virDomainSetVcpuWrapper(virDomainPtr domain,
const char *cpumap,
int state,
unsigned int flags);
@@ -893,7 +893,7 @@ int virDomainSetVcpuCompat(virDomainPtr domain,
#define VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD 24
#endif
-int virDomainSetBlockThresholdCompat(virDomainPtr domain,
+int virDomainSetBlockThresholdWrapper(virDomainPtr domain,
const char *dev,
unsigned long long threshold,
unsigned int flags);
@@ -961,13 +961,13 @@ int virDomainSetBlockThresholdCompat(virDomainPtr domain,
/* 3.7.0 */
-int virDomainMigrateGetMaxDowntimeCompat(virDomainPtr domain,
+int virDomainMigrateGetMaxDowntimeWrapper(virDomainPtr domain,
unsigned long long *downtime,
unsigned int flags);
-char *virDomainManagedSaveGetXMLDescCompat(virDomainPtr domain,
+char *virDomainManagedSaveGetXMLDescWrapper(virDomainPtr domain,
unsigned int flags);
-int virDomainManagedSaveDefineXMLCompat(virDomainPtr domain,
+int virDomainManagedSaveDefineXMLWrapper(virDomainPtr domain,
const char *dxml,
unsigned int flags);
@@ -1013,7 +1013,7 @@ int virDomainManagedSaveDefineXMLCompat(virDomainPtr domain,
#define VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART 5
#endif
-int virDomainSetLifecycleActionCompat(virDomainPtr domain,
+int virDomainSetLifecycleActionWrapper(virDomainPtr domain,
unsigned int type,
unsigned int action,
unsigned int flags);
@@ -1031,13 +1031,13 @@ int virDomainSetLifecycleActionCompat(virDomainPtr domain,
/* 4.4.0 */
-int virDomainDetachDeviceAliasCompat(virDomainPtr domain,
+int virDomainDetachDeviceAliasWrapper(virDomainPtr domain,
const char *alias,
unsigned int flags);
/* 4.5.0 */
-int virDomainGetLaunchSecurityInfoCompat(virDomainPtr domain,
+int virDomainGetLaunchSecurityInfoWrapper(virDomainPtr domain,
virTypedParameterPtr *params,
int *nparams,
unsigned int flags);
diff --git a/lxc.go b/lxc.go
index cf1c67b..d121231 100644
--- a/lxc.go
+++ b/lxc.go
@@ -144,7 +144,7 @@ func (d *Domain) DomainLxcEnterCGroup(flags uint32) error {
return GetNotImplementedError("virDomainLxcEnterCGroup")
}
- ret := C.virDomainLxcEnterCGroupCompat(d.ptr, C.uint(flags))
+ ret := C.virDomainLxcEnterCGroupWrapper(d.ptr, C.uint(flags))
if ret == -1 {
return GetLastError()
diff --git a/lxc_compat.go b/lxc_compat.go
index a130144..cc4420c 100644
--- a/lxc_compat.go
+++ b/lxc_compat.go
@@ -36,7 +36,7 @@ package libvirt
#include <assert.h>
#include "lxc_compat.h"
-int virDomainLxcEnterCGroupCompat(virDomainPtr domain,
+int virDomainLxcEnterCGroupWrapper(virDomainPtr domain,
unsigned int flags)
{
#if LIBVIR_VERSION_NUMBER < 2000000
diff --git a/lxc_compat.h b/lxc_compat.h
index 088485c..4004baf 100644
--- a/lxc_compat.h
+++ b/lxc_compat.h
@@ -29,7 +29,7 @@
/* 2.0.0 */
-int virDomainLxcEnterCGroupCompat(virDomainPtr domain,
+int virDomainLxcEnterCGroupWrapper(virDomainPtr domain,
unsigned int flags);
diff --git a/network.go b/network.go
index 8b19c6a..fe54bf1 100644
--- a/network.go
+++ b/network.go
@@ -291,7 +291,7 @@ func (n *Network) GetDHCPLeases() ([]NetworkDHCPLease, error) {
return []NetworkDHCPLease{}, GetNotImplementedError("virNetworkGetDHCPLeases")
}
var cLeases *C.virNetworkDHCPLeasePtr
- numLeases := C.virNetworkGetDHCPLeasesCompat(n.ptr, nil, (**C.virNetworkDHCPLeasePtr)(&cLeases), C.uint(0))
+ numLeases := C.virNetworkGetDHCPLeasesWrapper(n.ptr, nil, (**C.virNetworkDHCPLeasePtr)(&cLeases), C.uint(0))
if numLeases == -1 {
return nil, GetLastError()
}
@@ -314,7 +314,7 @@ func (n *Network) GetDHCPLeases() ([]NetworkDHCPLease, error) {
Hostname: C.GoString(clease.hostname),
Clientid: C.GoString(clease.clientid),
})
- C.virNetworkDHCPLeaseFreeCompat(clease)
+ C.virNetworkDHCPLeaseFreeWrapper(clease)
}
C.free(unsafe.Pointer(cLeases))
return leases, nil
diff --git a/network_compat.go b/network_compat.go
index 744b41a..56e9749 100644
--- a/network_compat.go
+++ b/network_compat.go
@@ -32,7 +32,7 @@ package libvirt
#include <assert.h>
#include "network_compat.h"
-int virConnectNetworkEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectNetworkEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID)
{
#if LIBVIR_VERSION_NUMBER < 1002001
@@ -42,11 +42,11 @@ int virConnectNetworkEventDeregisterAnyCompat(virConnectPtr conn,
#endif
}
-void virNetworkDHCPLeaseFreeCompat(virNetworkDHCPLeasePtr lease)
+void virNetworkDHCPLeaseFreeWrapper(virNetworkDHCPLeasePtr lease)
{
}
-int virNetworkGetDHCPLeasesCompat(virNetworkPtr network,
+int virNetworkGetDHCPLeasesWrapper(virNetworkPtr network,
const char *mac,
virNetworkDHCPLeasePtr **leases,
unsigned int flags)
diff --git a/network_compat.h b/network_compat.h
index fea9e37..97c8ad5 100644
--- a/network_compat.h
+++ b/network_compat.h
@@ -56,7 +56,7 @@ typedef void (*virConnectNetworkEventGenericCallback)(virConnectPtr conn,
void *opaque);
#endif
-int virConnectNetworkEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectNetworkEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID);
@@ -86,9 +86,9 @@ struct _virNetworkDHCPLease {
};
#endif
-void virNetworkDHCPLeaseFreeCompat(virNetworkDHCPLeasePtr lease);
+void virNetworkDHCPLeaseFreeWrapper(virNetworkDHCPLeasePtr lease);
-int virNetworkGetDHCPLeasesCompat(virNetworkPtr network,
+int virNetworkGetDHCPLeasesWrapper(virNetworkPtr network,
const char *mac,
virNetworkDHCPLeasePtr **leases,
unsigned int flags);
diff --git a/network_events.go b/network_events.go
index 39cc62b..fee2253 100644
--- a/network_events.go
+++ b/network_events.go
@@ -95,7 +95,7 @@ func (c *Connect) NetworkEventDeregister(callbackId int) error {
return GetNotImplementedError("virConnectNetworkEventDeregisterAny")
}
// Deregister the callback
- if i := int(C.virConnectNetworkEventDeregisterAnyCompat(c.ptr, C.int(callbackId))); i != 0 {
+ if i := int(C.virConnectNetworkEventDeregisterAnyWrapper(c.ptr, C.int(callbackId))); i != 0 {
return GetLastError()
}
return nil
diff --git a/node_device_compat.go b/node_device_compat.go
index 1f69c7e..f2d32d9 100644
--- a/node_device_compat.go
+++ b/node_device_compat.go
@@ -32,7 +32,7 @@ package libvirt
#include <assert.h>
#include "node_device_compat.h"
-int virConnectNodeDeviceEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectNodeDeviceEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID)
{
#if LIBVIR_VERSION_NUMBER < 2002000
diff --git a/node_device_compat.h b/node_device_compat.h
index ca849da..e214bd6 100644
--- a/node_device_compat.h
+++ b/node_device_compat.h
@@ -51,7 +51,7 @@ typedef void (*virConnectNodeDeviceEventGenericCallback)(virConnectPtr conn,
void *opaque);
#endif
-int virConnectNodeDeviceEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectNodeDeviceEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID);
diff --git a/node_device_events.go b/node_device_events.go
index 1be2c73..969a134 100644
--- a/node_device_events.go
+++ b/node_device_events.go
@@ -131,7 +131,7 @@ func (c *Connect) NodeDeviceEventDeregister(callbackId int) error {
return GetNotImplementedError("virConnectNodeDeviceEventDeregisterAny")
}
// Deregister the callback
- if i := int(C.virConnectNodeDeviceEventDeregisterAnyCompat(c.ptr, C.int(callbackId))); i != 0 {
+ if i := int(C.virConnectNodeDeviceEventDeregisterAnyWrapper(c.ptr, C.int(callbackId))); i != 0 {
return GetLastError()
}
return nil
diff --git a/nwfilter_binding.go b/nwfilter_binding.go
index e4d9cd3..256ac19 100644
--- a/nwfilter_binding.go
+++ b/nwfilter_binding.go
@@ -47,7 +47,7 @@ func (f *NWFilterBinding) Free() error {
if C.LIBVIR_VERSION_NUMBER < 4005000 {
return GetNotImplementedError("virNWFilterBindingFree")
}
- ret := C.virNWFilterBindingFreeCompat(f.ptr)
+ ret := C.virNWFilterBindingFreeWrapper(f.ptr)
if ret == -1 {
return GetLastError()
}
@@ -59,7 +59,7 @@ func (c *NWFilterBinding) Ref() error {
if C.LIBVIR_VERSION_NUMBER < 4005000 {
return GetNotImplementedError("virNWFilterBindingRef")
}
- ret := C.virNWFilterBindingRefCompat(c.ptr)
+ ret := C.virNWFilterBindingRefWrapper(c.ptr)
if ret == -1 {
return GetLastError()
}
@@ -71,7 +71,7 @@ func (f *NWFilterBinding) Delete() error {
if C.LIBVIR_VERSION_NUMBER < 4005000 {
return GetNotImplementedError("virNWFilterBindingDelete")
}
- result := C.virNWFilterBindingDeleteCompat(f.ptr)
+ result := C.virNWFilterBindingDeleteWrapper(f.ptr)
if result == -1 {
return GetLastError()
}
@@ -83,7 +83,7 @@ func (f *NWFilterBinding) GetPortDev() (string, error) {
if C.LIBVIR_VERSION_NUMBER < 4005000 {
return "", GetNotImplementedError("virNWFilterBindingGetPortDev")
}
- result := C.virNWFilterBindingGetPortDevCompat(f.ptr)
+ result := C.virNWFilterBindingGetPortDevWrapper(f.ptr)
if result == nil {
return "", GetLastError()
}
@@ -97,7 +97,7 @@ func (f *NWFilterBinding) GetFilterName() (string, error) {
if C.LIBVIR_VERSION_NUMBER < 4005000 {
return "", GetNotImplementedError("virNWFilterBindingGetFilterName")
}
- result := C.virNWFilterBindingGetFilterNameCompat(f.ptr)
+ result := C.virNWFilterBindingGetFilterNameWrapper(f.ptr)
if result == nil {
return "", GetLastError()
}
@@ -111,7 +111,7 @@ func (f *NWFilterBinding) GetXMLDesc(flags uint32) (string, error) {
if C.LIBVIR_VERSION_NUMBER < 4005000 {
return "", GetNotImplementedError("virNWFilterBindingGetXMLDesc")
}
- result := C.virNWFilterBindingGetXMLDescCompat(f.ptr, C.uint(flags))
+ result := C.virNWFilterBindingGetXMLDescWrapper(f.ptr, C.uint(flags))
if result == nil {
return "", GetLastError()
}
diff --git a/nwfilter_binding_compat.go b/nwfilter_binding_compat.go
index 89b457a..37fcce0 100644
--- a/nwfilter_binding_compat.go
+++ b/nwfilter_binding_compat.go
@@ -31,7 +31,7 @@ package libvirt
#include <assert.h>
#include "nwfilter_binding_compat.h"
-const char *virNWFilterBindingGetPortDevCompat(virNWFilterBindingPtr binding)
+const char *virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding)
{
#if LIBVIR_VERSION_NUMBER < 4005000
assert(0); // Caller should have checked version
@@ -41,7 +41,7 @@ const char *virNWFilterBindingGetPortDevCompat(virNWFilterBindingPtr binding)
}
-const char *virNWFilterBindingGetFilterNameCompat(virNWFilterBindingPtr binding)
+const char *virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr binding)
{
#if LIBVIR_VERSION_NUMBER < 4005000
assert(0); // Caller should have checked version
@@ -51,7 +51,7 @@ const char *virNWFilterBindingGetFilterNameCompat(virNWFilterBindingPtr binding)
}
-char *virNWFilterBindingGetXMLDescCompat(virNWFilterBindingPtr binding,
+char *virNWFilterBindingGetXMLDescWrapper(virNWFilterBindingPtr binding,
unsigned int flags)
{
#if LIBVIR_VERSION_NUMBER < 4005000
@@ -62,7 +62,7 @@ char *virNWFilterBindingGetXMLDescCompat(virNWFilterBindingPtr binding,
}
-int virNWFilterBindingDeleteCompat(virNWFilterBindingPtr binding)
+int virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding)
{
#if LIBVIR_VERSION_NUMBER < 4005000
assert(0); // Caller should have checked version
@@ -72,7 +72,7 @@ int virNWFilterBindingDeleteCompat(virNWFilterBindingPtr binding)
}
-int virNWFilterBindingRefCompat(virNWFilterBindingPtr binding)
+int virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding)
{
#if LIBVIR_VERSION_NUMBER < 4005000
assert(0); // Caller should have checked version
@@ -82,7 +82,7 @@ int virNWFilterBindingRefCompat(virNWFilterBindingPtr binding)
}
-int virNWFilterBindingFreeCompat(virNWFilterBindingPtr binding)
+int virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding)
{
#if LIBVIR_VERSION_NUMBER < 4005000
assert(0); // Caller should have checked version
diff --git a/nwfilter_binding_compat.h b/nwfilter_binding_compat.h
index 5669462..4aa138d 100644
--- a/nwfilter_binding_compat.h
+++ b/nwfilter_binding_compat.h
@@ -30,15 +30,15 @@
typedef struct _virNWFilterBinding *virNWFilterBindingPtr;
#endif
-const char *virNWFilterBindingGetPortDevCompat(virNWFilterBindingPtr binding);
-const char *virNWFilterBindingGetFilterNameCompat(virNWFilterBindingPtr binding);
+const char *virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding);
+const char *virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr binding);
-char *virNWFilterBindingGetXMLDescCompat(virNWFilterBindingPtr binding,
+char *virNWFilterBindingGetXMLDescWrapper(virNWFilterBindingPtr binding,
unsigned int flags);
-int virNWFilterBindingDeleteCompat(virNWFilterBindingPtr binding);
-int virNWFilterBindingRefCompat(virNWFilterBindingPtr binding);
-int virNWFilterBindingFreeCompat(virNWFilterBindingPtr binding);
+int virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding);
+int virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding);
+int virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding);
#endif /* LIBVIRT_GO_NWFILTER_BINDING_COMPAT_H__ */
diff --git a/qemu.go b/qemu.go
index b8679dc..678991f 100644
--- a/qemu.go
+++ b/qemu.go
@@ -183,7 +183,7 @@ func (c *Connect) DomainQemuEventDeregister(callbackId int) error {
}
// Deregister the callback
- if i := int(C.virConnectDomainQemuMonitorEventDeregisterCompat(c.ptr, C.int(callbackId))); i != 0 {
+ if i := int(C.virConnectDomainQemuMonitorEventDeregisterWrapper(c.ptr, C.int(callbackId))); i != 0 {
return GetLastError()
}
return nil
diff --git a/qemu_compat.go b/qemu_compat.go
index a24abf3..6cd28b0 100644
--- a/qemu_compat.go
+++ b/qemu_compat.go
@@ -34,7 +34,7 @@ package libvirt
#include "qemu_compat.h"
-int virConnectDomainQemuMonitorEventDeregisterCompat(virConnectPtr conn,
+int virConnectDomainQemuMonitorEventDeregisterWrapper(virConnectPtr conn,
int callbackID)
{
#if LIBVIR_VERSION_NUMBER < 1002003
diff --git a/qemu_compat.h b/qemu_compat.h
index f889391..ad556cc 100644
--- a/qemu_compat.h
+++ b/qemu_compat.h
@@ -39,7 +39,7 @@ typedef void (*virConnectDomainQemuMonitorEventCallback)(virConnectPtr conn,
void *opaque);
#endif
-int virConnectDomainQemuMonitorEventDeregisterCompat(virConnectPtr conn,
+int virConnectDomainQemuMonitorEventDeregisterWrapper(virConnectPtr conn,
int callbackID);
#ifndef VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX
diff --git a/secret_compat.go b/secret_compat.go
index b68b9d1..4444f6b 100644
--- a/secret_compat.go
+++ b/secret_compat.go
@@ -32,7 +32,7 @@ package libvirt
#include <assert.h>
#include "secret_compat.h"
-int virConnectSecretEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectSecretEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID)
{
#if LIBVIR_VERSION_NUMBER < 3000000
diff --git a/secret_compat.h b/secret_compat.h
index 745e672..d1e1b8a 100644
--- a/secret_compat.h
+++ b/secret_compat.h
@@ -52,7 +52,7 @@ typedef void (*virConnectSecretEventGenericCallback)(virConnectPtr conn,
void *opaque);
#endif
-int virConnectSecretEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectSecretEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID);
/* 2.2.1 */
diff --git a/secret_events.go b/secret_events.go
index 0dd2708..5860033 100644
--- a/secret_events.go
+++ b/secret_events.go
@@ -134,7 +134,7 @@ func (c *Connect) SecretEventDeregister(callbackId int) error {
return GetNotImplementedError("virConnectSecretEventDeregisterAny")
}
// Deregister the callback
- if i := int(C.virConnectSecretEventDeregisterAnyCompat(c.ptr, C.int(callbackId))); i != 0 {
+ if i := int(C.virConnectSecretEventDeregisterAnyWrapper(c.ptr, C.int(callbackId))); i != 0 {
return GetLastError()
}
return nil
diff --git a/storage_pool_compat.go b/storage_pool_compat.go
index 04ad85a..7ad66b3 100644
--- a/storage_pool_compat.go
+++ b/storage_pool_compat.go
@@ -32,7 +32,7 @@ package libvirt
#include <assert.h>
#include "storage_pool_compat.h"
-int virConnectStoragePoolEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectStoragePoolEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID)
{
#if LIBVIR_VERSION_NUMBER < 2000000
diff --git a/storage_pool_compat.h b/storage_pool_compat.h
index 175904e..cad74fd 100644
--- a/storage_pool_compat.h
+++ b/storage_pool_compat.h
@@ -78,7 +78,7 @@ typedef void (*virConnectStoragePoolEventGenericCallback)(virConnectPtr conn,
void *opaque);
#endif
-int virConnectStoragePoolEventDeregisterAnyCompat(virConnectPtr conn,
+int virConnectStoragePoolEventDeregisterAnyWrapper(virConnectPtr conn,
int callbackID);
diff --git a/storage_pool_events.go b/storage_pool_events.go
index cf98616..6bd4a2f 100644
--- a/storage_pool_events.go
+++ b/storage_pool_events.go
@@ -137,7 +137,7 @@ func (c *Connect) StoragePoolEventDeregister(callbackId int) error {
}
// Deregister the callback
- if i := int(C.virConnectStoragePoolEventDeregisterAnyCompat(c.ptr, C.int(callbackId))); i != 0 {
+ if i := int(C.virConnectStoragePoolEventDeregisterAnyWrapper(c.ptr, C.int(callbackId))); i != 0 {
return GetLastError()
}
return nil
diff --git a/storage_volume.go b/storage_volume.go
index 739cdb2..56a3026 100644
--- a/storage_volume.go
+++ b/storage_volume.go
@@ -171,7 +171,7 @@ func (v *StorageVol) GetInfoFlags(flags StorageVolInfoFlags) (*StorageVolInfo, e
}
var cinfo C.virStorageVolInfo
- result := C.virStorageVolGetInfoFlagsCompat(v.ptr, &cinfo, C.uint(flags))
+ result := C.virStorageVolGetInfoFlagsWrapper(v.ptr, &cinfo, C.uint(flags))
if result == -1 {
return nil, GetLastError()
}
diff --git a/storage_volume_compat.go b/storage_volume_compat.go
index 46f0e0b..a1f622e 100644
--- a/storage_volume_compat.go
+++ b/storage_volume_compat.go
@@ -32,7 +32,7 @@ package libvirt
#include <assert.h>
#include "storage_volume_compat.h"
-int virStorageVolGetInfoFlagsCompat(virStorageVolPtr vol,
+int virStorageVolGetInfoFlagsWrapper(virStorageVolPtr vol,
virStorageVolInfoPtr info,
unsigned int flags)
{
diff --git a/storage_volume_compat.h b/storage_volume_compat.h
index a20d04a..69e2dd8 100644
--- a/storage_volume_compat.h
+++ b/storage_volume_compat.h
@@ -29,7 +29,7 @@
/* 3.0.0 */
-int virStorageVolGetInfoFlagsCompat(virStorageVolPtr vol,
+int virStorageVolGetInfoFlagsWrapper(virStorageVolPtr vol,
virStorageVolInfoPtr info,
unsigned int flags);
diff --git a/stream.go b/stream.go
index 1282aef..3fc89ab 100644
--- a/stream.go
+++ b/stream.go
@@ -122,7 +122,7 @@ func (v *Stream) RecvFlags(p []byte, flags StreamRecvFlagsValues) (int, error) {
return 0, GetNotImplementedError("virStreamRecvFlags")
}
- n := C.virStreamRecvFlagsCompat(v.ptr, (*C.char)(unsafe.Pointer(&p[0])), C.size_t(len(p)), C.uint(flags))
+ n := C.virStreamRecvFlagsWrapper(v.ptr, (*C.char)(unsafe.Pointer(&p[0])), C.size_t(len(p)), C.uint(flags))
if n < 0 {
return 0, GetLastError()
}
@@ -140,7 +140,7 @@ func (v *Stream) RecvHole(flags uint) (int64, error) {
}
var len C.longlong
- ret := C.virStreamRecvHoleCompat(v.ptr, &len, C.uint(flags))
+ ret := C.virStreamRecvHoleWrapper(v.ptr, &len, C.uint(flags))
if ret < 0 {
return 0, GetLastError()
}
@@ -167,7 +167,7 @@ func (v *Stream) SendHole(len int64, flags uint32) error {
return GetNotImplementedError("virStreamSendHole")
}
- ret := C.virStreamSendHoleCompat(v.ptr, C.longlong(len), C.uint(flags))
+ ret := C.virStreamSendHoleWrapper(v.ptr, C.longlong(len), C.uint(flags))
if ret < 0 {
return GetLastError()
}
diff --git a/stream_compat.go b/stream_compat.go
index c5a3f2f..d718ae1 100644
--- a/stream_compat.go
+++ b/stream_compat.go
@@ -31,7 +31,7 @@ package libvirt
#include <assert.h>
#include "stream_compat.h"
-int virStreamRecvFlagsCompat(virStreamPtr st,
+int virStreamRecvFlagsWrapper(virStreamPtr st,
char *data,
size_t nbytes,
unsigned int flags)
@@ -43,7 +43,7 @@ int virStreamRecvFlagsCompat(virStreamPtr st,
#endif
}
-int virStreamSendHoleCompat(virStreamPtr st,
+int virStreamSendHoleWrapper(virStreamPtr st,
long long length,
unsigned int flags)
{
@@ -54,7 +54,7 @@ int virStreamSendHoleCompat(virStreamPtr st,
#endif
}
-int virStreamRecvHoleCompat(virStreamPtr st,
+int virStreamRecvHoleWrapper(virStreamPtr st,
long long *length,
unsigned int flags)
{
diff --git a/stream_compat.h b/stream_compat.h
index 1488d8f..9db2184 100644
--- a/stream_compat.h
+++ b/stream_compat.h
@@ -33,16 +33,16 @@
#define VIR_STREAM_RECV_STOP_AT_HOLE (1 << 0)
#endif
-int virStreamRecvFlagsCompat(virStreamPtr st,
+int virStreamRecvFlagsWrapper(virStreamPtr st,
char *data,
size_t nbytes,
unsigned int flags);
-int virStreamSendHoleCompat(virStreamPtr st,
+int virStreamSendHoleWrapper(virStreamPtr st,
long long length,
unsigned int flags);
-int virStreamRecvHoleCompat(virStreamPtr,
+int virStreamRecvHoleWrapper(virStreamPtr,
long long *length,
unsigned int flags);
--
2.17.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
