From nobody Sun Feb 8 05:40:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531747481758710.4776861907029; Mon, 16 Jul 2018 06:24:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F29F53003B3C; Mon, 16 Jul 2018 13:24:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A347CCA5EC; Mon, 16 Jul 2018 13:24:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 49A1B1853DA3; Mon, 16 Jul 2018 13:24:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6GDOUbh027973 for ; Mon, 16 Jul 2018 09:24:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id BEFA42027047; Mon, 16 Jul 2018 13:24:30 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84D502026D65; Mon, 16 Jul 2018 13:24:29 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:23:50 +0100 Message-Id: <20180716132423.10354-5-berrange@redhat.com> In-Reply-To: <20180716132423.10354-1-berrange@redhat.com> References: <20180716132423.10354-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [go PATCH 04/37] Use "Wrapper" or "Helper" as suffix for C functions X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 16 Jul 2018 13:24:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Instead of using "_cgo" for multiple scenarios, use "Wrapper" as suffix where a libvirt API is being wrapped, and "Helper" as a suffix where we are implementing a helper function (eg an event callback). Signed-off-by: Daniel P. Berrang=C3=A9 --- api_test.go | 2 +- callbacks.go | 4 +- callbacks_wrapper.go | 2 +- callbacks_wrapper.h | 2 +- connect.go | 6 +- connect_wrapper.go | 10 ++-- connect_wrapper.h | 4 +- domain_events.go | 100 ++++++++++++++++----------------- domain_events_wrapper.go | 50 ++++++++--------- domain_events_wrapper.h | 48 ++++++++-------- events.go | 6 +- events_wrapper.go | 6 +- events_wrapper.h | 6 +- network_events.go | 4 +- network_events_wrapper.go | 6 +- network_events_wrapper.h | 4 +- node_device_events.go | 8 +-- node_device_events_wrapper.go | 8 +-- node_device_events_wrapper.h | 6 +- qemu.go | 4 +- qemu_wrapper.go | 6 +- qemu_wrapper.h | 4 +- secret_events.go | 8 +-- secret_events_wrapper.go | 8 +-- secret_events_wrapper.h | 6 +- storage_pool_events.go | 8 +-- storage_pool_events_wrapper.go | 8 +-- storage_pool_events_wrapper.h | 6 +- stream.go | 10 ++-- stream_wrapper.go | 10 ++-- stream_wrapper.h | 10 ++-- 31 files changed, 185 insertions(+), 185 deletions(-) diff --git a/api_test.go b/api_test.go index 06938a6..ad94335 100644 --- a/api_test.go +++ b/api_test.go @@ -394,7 +394,7 @@ func ProcessFile(path string) []string { =20 defer file.Close() =20 - re, err :=3D regexp.Compile("C\\.((vir|VIR|LIBVIR)[a-zA-Z0-9_]+?)(Compat|= _cgo)?\\b") + re, err :=3D regexp.Compile("C\\.((vir|VIR|LIBVIR)[a-zA-Z0-9_]+?)(Compat|= Wrapper)?\\b") if err !=3D nil { panic(err) } diff --git a/callbacks.go b/callbacks.go index 05a755b..7b2d11b 100644 --- a/callbacks.go +++ b/callbacks.go @@ -40,13 +40,13 @@ package libvirt // // - Create a CGO function similar to the above function but with the // appropriate signature to be registered as a callback in C code -// (connErrCallback_cgo). Notably, it will have a void* argument +// (connErrCallbackHelper). Notably, it will have a void* argument // that should be cast to long to retrieve the callback ID. It // should be just a thin wrapper to transform the opaque argument to // a callback ID. // // - Create a CGO function which will be a wrapper around the C -// function to register the callback (virConnSetErrorFunc_cgo). Its +// function to register the callback (virConnSetErrorFuncWrapper). Its // only role is to transform a callback ID (long) to an opaque (void*) // and call the C function. // diff --git a/callbacks_wrapper.go b/callbacks_wrapper.go index 967aaab..64caf69 100644 --- a/callbacks_wrapper.go +++ b/callbacks_wrapper.go @@ -33,7 +33,7 @@ package libvirt #include "callbacks_wrapper.h" =20 extern void freeCallbackId(long); -void freeGoCallback_cgo(void* goCallbackId) { +void freeGoCallbackHelper(void* goCallbackId) { freeCallbackId((long)goCallbackId); } =20 diff --git a/callbacks_wrapper.h b/callbacks_wrapper.h index f37aba4..4b91f7a 100644 --- a/callbacks_wrapper.h +++ b/callbacks_wrapper.h @@ -27,6 +27,6 @@ #ifndef LIBVIRT_GO_CALLBACKS_WRAPPER_H__ #define LIBVIRT_GO_CALLBACKS_WRAPPER_H__ =20 -void freeGoCallback_cgo(void* goCallbackId); +void freeGoCallbackHelper(void* goCallbackId); =20 #endif /* LIBVIRT_GO_CALLBACKS_WRAPPER_H__ */ diff --git a/connect.go b/connect.go index 5c6d6ff..793e3c4 100644 --- a/connect.go +++ b/connect.go @@ -452,8 +452,8 @@ type CloseCallback func(conn *Connect, reason ConnectCl= oseReason) func (c *Connect) RegisterCloseCallback(callback CloseCallback) error { c.UnregisterCloseCallback() goCallbackId :=3D registerCallbackId(callback) - callbackPtr :=3D unsafe.Pointer(C.closeCallback_cgo) - res :=3D C.virConnectRegisterCloseCallback_cgo(c.ptr, C.virConnectCloseFu= nc(callbackPtr), C.long(goCallbackId)) + callbackPtr :=3D unsafe.Pointer(C.closeCallbackHelper) + res :=3D C.virConnectRegisterCloseCallbackHelper(c.ptr, C.virConnectClose= Func(callbackPtr), C.long(goCallbackId)) if res !=3D 0 { freeCallbackId(goCallbackId) return GetLastError() @@ -469,7 +469,7 @@ func (c *Connect) UnregisterCloseCallback() error { if connData.closeCallbackId =3D=3D nil { return nil } - callbackPtr :=3D unsafe.Pointer(C.closeCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.closeCallbackHelper) res :=3D C.virConnectUnregisterCloseCallback(c.ptr, C.virConnectCloseFunc= (callbackPtr)) if res !=3D 0 { return GetLastError() diff --git a/connect_wrapper.go b/connect_wrapper.go index a686e29..ec2da69 100644 --- a/connect_wrapper.go +++ b/connect_wrapper.go @@ -34,21 +34,21 @@ package libvirt #include "callbacks_wrapper.h" =20 extern void closeCallback(virConnectPtr, int, long); -void closeCallback_cgo(virConnectPtr conn, int reason, void *opaque) +void closeCallbackHelper(virConnectPtr conn, int reason, void *opaque) { closeCallback(conn, reason, (long)opaque); } =20 -int virConnectRegisterCloseCallback_cgo(virConnectPtr c, virConnectCloseFu= nc cb, long goCallbackId) +int virConnectRegisterCloseCallbackHelper(virConnectPtr c, virConnectClose= Func cb, long goCallbackId) { void *id =3D (void*)goCallbackId; - return virConnectRegisterCloseCallback(c, cb, id, freeGoCallback_cgo); + return virConnectRegisterCloseCallback(c, cb, id, freeGoCallbackHelper= ); } =20 #include =20 extern int connectAuthCallback(virConnectCredentialPtr, unsigned int, int); -int connectAuthCallback_cgo(virConnectCredentialPtr cred, unsigned int ncr= ed, void *cbdata) +int connectAuthCallbackHelper(virConnectCredentialPtr cred, unsigned int n= cred, void *cbdata) { int *callbackID =3D cbdata; =20 @@ -60,7 +60,7 @@ virConnectPtr virConnectOpenAuthWrap(const char *name, in= t *credtype, uint ncred virConnectAuth auth =3D { .credtype =3D credtype, .ncredtype =3D ncredtype, - .cb =3D connectAuthCallback_cgo, + .cb =3D connectAuthCallbackHelper, .cbdata =3D &callbackID, }; =20 diff --git a/connect_wrapper.h b/connect_wrapper.h index 5c59320..60374c7 100644 --- a/connect_wrapper.h +++ b/connect_wrapper.h @@ -26,8 +26,8 @@ =20 #ifndef LIBVIRT_GO_CONNECT_WRAPPER_H__ #define LIBVIRT_GO_CONNECT_WRAPPER_H__ -void closeCallback_cgo(virConnectPtr conn, int reason, void *opaque); -int virConnectRegisterCloseCallback_cgo(virConnectPtr c, virConnectCloseFu= nc cb, long goCallbackId); +void closeCallbackHelper(virConnectPtr conn, int reason, void *opaque); +int virConnectRegisterCloseCallbackHelper(virConnectPtr c, virConnectClose= Func cb, long goCallbackId); =20 virConnectPtr virConnectOpenAuthWrap(const char *name, int *credtype, uint= ncredtype, int callbackID, unsigned int flags); =20 diff --git a/domain_events.go b/domain_events.go index 6d4ff24..5d21b01 100644 --- a/domain_events.go +++ b/domain_events.go @@ -963,12 +963,12 @@ func domainEventBlockThresholdCallback(c C.virConnect= Ptr, d C.virDomainPtr, dev func (c *Connect) DomainEventLifecycleRegister(dom *Domain, callback Domai= nEventLifecycleCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventLifecycleCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventLifecycleCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_LIFECYCLE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -982,12 +982,12 @@ func (c *Connect) DomainEventLifecycleRegister(dom *D= omain, callback DomainEvent func (c *Connect) DomainEventRebootRegister(dom *Domain, callback DomainEv= entGenericCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventGenericCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventGenericCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_REBOOT, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1001,12 +1001,12 @@ func (c *Connect) DomainEventRebootRegister(dom *Do= main, callback DomainEventGen func (c *Connect) DomainEventRTCChangeRegister(dom *Domain, callback Domai= nEventRTCChangeCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventRTCChangeCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventRTCChangeCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1020,12 +1020,12 @@ func (c *Connect) DomainEventRTCChangeRegister(dom = *Domain, callback DomainEvent func (c *Connect) DomainEventWatchdogRegister(dom *Domain, callback Domain= EventWatchdogCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventWatchdogCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventWatchdogCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_WATCHDOG, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1039,12 +1039,12 @@ func (c *Connect) DomainEventWatchdogRegister(dom *= Domain, callback DomainEventW func (c *Connect) DomainEventIOErrorRegister(dom *Domain, callback DomainE= ventIOErrorCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventIOErrorCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventIOErrorCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_IO_ERROR, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1058,12 +1058,12 @@ func (c *Connect) DomainEventIOErrorRegister(dom *D= omain, callback DomainEventIO func (c *Connect) DomainEventGraphicsRegister(dom *Domain, callback Domain= EventGraphicsCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventGraphicsCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventGraphicsCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_GRAPHICS, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1077,12 +1077,12 @@ func (c *Connect) DomainEventGraphicsRegister(dom *= Domain, callback DomainEventG func (c *Connect) DomainEventIOErrorReasonRegister(dom *Domain, callback D= omainEventIOErrorReasonCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventIOErrorReasonCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventIOErrorReasonCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1096,12 +1096,12 @@ func (c *Connect) DomainEventIOErrorReasonRegister(= dom *Domain, callback DomainE func (c *Connect) DomainEventControlErrorRegister(dom *Domain, callback Do= mainEventGenericCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventGenericCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventGenericCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_CONTROL_ERROR, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1115,12 +1115,12 @@ func (c *Connect) DomainEventControlErrorRegister(d= om *Domain, callback DomainEv func (c *Connect) DomainEventBlockJobRegister(dom *Domain, callback Domain= EventBlockJobCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventBlockJobCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventBlockJobCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_BLOCK_JOB, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1134,12 +1134,12 @@ func (c *Connect) DomainEventBlockJobRegister(dom *= Domain, callback DomainEventB func (c *Connect) DomainEventDiskChangeRegister(dom *Domain, callback Doma= inEventDiskChangeCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventDiskChangeCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventDiskChangeCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_DISK_CHANGE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1153,12 +1153,12 @@ func (c *Connect) DomainEventDiskChangeRegister(dom= *Domain, callback DomainEven func (c *Connect) DomainEventTrayChangeRegister(dom *Domain, callback Doma= inEventTrayChangeCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventTrayChangeCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventTrayChangeCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_TRAY_CHANGE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1172,12 +1172,12 @@ func (c *Connect) DomainEventTrayChangeRegister(dom= *Domain, callback DomainEven func (c *Connect) DomainEventPMWakeupRegister(dom *Domain, callback Domain= EventPMWakeupCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventPMWakeupCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventPMWakeupCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_PMWAKEUP, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1191,12 +1191,12 @@ func (c *Connect) DomainEventPMWakeupRegister(dom *= Domain, callback DomainEventP func (c *Connect) DomainEventPMSuspendRegister(dom *Domain, callback Domai= nEventPMSuspendCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventPMSuspendCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventPMSuspendCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_PMSUSPEND, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1210,12 +1210,12 @@ func (c *Connect) DomainEventPMSuspendRegister(dom = *Domain, callback DomainEvent func (c *Connect) DomainEventBalloonChangeRegister(dom *Domain, callback D= omainEventBalloonChangeCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventBalloonChangeCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventBalloonChangeCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1229,12 +1229,12 @@ func (c *Connect) DomainEventBalloonChangeRegister(= dom *Domain, callback DomainE func (c *Connect) DomainEventPMSuspendDiskRegister(dom *Domain, callback D= omainEventPMSuspendDiskCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventPMSuspendDiskCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventPMSuspendDiskCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1248,12 +1248,12 @@ func (c *Connect) DomainEventPMSuspendDiskRegister(= dom *Domain, callback DomainE func (c *Connect) DomainEventDeviceRemovedRegister(dom *Domain, callback D= omainEventDeviceRemovedCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventDeviceRemovedCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventDeviceRemovedCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1267,12 +1267,12 @@ func (c *Connect) DomainEventDeviceRemovedRegister(= dom *Domain, callback DomainE func (c *Connect) DomainEventBlockJob2Register(dom *Domain, callback Domai= nEventBlockJobCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventBlockJobCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventBlockJobCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1286,12 +1286,12 @@ func (c *Connect) DomainEventBlockJob2Register(dom = *Domain, callback DomainEvent func (c *Connect) DomainEventTunableRegister(dom *Domain, callback DomainE= ventTunableCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventTunableCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventTunableCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_TUNABLE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1305,12 +1305,12 @@ func (c *Connect) DomainEventTunableRegister(dom *D= omain, callback DomainEventTu func (c *Connect) DomainEventAgentLifecycleRegister(dom *Domain, callback = DomainEventAgentLifecycleCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventAgentLifecycleCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventAgentLifecycleCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1324,12 +1324,12 @@ func (c *Connect) DomainEventAgentLifecycleRegister= (dom *Domain, callback Domain func (c *Connect) DomainEventDeviceAddedRegister(dom *Domain, callback Dom= ainEventDeviceAddedCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventDeviceAddedCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventDeviceAddedCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1343,12 +1343,12 @@ func (c *Connect) DomainEventDeviceAddedRegister(do= m *Domain, callback DomainEve func (c *Connect) DomainEventMigrationIterationRegister(dom *Domain, callb= ack DomainEventMigrationIterationCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventMigrationIterationCallback_c= go) + callbackPtr :=3D unsafe.Pointer(C.domainEventMigrationIterationCallbackHe= lper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1362,12 +1362,12 @@ func (c *Connect) DomainEventMigrationIterationRegi= ster(dom *Domain, callback Do func (c *Connect) DomainEventJobCompletedRegister(dom *Domain, callback Do= mainEventJobCompletedCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventJobCompletedCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventJobCompletedCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1381,12 +1381,12 @@ func (c *Connect) DomainEventJobCompletedRegister(d= om *Domain, callback DomainEv func (c *Connect) DomainEventDeviceRemovalFailedRegister(dom *Domain, call= back DomainEventDeviceRemovalFailedCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventDeviceRemovalFailedCallback_= cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventDeviceRemovalFailedCallbackH= elper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1400,12 +1400,12 @@ func (c *Connect) DomainEventDeviceRemovalFailedReg= ister(dom *Domain, callback D func (c *Connect) DomainEventMetadataChangeRegister(dom *Domain, callback = DomainEventMetadataChangeCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventMetadataChangeCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventMetadataChangeCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -1419,12 +1419,12 @@ func (c *Connect) DomainEventMetadataChangeRegister= (dom *Domain, callback Domain func (c *Connect) DomainEventBlockThresholdRegister(dom *Domain, callback = DomainEventBlockThresholdCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainEventBlockThresholdCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainEventBlockThresholdCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainEventRegisterAny_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainEventRegisterAnyWrapper(c.ptr, cdom, C.VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD, C.virConnectDomainEventGenericCallback(callbackPtr), C.long(goCallBackId)) diff --git a/domain_events_wrapper.go b/domain_events_wrapper.go index ad0f803..799945b 100644 --- a/domain_events_wrapper.go +++ b/domain_events_wrapper.go @@ -35,34 +35,34 @@ package libvirt #include =20 extern void domainEventLifecycleCallback(virConnectPtr, virDomainPtr, int,= int, int); -void domainEventLifecycleCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventLifecycleCallbackHelper(virConnectPtr c, virDomainPtr d, int event, int detail, void *data) { domainEventLifecycleCallback(c, d, event, detail, (int)(intptr_t)data); } =20 extern void domainEventGenericCallback(virConnectPtr, virDomainPtr, int); -void domainEventGenericCallback_cgo(virConnectPtr c, virDomainPtr d, void = *data) +void domainEventGenericCallbackHelper(virConnectPtr c, virDomainPtr d, voi= d *data) { domainEventGenericCallback(c, d, (int)(intptr_t)data); } =20 extern void domainEventRTCChangeCallback(virConnectPtr, virDomainPtr, long= long, int); -void domainEventRTCChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventRTCChangeCallbackHelper(virConnectPtr c, virDomainPtr d, long long utcoffset, void *data) { domainEventRTCChangeCallback(c, d, utcoffset, (int)(intptr_t)data); } =20 extern void domainEventWatchdogCallback(virConnectPtr, virDomainPtr, int, = int); -void domainEventWatchdogCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventWatchdogCallbackHelper(virConnectPtr c, virDomainPtr d, int action, void *data) { domainEventWatchdogCallback(c, d, action, (int)(intptr_t)data); } =20 extern void domainEventIOErrorCallback(virConnectPtr, virDomainPtr, const = char *, const char *, int, int); -void domainEventIOErrorCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventIOErrorCallbackHelper(virConnectPtr c, virDomainPtr d, const char *srcPath, const char *devAli= as, int action, void *data) { @@ -72,7 +72,7 @@ void domainEventIOErrorCallback_cgo(virConnectPtr c, virD= omainPtr d, extern void domainEventGraphicsCallback(virConnectPtr, virDomainPtr, int, = const virDomainEventGraphicsAddress *, const virDomainEventGraphicsAddres= s *, const char *, const virDomainEventGraphicsSubjec= t *, int); -void domainEventGraphicsCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventGraphicsCallbackHelper(virConnectPtr c, virDomainPtr d, int phase, const virDomainEventGraphic= sAddress *local, const virDomainEventGraphicsAddress *r= emote, const char *authScheme, @@ -83,7 +83,7 @@ void domainEventGraphicsCallback_cgo(virConnectPtr c, vir= DomainPtr d, =20 extern void domainEventIOErrorReasonCallback(virConnectPtr, virDomainPtr, = const char *, const char *, int, const char *, int); -void domainEventIOErrorReasonCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventIOErrorReasonCallbackHelper(virConnectPtr c, virDomainPtr = d, const char *srcPath, const char *= devAlias, int action, const char *reason, v= oid *data) { @@ -91,7 +91,7 @@ void domainEventIOErrorReasonCallback_cgo(virConnectPtr c= , virDomainPtr d, } =20 extern void domainEventBlockJobCallback(virConnectPtr, virDomainPtr, const= char *, int, int, int); -void domainEventBlockJobCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventBlockJobCallbackHelper(virConnectPtr c, virDomainPtr d, const char *disk, int type, int status= , void *data) { domainEventBlockJobCallback(c, d, disk, type, status, (int)(intptr_t)d= ata); @@ -99,7 +99,7 @@ void domainEventBlockJobCallback_cgo(virConnectPtr c, vir= DomainPtr d, =20 extern void domainEventDiskChangeCallback(virConnectPtr, virDomainPtr, con= st char *, const char *, const char *, int, int); -void domainEventDiskChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventDiskChangeCallbackHelper(virConnectPtr c, virDomainPtr d, const char *oldSrcPath, const char *= newSrcPath, const char *devAlias, int reason, vo= id *data) { @@ -107,49 +107,49 @@ void domainEventDiskChangeCallback_cgo(virConnectPtr = c, virDomainPtr d, } =20 extern void domainEventTrayChangeCallback(virConnectPtr, virDomainPtr, con= st char *, int, int); -void domainEventTrayChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventTrayChangeCallbackHelper(virConnectPtr c, virDomainPtr d, const char *devAlias, int reason, vo= id *data) { domainEventTrayChangeCallback(c, d, devAlias, reason, (int)(intptr_t)d= ata); } =20 extern void domainEventPMSuspendCallback(virConnectPtr, virDomainPtr, int,= int); -void domainEventPMSuspendCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventPMSuspendCallbackHelper(virConnectPtr c, virDomainPtr d, int reason, void *data) { domainEventPMSuspendCallback(c, d, reason, (int)(intptr_t)data); } =20 extern void domainEventPMWakeupCallback(virConnectPtr, virDomainPtr, int, = int); -void domainEventPMWakeupCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventPMWakeupCallbackHelper(virConnectPtr c, virDomainPtr d, int reason, void *data) { domainEventPMWakeupCallback(c, d, reason, (int)(intptr_t)data); } =20 extern void domainEventPMSuspendDiskCallback(virConnectPtr, virDomainPtr, = int, int); -void domainEventPMSuspendDiskCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventPMSuspendDiskCallbackHelper(virConnectPtr c, virDomainPtr = d, int reason, void *data) { domainEventPMSuspendDiskCallback(c, d, reason, (int)(intptr_t)data); } =20 extern void domainEventBalloonChangeCallback(virConnectPtr, virDomainPtr, = unsigned long long, int); -void domainEventBalloonChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventBalloonChangeCallbackHelper(virConnectPtr c, virDomainPtr = d, unsigned long long actual, void *= data) { domainEventBalloonChangeCallback(c, d, actual, (int)(intptr_t)data); } =20 extern void domainEventDeviceRemovedCallback(virConnectPtr, virDomainPtr, = const char *, int); -void domainEventDeviceRemovedCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventDeviceRemovedCallbackHelper(virConnectPtr c, virDomainPtr = d, const char *devAlias, void *data) { domainEventDeviceRemovedCallback(c, d, devAlias, (int)(intptr_t)data); } =20 extern void domainEventTunableCallback(virConnectPtr, virDomainPtr, virTyp= edParameterPtr, int, int); -void domainEventTunableCallback_cgo(virConnectPtr conn, +void domainEventTunableCallbackHelper(virConnectPtr conn, virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -159,7 +159,7 @@ void domainEventTunableCallback_cgo(virConnectPtr conn, } =20 extern void domainEventAgentLifecycleCallback(virConnectPtr, virDomainPtr,= int, int, int); -void domainEventAgentLifecycleCallback_cgo(virConnectPtr conn, +void domainEventAgentLifecycleCallbackHelper(virConnectPtr conn, virDomainPtr dom, int state, int reason, @@ -169,7 +169,7 @@ void domainEventAgentLifecycleCallback_cgo(virConnectPt= r conn, } =20 extern void domainEventDeviceAddedCallback(virConnectPtr, virDomainPtr, co= nst char *, int); -void domainEventDeviceAddedCallback_cgo(virConnectPtr conn, +void domainEventDeviceAddedCallbackHelper(virConnectPtr conn, virDomainPtr dom, const char *devAlias, void *opaque) @@ -178,7 +178,7 @@ void domainEventDeviceAddedCallback_cgo(virConnectPtr c= onn, } =20 extern void domainEventMigrationIterationCallback(virConnectPtr, virDomain= Ptr, int, int); -void domainEventMigrationIterationCallback_cgo(virConnectPtr conn, +void domainEventMigrationIterationCallbackHelper(virConnectPtr conn, virDomainPtr dom, int iteration, void *opaque) @@ -187,7 +187,7 @@ void domainEventMigrationIterationCallback_cgo(virConne= ctPtr conn, } =20 extern void domainEventJobCompletedCallback(virConnectPtr, virDomainPtr, v= irTypedParameterPtr, int, int); -void domainEventJobCompletedCallback_cgo(virConnectPtr conn, +void domainEventJobCompletedCallbackHelper(virConnectPtr conn, virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -197,7 +197,7 @@ void domainEventJobCompletedCallback_cgo(virConnectPtr = conn, } =20 extern void domainEventDeviceRemovalFailedCallback(virConnectPtr, virDomai= nPtr, const char *, int); -void domainEventDeviceRemovalFailedCallback_cgo(virConnectPtr conn, +void domainEventDeviceRemovalFailedCallbackHelper(virConnectPtr conn, virDomainPtr dom, const char *devAlias, void *opaque) @@ -206,7 +206,7 @@ void domainEventDeviceRemovalFailedCallback_cgo(virConn= ectPtr conn, } =20 extern void domainEventMetadataChangeCallback(virConnectPtr, virDomainPtr,= int, const char *, int); -void domainEventMetadataChangeCallback_cgo(virConnectPtr conn, +void domainEventMetadataChangeCallbackHelper(virConnectPtr conn, virDomainPtr dom, int type, const char *nsuri, @@ -216,7 +216,7 @@ void domainEventMetadataChangeCallback_cgo(virConnectPt= r conn, } =20 extern void domainEventBlockThresholdCallback(virConnectPtr, virDomainPtr,= const char *, const char *, unsigned long long, unsigned long long, int); -void domainEventBlockThresholdCallback_cgo(virConnectPtr conn, +void domainEventBlockThresholdCallbackHelper(virConnectPtr conn, virDomainPtr dom, const char *dev, const char *path, @@ -227,11 +227,11 @@ void domainEventBlockThresholdCallback_cgo(virConnect= Ptr conn, domainEventBlockThresholdCallback(conn, dom, dev, path, threshold, exc= ess, (int)(intptr_t)opaque); } =20 -int virConnectDomainEventRegisterAny_cgo(virConnectPtr c, virDomainPtr d, +int virConnectDomainEventRegisterAnyWrapper(virConnectPtr c, virDomainPtr= d, int eventID, virConnectDomainEven= tGenericCallback cb, long goCallbackId) { void* id =3D (void*)goCallbackId; - return virConnectDomainEventRegisterAny(c, d, eventID, cb, id, freeGoC= allback_cgo); + return virConnectDomainEventRegisterAny(c, d, eventID, cb, id, freeGoC= allbackHelper); } =20 */ diff --git a/domain_events_wrapper.h b/domain_events_wrapper.h index a0e494e..55cf48e 100644 --- a/domain_events_wrapper.h +++ b/domain_events_wrapper.h @@ -27,88 +27,88 @@ #ifndef LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ #define LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ =20 -void domainEventLifecycleCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventLifecycleCallbackHelper(virConnectPtr c, virDomainPtr d, int event, int detail, void* data); =20 -void domainEventGenericCallback_cgo(virConnectPtr c, virDomainPtr d, void*= data); +void domainEventGenericCallbackHelper(virConnectPtr c, virDomainPtr d, voi= d* data); =20 -void domainEventRTCChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventRTCChangeCallbackHelper(virConnectPtr c, virDomainPtr d, long long utcoffset, void* data); =20 -void domainEventWatchdogCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventWatchdogCallbackHelper(virConnectPtr c, virDomainPtr d, int action, void* data); =20 -void domainEventIOErrorCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventIOErrorCallbackHelper(virConnectPtr c, virDomainPtr d, const char *srcPath, const char *devAli= as, int action, void* data); =20 -void domainEventGraphicsCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventGraphicsCallbackHelper(virConnectPtr c, virDomainPtr d, int phase, const virDomainEventGraphic= sAddress *local, const virDomainEventGraphicsAddress *r= emote, const char *authScheme, const virDomainEventGraphicsSubject *s= ubject, void* data); =20 -void domainEventIOErrorReasonCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventIOErrorReasonCallbackHelper(virConnectPtr c, virDomainPtr = d, const char *srcPath, const char *= devAlias, int action, const char *reason, v= oid* data); =20 -void domainEventBlockJobCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventBlockJobCallbackHelper(virConnectPtr c, virDomainPtr d, const char *disk, int type, int status= , void* data); =20 -void domainEventDiskChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventDiskChangeCallbackHelper(virConnectPtr c, virDomainPtr d, const char *oldSrcPath, const char *= newSrcPath, const char *devAlias, int reason, vo= id* data); =20 -void domainEventTrayChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventTrayChangeCallbackHelper(virConnectPtr c, virDomainPtr d, const char *devAlias, int reason, vo= id* data); =20 -void domainEventPMSuspendCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventPMSuspendCallbackHelper(virConnectPtr c, virDomainPtr d, int reason, void* data); =20 -void domainEventPMWakeupCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventPMWakeupCallbackHelper(virConnectPtr c, virDomainPtr d, int reason, void* data); =20 -void domainEventPMSuspendDiskCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventPMSuspendDiskCallbackHelper(virConnectPtr c, virDomainPtr = d, int reason, void* data); =20 -void domainEventBalloonChangeCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventBalloonChangeCallbackHelper(virConnectPtr c, virDomainPtr = d, unsigned long long actual, void* = data); =20 -void domainEventDeviceRemovedCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainEventDeviceRemovedCallbackHelper(virConnectPtr c, virDomainPtr = d, const char *devAlias, void* data); -void domainEventTunableCallback_cgo(virConnectPtr conn, +void domainEventTunableCallbackHelper(virConnectPtr conn, virDomainPtr dom, virTypedParameterPtr params, int nparams, void *opaque); -void domainEventAgentLifecycleCallback_cgo(virConnectPtr conn, +void domainEventAgentLifecycleCallbackHelper(virConnectPtr conn, virDomainPtr dom, int state, int reason, void *opaque); -void domainEventDeviceAddedCallback_cgo(virConnectPtr conn, +void domainEventDeviceAddedCallbackHelper(virConnectPtr conn, virDomainPtr dom, const char *devAlias, void *opaque); -void domainEventMigrationIterationCallback_cgo(virConnectPtr conn, +void domainEventMigrationIterationCallbackHelper(virConnectPtr conn, virDomainPtr dom, int iteration, void *opaque); -void domainEventJobCompletedCallback_cgo(virConnectPtr conn, +void domainEventJobCompletedCallbackHelper(virConnectPtr conn, virDomainPtr dom, virTypedParameterPtr params, int nparams, void *opaque); -void domainEventDeviceRemovalFailedCallback_cgo(virConnectPtr conn, +void domainEventDeviceRemovalFailedCallbackHelper(virConnectPtr conn, virDomainPtr dom, const char *devAlias, void *opaque); -void domainEventMetadataChangeCallback_cgo(virConnectPtr conn, +void domainEventMetadataChangeCallbackHelper(virConnectPtr conn, virDomainPtr dom, int type, const char *nsuri, void *opaque); -void domainEventBlockThresholdCallback_cgo(virConnectPtr conn, +void domainEventBlockThresholdCallbackHelper(virConnectPtr conn, virDomainPtr dom, const char *dev, const char *path, @@ -116,7 +116,7 @@ void domainEventBlockThresholdCallback_cgo(virConnectPt= r conn, unsigned long long excess, void *opaque); =20 -int virConnectDomainEventRegisterAny_cgo(virConnectPtr c, virDomainPtr d, +int virConnectDomainEventRegisterAnyWrapper(virConnectPtr c, virDomainPtr= d, int eventID, virConnectDomainEven= tGenericCallback cb, long goCallbackId); =20 diff --git a/events.go b/events.go index 74d480a..3f8d3a9 100644 --- a/events.go +++ b/events.go @@ -77,7 +77,7 @@ func eventHandleCallback(watch int, fd int, events int, c= allbackID int) { func EventAddHandle(fd int, events EventHandleType, callback EventHandleCa= llback) (int, error) { callbackID :=3D registerCallbackId(callback) =20 - ret :=3D C.virEventAddHandle_cgo((C.int)(fd), (C.int)(events), (C.int)(ca= llbackID)) + ret :=3D C.virEventAddHandleWrapper((C.int)(fd), (C.int)(events), (C.int)= (callbackID)) if ret =3D=3D -1 { return 0, GetLastError() } @@ -113,7 +113,7 @@ func eventTimeoutCallback(timer int, callbackID int) { func EventAddTimeout(freq int, callback EventTimeoutCallback) (int, error)= { callbackID :=3D registerCallbackId(callback) =20 - ret :=3D C.virEventAddTimeout_cgo((C.int)(freq), (C.int)(callbackID)) + ret :=3D C.virEventAddTimeoutWrapper((C.int)(freq), (C.int)(callbackID)) if ret =3D=3D -1 { return 0, GetLastError() } @@ -173,7 +173,7 @@ var eventLoopImpl EventLoop // See also https://libvirt.org/html/libvirt-libvirt-event.html#virEventRe= gisterImpl func EventRegisterImpl(impl EventLoop) { eventLoopImpl =3D impl - C.virEventRegisterImpl_cgo() + C.virEventRegisterImplWrapper() } =20 //export eventAddHandleFunc diff --git a/events_wrapper.go b/events_wrapper.go index d17b054..6e3416f 100644 --- a/events_wrapper.go +++ b/events_wrapper.go @@ -41,7 +41,7 @@ static void eventAddHandleHelper(int watch, int fd, int e= vents, void *opaque) eventHandleCallback(watch, fd, events, (int)(intptr_t)opaque); } =20 -int virEventAddHandle_cgo(int fd, int events, int callbackID) +int virEventAddHandleWrapper(int fd, int events, int callbackID) { return virEventAddHandle(fd, events, eventAddHandleHelper, (void *)(in= tptr_t)callbackID, NULL); } @@ -53,7 +53,7 @@ static void eventAddTimeoutHelper(int timer, void *opaque) eventTimeoutCallback(timer, (int)(intptr_t)opaque); } =20 -int virEventAddTimeout_cgo(int freq, int callbackID) +int virEventAddTimeoutWrapper(int freq, int callbackID) { return virEventAddTimeout(freq, eventAddTimeoutHelper, (void *)(intptr= _t)callbackID, NULL); } @@ -96,7 +96,7 @@ int eventRemoveTimeoutFuncHelper(int timer) } =20 =20 -void virEventRegisterImpl_cgo(void) +void virEventRegisterImplWrapper(void) { virEventRegisterImpl(eventAddHandleFuncHelper, eventUpdateHandleFuncHelper, diff --git a/events_wrapper.h b/events_wrapper.h index d3e78d8..8420909 100644 --- a/events_wrapper.h +++ b/events_wrapper.h @@ -27,9 +27,9 @@ #ifndef LIBVIRT_GO_EVENTS_WRAPPER_H__ #define LIBVIRT_GO_EVENTS_WRAPPER_H__ =20 -int virEventAddHandle_cgo(int fd, int events, int callbackID); -int virEventAddTimeout_cgo(int freq, int callbackID); -void virEventRegisterImpl_cgo(void); +int virEventAddHandleWrapper(int fd, int events, int callbackID); +int virEventAddTimeoutWrapper(int freq, int callbackID); +void virEventRegisterImplWrapper(void); =20 void eventHandleCallbackInvoke(int watch, int fd, int events, uintptr_t ca= llback, uintptr_t opaque); void eventTimeoutCallbackInvoke(int timer, uintptr_t callback, uintptr_t o= paque); diff --git a/network_events.go b/network_events.go index 15b2f55..39cc62b 100644 --- a/network_events.go +++ b/network_events.go @@ -74,12 +74,12 @@ func (c *Connect) NetworkEventLifecycleRegister(net *Ne= twork, callback NetworkEv return 0, GetNotImplementedError("virConnectNetworkEventRegisterAny") } =20 - callbackPtr :=3D unsafe.Pointer(C.networkEventLifecycleCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.networkEventLifecycleCallbackHelper) var cnet C.virNetworkPtr if net !=3D nil { cnet =3D net.ptr } - ret :=3D C.virConnectNetworkEventRegisterAny_cgo(c.ptr, cnet, + ret :=3D C.virConnectNetworkEventRegisterAnyWrapper(c.ptr, cnet, C.VIR_NETWORK_EVENT_ID_LIFECYCLE, C.virConnectNetworkEventGenericCallback(callbackPtr), C.long(goCallBackId)) diff --git a/network_events_wrapper.go b/network_events_wrapper.go index 613e32b..ea892cf 100644 --- a/network_events_wrapper.go +++ b/network_events_wrapper.go @@ -37,20 +37,20 @@ package libvirt #include =20 extern void networkEventLifecycleCallback(virConnectPtr, virNetworkPtr, in= t, int, int); -void networkEventLifecycleCallback_cgo(virConnectPtr c, virNetworkPtr d, +void networkEventLifecycleCallbackHelper(virConnectPtr c, virNetworkPtr d, int event, int detail, void *data) { networkEventLifecycleCallback(c, d, event, detail, (int)(intptr_t)data= ); } =20 -int virConnectNetworkEventRegisterAny_cgo(virConnectPtr c, virNetworkPtr = d, +int virConnectNetworkEventRegisterAnyWrapper(virConnectPtr c, virNetworkP= tr d, int eventID, virConnectNetworkEve= ntGenericCallback cb, long goCallbackId) { void* id =3D (void*)goCallbackId; #if LIBVIR_VERSION_NUMBER < 1002001 assert(0); // Caller should have checked version #else - return virConnectNetworkEventRegisterAny(c, d, eventID, cb, id, freeGo= Callback_cgo); + return virConnectNetworkEventRegisterAny(c, d, eventID, cb, id, freeGo= CallbackHelper); #endif } =20 diff --git a/network_events_wrapper.h b/network_events_wrapper.h index 13ffce1..1b73369 100644 --- a/network_events_wrapper.h +++ b/network_events_wrapper.h @@ -27,10 +27,10 @@ #ifndef LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__ #define LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__ =20 -void networkEventLifecycleCallback_cgo(virConnectPtr c, virNetworkPtr d, +void networkEventLifecycleCallbackHelper(virConnectPtr c, virNetworkPtr d, int event, int detail, void* data); =20 -int virConnectNetworkEventRegisterAny_cgo(virConnectPtr c, virNetworkPtr = d, +int virConnectNetworkEventRegisterAnyWrapper(virConnectPtr c, virNetworkP= tr d, int eventID, virConnectNetworkEve= ntGenericCallback cb, long goCallbackId); =20 diff --git a/node_device_events.go b/node_device_events.go index 01c2245..1be2c73 100644 --- a/node_device_events.go +++ b/node_device_events.go @@ -91,12 +91,12 @@ func (c *Connect) NodeDeviceEventLifecycleRegister(devi= ce *NodeDevice, callback } goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.nodeDeviceEventLifecycleCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.nodeDeviceEventLifecycleCallbackHelper) var cdevice C.virNodeDevicePtr if device !=3D nil { cdevice =3D device.ptr } - ret :=3D C.virConnectNodeDeviceEventRegisterAny_cgo(c.ptr, cdevice, + ret :=3D C.virConnectNodeDeviceEventRegisterAnyWrapper(c.ptr, cdevice, C.VIR_NODE_DEVICE_EVENT_ID_LIFECYCLE, C.virConnectNodeDeviceEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -110,12 +110,12 @@ func (c *Connect) NodeDeviceEventLifecycleRegister(de= vice *NodeDevice, callback func (c *Connect) NodeDeviceEventUpdateRegister(device *NodeDevice, callba= ck NodeDeviceEventGenericCallback) (int, error) { goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.nodeDeviceEventGenericCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.nodeDeviceEventGenericCallbackHelper) var cdevice C.virNodeDevicePtr if device !=3D nil { cdevice =3D device.ptr } - ret :=3D C.virConnectNodeDeviceEventRegisterAny_cgo(c.ptr, cdevice, + ret :=3D C.virConnectNodeDeviceEventRegisterAnyWrapper(c.ptr, cdevice, C.VIR_NODE_DEVICE_EVENT_ID_UPDATE, C.virConnectNodeDeviceEventGenericCallback(callbackPtr), C.long(goCallBackId)) diff --git a/node_device_events_wrapper.go b/node_device_events_wrapper.go index a34fa6f..ff7b6e4 100644 --- a/node_device_events_wrapper.go +++ b/node_device_events_wrapper.go @@ -37,26 +37,26 @@ package libvirt #include =20 extern void nodeDeviceEventLifecycleCallback(virConnectPtr, virNodeDeviceP= tr, int, int, int); -void nodeDeviceEventLifecycleCallback_cgo(virConnectPtr c, virNodeDevicePt= r d, +void nodeDeviceEventLifecycleCallbackHelper(virConnectPtr c, virNodeDevice= Ptr d, int event, int detail, void *da= ta) { nodeDeviceEventLifecycleCallback(c, d, event, detail, (int)(intptr_t)d= ata); } =20 extern void nodeDeviceEventGenericCallback(virConnectPtr, virNodeDevicePtr= , int); -void nodeDeviceEventGenericCallback_cgo(virConnectPtr c, virNodeDevicePtr = d, void *data) +void nodeDeviceEventGenericCallbackHelper(virConnectPtr c, virNodeDevicePt= r d, void *data) { nodeDeviceEventGenericCallback(c, d, (int)(intptr_t)data); } =20 -int virConnectNodeDeviceEventRegisterAny_cgo(virConnectPtr c, virNodeDevi= cePtr d, +int virConnectNodeDeviceEventRegisterAnyWrapper(virConnectPtr c, virNodeD= evicePtr d, int eventID, virConnectNodeD= eviceEventGenericCallback cb, long goCallbackId) { void* id =3D (void*)goCallbackId; #if LIBVIR_VERSION_NUMBER < 2002000 assert(0); // Caller should have checked version #else - return virConnectNodeDeviceEventRegisterAny(c, d, eventID, cb, id, fre= eGoCallback_cgo); + return virConnectNodeDeviceEventRegisterAny(c, d, eventID, cb, id, fre= eGoCallbackHelper); #endif } =20 diff --git a/node_device_events_wrapper.h b/node_device_events_wrapper.h index 38b1036..ae76b3e 100644 --- a/node_device_events_wrapper.h +++ b/node_device_events_wrapper.h @@ -27,12 +27,12 @@ #ifndef LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__ #define LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__ =20 -void nodeDeviceEventLifecycleCallback_cgo(virConnectPtr c, virNodeDevicePt= r d, +void nodeDeviceEventLifecycleCallbackHelper(virConnectPtr c, virNodeDevice= Ptr d, int event, int detail, void* data); =20 -void nodeDeviceEventGenericCallback_cgo(virConnectPtr c, virNodeDevicePtr = d, void* data); +void nodeDeviceEventGenericCallbackHelper(virConnectPtr c, virNodeDevicePt= r d, void* data); =20 -int virConnectNodeDeviceEventRegisterAny_cgo(virConnectPtr c, virNodeDevi= cePtr d, +int virConnectNodeDeviceEventRegisterAnyWrapper(virConnectPtr c, virNodeD= evicePtr d, int eventID, virConnectNodeDeviceEventGenericCallback cb, long goCallbackId); =20 diff --git a/qemu.go b/qemu.go index dd30a7d..b8679dc 100644 --- a/qemu.go +++ b/qemu.go @@ -160,12 +160,12 @@ func (c *Connect) DomainQemuMonitorEventRegister(dom = *Domain, event string, call defer C.free(unsafe.Pointer(cEvent)) goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.domainQemuMonitorEventCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.domainQemuMonitorEventCallbackHelper) var cdom C.virDomainPtr if dom !=3D nil { cdom =3D dom.ptr } - ret :=3D C.virConnectDomainQemuMonitorEventRegister_cgo(c.ptr, cdom, + ret :=3D C.virConnectDomainQemuMonitorEventRegisterWrapper(c.ptr, cdom, cEvent, C.virConnectDomainQemuMonitorEventCallback(callbackPtr), C.long(goCallBackId), diff --git a/qemu_wrapper.go b/qemu_wrapper.go index 41fe0cf..bbd95cc 100644 --- a/qemu_wrapper.go +++ b/qemu_wrapper.go @@ -42,21 +42,21 @@ package libvirt =20 =20 extern void domainQemuMonitorEventCallback(virConnectPtr, virDomainPtr, co= nst char *, long long, unsigned int, const char *, int); -void domainQemuMonitorEventCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainQemuMonitorEventCallbackHelper(virConnectPtr c, virDomainPtr d, const char *event, long long secs, unsigned int micros, const char *details, void *data) { domainQemuMonitorEventCallback(c, d, event, secs, micros, details, (in= t)(intptr_t)data); } =20 -int virConnectDomainQemuMonitorEventRegister_cgo(virConnectPtr c, virDoma= inPtr d, +int virConnectDomainQemuMonitorEventRegisterWrapper(virConnectPtr c, virD= omainPtr d, const char *event, vir= ConnectDomainQemuMonitorEventCallback cb, long goCallbackId, uns= igned int flags) { #if LIBVIR_VERSION_NUMBER < 1002003 assert(0); // Caller should have checked version #else void* id =3D (void*)goCallbackId; - return virConnectDomainQemuMonitorEventRegister(c, d, event, cb, id, f= reeGoCallback_cgo, flags); + return virConnectDomainQemuMonitorEventRegister(c, d, event, cb, id, f= reeGoCallbackHelper, flags); #endif } =20 diff --git a/qemu_wrapper.h b/qemu_wrapper.h index 4495cc4..9284256 100644 --- a/qemu_wrapper.h +++ b/qemu_wrapper.h @@ -27,11 +27,11 @@ #ifndef LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ #define LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ =20 -void domainQemuMonitorEventCallback_cgo(virConnectPtr c, virDomainPtr d, +void domainQemuMonitorEventCallbackHelper(virConnectPtr c, virDomainPtr d, const char *event, long long secs, unsigned int micros, const char *details, void *data); =20 -int virConnectDomainQemuMonitorEventRegister_cgo(virConnectPtr c, virDoma= inPtr d, +int virConnectDomainQemuMonitorEventRegisterWrapper(virConnectPtr c, virD= omainPtr d, const char *event, virConnectDomainQemuMonitorEventCallback cb, long goCallbackId, unsigned int flags); =20 diff --git a/secret_events.go b/secret_events.go index 92c86a2..0dd2708 100644 --- a/secret_events.go +++ b/secret_events.go @@ -91,12 +91,12 @@ func (c *Connect) SecretEventLifecycleRegister(secret *= Secret, callback SecretEv return 0, GetNotImplementedError("virConnectSecretEventRegisterAny") } =20 - callbackPtr :=3D unsafe.Pointer(C.secretEventLifecycleCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.secretEventLifecycleCallbackHelper) var csecret C.virSecretPtr if secret !=3D nil { csecret =3D secret.ptr } - ret :=3D C.virConnectSecretEventRegisterAny_cgo(c.ptr, csecret, + ret :=3D C.virConnectSecretEventRegisterAnyWrapper(c.ptr, csecret, C.VIR_SECRET_EVENT_ID_LIFECYCLE, C.virConnectSecretEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -113,12 +113,12 @@ func (c *Connect) SecretEventValueChangedRegister(sec= ret *Secret, callback Secre return 0, GetNotImplementedError("virConnectSecretEventRegisterAny") } =20 - callbackPtr :=3D unsafe.Pointer(C.secretEventGenericCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.secretEventGenericCallbackHelper) var csecret C.virSecretPtr if secret !=3D nil { csecret =3D secret.ptr } - ret :=3D C.virConnectSecretEventRegisterAny_cgo(c.ptr, csecret, + ret :=3D C.virConnectSecretEventRegisterAnyWrapper(c.ptr, csecret, C.VIR_SECRET_EVENT_ID_VALUE_CHANGED, C.virConnectSecretEventGenericCallback(callbackPtr), C.long(goCallBackId)) diff --git a/secret_events_wrapper.go b/secret_events_wrapper.go index 55d3394..3366065 100644 --- a/secret_events_wrapper.go +++ b/secret_events_wrapper.go @@ -37,27 +37,27 @@ package libvirt #include =20 extern void secretEventLifecycleCallback(virConnectPtr, virSecretPtr, int,= int, int); -void secretEventLifecycleCallback_cgo(virConnectPtr c, virSecretPtr d, +void secretEventLifecycleCallbackHelper(virConnectPtr c, virSecretPtr d, int event, int detail, void *data) { secretEventLifecycleCallback(c, d, event, detail, (int)(intptr_t)data); } =20 extern void secretEventGenericCallback(virConnectPtr, virSecretPtr, int); -void secretEventGenericCallback_cgo(virConnectPtr c, virSecretPtr d, +void secretEventGenericCallbackHelper(virConnectPtr c, virSecretPtr d, void *data) { secretEventGenericCallback(c, d, (int)(intptr_t)data); } =20 -int virConnectSecretEventRegisterAny_cgo(virConnectPtr c, virSecretPtr d, +int virConnectSecretEventRegisterAnyWrapper(virConnectPtr c, virSecretPtr= d, int eventID, virConnectSecretEven= tGenericCallback cb, long goCallbackId) { void* id =3D (void*)goCallbackId; #if LIBVIR_VERSION_NUMBER < 3000000 assert(0); // Caller should have checked version #else - return virConnectSecretEventRegisterAny(c, d, eventID, cb, id, freeGoC= allback_cgo); + return virConnectSecretEventRegisterAny(c, d, eventID, cb, id, freeGoC= allbackHelper); #endif } =20 diff --git a/secret_events_wrapper.h b/secret_events_wrapper.h index 4ad299c..1b5b527 100644 --- a/secret_events_wrapper.h +++ b/secret_events_wrapper.h @@ -27,12 +27,12 @@ #ifndef LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__ #define LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__ =20 -void secretEventLifecycleCallback_cgo(virConnectPtr c, virSecretPtr d, +void secretEventLifecycleCallbackHelper(virConnectPtr c, virSecretPtr d, int event, int detail, void* data); -void secretEventGenericCallback_cgo(virConnectPtr c, virSecretPtr d, +void secretEventGenericCallbackHelper(virConnectPtr c, virSecretPtr d, void* data); =20 -int virConnectSecretEventRegisterAny_cgo(virConnectPtr c, virSecretPtr d, +int virConnectSecretEventRegisterAnyWrapper(virConnectPtr c, virSecretPtr= d, int eventID, virConnectSecretEven= tGenericCallback cb, long goCallbackId); =20 diff --git a/storage_pool_events.go b/storage_pool_events.go index 5be9191..cf98616 100644 --- a/storage_pool_events.go +++ b/storage_pool_events.go @@ -92,12 +92,12 @@ func (c *Connect) StoragePoolEventLifecycleRegister(poo= l *StoragePool, callback =20 goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.storagePoolEventLifecycleCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.storagePoolEventLifecycleCallbackHelper) var cpool C.virStoragePoolPtr if pool !=3D nil { cpool =3D pool.ptr } - ret :=3D C.virConnectStoragePoolEventRegisterAny_cgo(c.ptr, cpool, + ret :=3D C.virConnectStoragePoolEventRegisterAnyWrapper(c.ptr, cpool, C.VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE, C.virConnectStoragePoolEventGenericCallback(callbackPtr), C.long(goCallBackId)) @@ -115,12 +115,12 @@ func (c *Connect) StoragePoolEventRefreshRegister(poo= l *StoragePool, callback St =20 goCallBackId :=3D registerCallbackId(callback) =20 - callbackPtr :=3D unsafe.Pointer(C.storagePoolEventGenericCallback_cgo) + callbackPtr :=3D unsafe.Pointer(C.storagePoolEventGenericCallbackHelper) var cpool C.virStoragePoolPtr if pool !=3D nil { cpool =3D pool.ptr } - ret :=3D C.virConnectStoragePoolEventRegisterAny_cgo(c.ptr, cpool, + ret :=3D C.virConnectStoragePoolEventRegisterAnyWrapper(c.ptr, cpool, C.VIR_STORAGE_POOL_EVENT_ID_REFRESH, C.virConnectStoragePoolEventGenericCallback(callbackPtr), C.long(goCallBackId)) diff --git a/storage_pool_events_wrapper.go b/storage_pool_events_wrapper.go index 0d99909..9670440 100644 --- a/storage_pool_events_wrapper.go +++ b/storage_pool_events_wrapper.go @@ -37,27 +37,27 @@ package libvirt #include =20 extern void storagePoolEventLifecycleCallback(virConnectPtr, virStoragePoo= lPtr, int, int, int); -void storagePoolEventLifecycleCallback_cgo(virConnectPtr c, virStoragePool= Ptr d, +void storagePoolEventLifecycleCallbackHelper(virConnectPtr c, virStoragePo= olPtr d, int event, int detail, void *da= ta) { storagePoolEventLifecycleCallback(c, d, event, detail, (int)(intptr_t)= data); } =20 extern void storagePoolEventGenericCallback(virConnectPtr, virStoragePoolP= tr, int); -void storagePoolEventGenericCallback_cgo(virConnectPtr c, virStoragePoolPt= r d, +void storagePoolEventGenericCallbackHelper(virConnectPtr c, virStoragePool= Ptr d, void *data) { storagePoolEventGenericCallback(c, d, (int)(intptr_t)data); } =20 -int virConnectStoragePoolEventRegisterAny_cgo(virConnectPtr c, virStorage= PoolPtr d, +int virConnectStoragePoolEventRegisterAnyWrapper(virConnectPtr c, virStor= agePoolPtr d, int eventID, virConnectStora= gePoolEventGenericCallback cb, long goCallbackId) { #if LIBVIR_VERSION_NUMBER < 2000000 assert(0); // Caller should have checked version #else void* id =3D (void*)goCallbackId; - return virConnectStoragePoolEventRegisterAny(c, d, eventID, cb, id, fr= eeGoCallback_cgo); + return virConnectStoragePoolEventRegisterAny(c, d, eventID, cb, id, fr= eeGoCallbackHelper); #endif } =20 diff --git a/storage_pool_events_wrapper.h b/storage_pool_events_wrapper.h index c8a10c9..c82abb2 100644 --- a/storage_pool_events_wrapper.h +++ b/storage_pool_events_wrapper.h @@ -27,12 +27,12 @@ #ifndef LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__ #define LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__ =20 -void storagePoolEventLifecycleCallback_cgo(virConnectPtr c, virStoragePool= Ptr d, +void storagePoolEventLifecycleCallbackHelper(virConnectPtr c, virStoragePo= olPtr d, int event, int detail, void* data); -void storagePoolEventGenericCallback_cgo(virConnectPtr c, virStoragePoolPt= r d, +void storagePoolEventGenericCallbackHelper(virConnectPtr c, virStoragePool= Ptr d, void* data); =20 -int virConnectStoragePoolEventRegisterAny_cgo(virConnectPtr c, virStorage= PoolPtr d, +int virConnectStoragePoolEventRegisterAnyWrapper(virConnectPtr c, virStor= agePoolPtr d, int eventID, virConnectStoragePoolEventGenericCallback cb, long goCallbackId); =20 diff --git a/stream.go b/stream.go index b26e8e9..1282aef 100644 --- a/stream.go +++ b/stream.go @@ -223,7 +223,7 @@ func (v *Stream) RecvAll(handler StreamSinkFunc) error { =20 callbackID :=3D registerCallbackId(handler) =20 - ret :=3D C.virStreamRecvAll_cgo(v.ptr, (C.int)(callbackID)) + ret :=3D C.virStreamRecvAllWrapper(v.ptr, (C.int)(callbackID)) freeCallbackId(callbackID) if ret =3D=3D -1 { return GetLastError() @@ -241,7 +241,7 @@ func (v *Stream) SparseRecvAll(handler StreamSinkFunc, = holeHandler StreamSinkHol callbackID :=3D registerCallbackId(handler) holeCallbackID :=3D registerCallbackId(holeHandler) =20 - ret :=3D C.virStreamSparseRecvAll_cgo(v.ptr, (C.int)(callbackID), (C.int)= (holeCallbackID)) + ret :=3D C.virStreamSparseRecvAllWrapper(v.ptr, (C.int)(callbackID), (C.i= nt)(holeCallbackID)) freeCallbackId(callbackID) freeCallbackId(holeCallbackID) if ret =3D=3D -1 { @@ -328,7 +328,7 @@ func (v *Stream) SendAll(handler StreamSourceFunc) erro= r { =20 callbackID :=3D registerCallbackId(handler) =20 - ret :=3D C.virStreamSendAll_cgo(v.ptr, (C.int)(callbackID)) + ret :=3D C.virStreamSendAllWrapper(v.ptr, (C.int)(callbackID)) freeCallbackId(callbackID) if ret =3D=3D -1 { return GetLastError() @@ -347,7 +347,7 @@ func (v *Stream) SparseSendAll(handler StreamSourceFunc= , holeHandler StreamSourc holeCallbackID :=3D registerCallbackId(holeHandler) skipCallbackID :=3D registerCallbackId(skipHandler) =20 - ret :=3D C.virStreamSparseSendAll_cgo(v.ptr, (C.int)(callbackID), (C.int)= (holeCallbackID), (C.int)(skipCallbackID)) + ret :=3D C.virStreamSparseSendAllWrapper(v.ptr, (C.int)(callbackID), (C.i= nt)(holeCallbackID), (C.int)(skipCallbackID)) freeCallbackId(callbackID) freeCallbackId(holeCallbackID) freeCallbackId(skipCallbackID) @@ -364,7 +364,7 @@ type StreamEventCallback func(*Stream, StreamEventType) func (v *Stream) EventAddCallback(events StreamEventType, callback StreamE= ventCallback) error { callbackID :=3D registerCallbackId(callback) =20 - ret :=3D C.virStreamEventAddCallback_cgo(v.ptr, (C.int)(events), (C.int)(= callbackID)) + ret :=3D C.virStreamEventAddCallbackWrapper(v.ptr, (C.int)(events), (C.in= t)(callbackID)) if ret =3D=3D -1 { return GetLastError() } diff --git a/stream_wrapper.go b/stream_wrapper.go index ea2e0cb..4e1c2c9 100644 --- a/stream_wrapper.go +++ b/stream_wrapper.go @@ -83,13 +83,13 @@ static int streamSinkHoleCallbackHelper(virStreamPtr st= , long long length, void return streamSinkHoleCallback(st, length, cbdata->holeCallbackID); } =20 -int virStreamSendAll_cgo(virStreamPtr st, int callbackID) +int virStreamSendAllWrapper(virStreamPtr st, int callbackID) { struct CallbackData cbdata =3D { .callbackID =3D callbackID }; return virStreamSendAll(st, streamSourceCallbackHelper, &cbdata); } =20 -int virStreamSparseSendAll_cgo(virStreamPtr st, int callbackID, int holeCa= llbackID, int skipCallbackID) +int virStreamSparseSendAllWrapper(virStreamPtr st, int callbackID, int hol= eCallbackID, int skipCallbackID) { struct CallbackData cbdata =3D { .callbackID =3D callbackID, .holeCall= backID =3D holeCallbackID, .skipCallbackID =3D skipCallbackID }; #if LIBVIR_VERSION_NUMBER < 3004000 @@ -100,13 +100,13 @@ int virStreamSparseSendAll_cgo(virStreamPtr st, int c= allbackID, int holeCallback } =20 =20 -int virStreamRecvAll_cgo(virStreamPtr st, int callbackID) +int virStreamRecvAllWrapper(virStreamPtr st, int callbackID) { struct CallbackData cbdata =3D { .callbackID =3D callbackID }; return virStreamRecvAll(st, streamSinkCallbackHelper, &cbdata); } =20 -int virStreamSparseRecvAll_cgo(virStreamPtr st, int callbackID, int holeCa= llbackID) +int virStreamSparseRecvAllWrapper(virStreamPtr st, int callbackID, int hol= eCallbackID) { struct CallbackData cbdata =3D { .callbackID =3D callbackID, .holeCall= backID =3D holeCallbackID }; #if LIBVIR_VERSION_NUMBER < 3004000 @@ -123,7 +123,7 @@ static void streamEventCallbackHelper(virStreamPtr st, = int events, void *opaque) streamEventCallback(st, events, (int)(intptr_t)opaque); } =20 -int virStreamEventAddCallback_cgo(virStreamPtr st, int events, int callbac= kID) +int virStreamEventAddCallbackWrapper(virStreamPtr st, int events, int call= backID) { return virStreamEventAddCallback(st, events, streamEventCallbackHelper= , (void *)(intptr_t)callbackID, NULL); } diff --git a/stream_wrapper.h b/stream_wrapper.h index 778e457..c064423 100644 --- a/stream_wrapper.h +++ b/stream_wrapper.h @@ -27,11 +27,11 @@ #ifndef LIBVIRT_GO_STREAM_WRAPPER_H__ #define LIBVIRT_GO_STREAM_WRAPPER_H__ =20 -int virStreamSendAll_cgo(virStreamPtr st, int callbackID); -int virStreamRecvAll_cgo(virStreamPtr st, int callbackID); -int virStreamSparseSendAll_cgo(virStreamPtr st, int callbackID, int holeCa= llbackID, int skipCallbackID); -int virStreamSparseRecvAll_cgo(virStreamPtr st, int callbackID, int holeCa= llbackID); +int virStreamSendAllWrapper(virStreamPtr st, int callbackID); +int virStreamRecvAllWrapper(virStreamPtr st, int callbackID); +int virStreamSparseSendAllWrapper(virStreamPtr st, int callbackID, int hol= eCallbackID, int skipCallbackID); +int virStreamSparseRecvAllWrapper(virStreamPtr st, int callbackID, int hol= eCallbackID); =20 -int virStreamEventAddCallback_cgo(virStreamPtr st, int events, int callbac= kID); +int virStreamEventAddCallbackWrapper(virStreamPtr st, int events, int call= backID); =20 #endif /* LIBVIRT_GO_STREAM_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list