Commit 5f159e94 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé

Rename *cfuncs.{go,h} to *wrapper.{go,h}

Signed-off-by: 's avatarDaniel P. Berrangé <berrange@redhat.com>
parent f6db45c0
......@@ -52,7 +52,7 @@ var (
/* Obsolete we use virConnectDomainEventRegisterAny instead */
"virConnectDomainEventRegister",
/* Wrapped in connect_cfuncs.go instead */
/* Wrapped in connect_wrapper.go instead */
"virConnectOpenAuth",
"virConnectRegisterCloseCallback",
......
......@@ -30,7 +30,7 @@ package libvirt
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include <libvirt/virterror.h>
#include "callbacks_cfuncs.h"
#include "callbacks_wrapper.h"
extern void freeCallbackId(long);
void freeGoCallback_cgo(void* goCallbackId) {
......
......@@ -24,9 +24,9 @@
*
*/
#ifndef LIBVIRT_GO_CALLBACKS_CFUNCS_H__
#define LIBVIRT_GO_CALLBACKS_CFUNCS_H__
#ifndef LIBVIRT_GO_CALLBACKS_WRAPPER_H__
#define LIBVIRT_GO_CALLBACKS_WRAPPER_H__
void freeGoCallback_cgo(void* goCallbackId);
#endif /* LIBVIRT_GO_CALLBACKS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_CALLBACKS_WRAPPER_H__ */
......@@ -40,7 +40,7 @@ import (
#include <libvirt/virterror.h>
#include <stdlib.h>
#include "connect_compat.h"
#include "connect_cfuncs.h"
#include "connect_wrapper.h"
*/
import "C"
......
......@@ -30,8 +30,8 @@ package libvirt
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include <libvirt/virterror.h>
#include "connect_cfuncs.h"
#include "callbacks_cfuncs.h"
#include "connect_wrapper.h"
#include "callbacks_wrapper.h"
extern void closeCallback(virConnectPtr, int, long);
void closeCallback_cgo(virConnectPtr conn, int reason, void *opaque)
......
......@@ -24,11 +24,11 @@
*
*/
#ifndef LIBVIRT_GO_CONNECT_CFUNCS_H__
#define LIBVIRT_GO_CONNECT_CFUNCS_H__
#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, virConnectCloseFunc cb, long goCallbackId);
virConnectPtr virConnectOpenAuthWrap(const char *name, int *credtype, uint ncredtype, int callbackID, unsigned int flags);
#endif /* LIBVIRT_GO_CONNECT_CFUNCS_H__ */
#endif /* LIBVIRT_GO_CONNECT_WRAPPER_H__ */
......@@ -34,7 +34,7 @@ import (
/*
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include "domain_events_cfuncs.h"
#include "domain_events_wrapper.h"
#include "domain_compat.h"
*/
import "C"
......
......@@ -30,8 +30,8 @@ package libvirt
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include <libvirt/virterror.h>
#include "domain_events_cfuncs.h"
#include "callbacks_cfuncs.h"
#include "domain_events_wrapper.h"
#include "callbacks_wrapper.h"
#include <stdint.h>
extern void domainEventLifecycleCallback(virConnectPtr, virDomainPtr, int, int, int);
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
#define LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
#ifndef LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
#define LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
void domainEventLifecycleCallback_cgo(virConnectPtr c, virDomainPtr d,
int event, int detail, void* data);
......@@ -121,4 +121,4 @@ int virConnectDomainEventRegisterAny_cgo(virConnectPtr c, virDomainPtr d,
long goCallbackId);
#endif /* LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ */
......@@ -30,7 +30,7 @@ package libvirt
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include <stdint.h>
#include "events_cfuncs.h"
#include "events_wrapper.h"
*/
import "C"
......
......@@ -32,7 +32,7 @@ package libvirt
#include <libvirt/virterror.h>
#include <stdint.h>
#include <stdlib.h>
#include "events_cfuncs.h"
#include "events_wrapper.h"
void eventHandleCallback(int watch, int fd, int events, int callbackID);
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_EVENTS_CFUNCS_H__
#define LIBVIRT_GO_EVENTS_CFUNCS_H__
#ifndef LIBVIRT_GO_EVENTS_WRAPPER_H__
#define LIBVIRT_GO_EVENTS_WRAPPER_H__
int virEventAddHandle_cgo(int fd, int events, int callbackID);
int virEventAddTimeout_cgo(int freq, int callbackID);
......@@ -36,4 +36,4 @@ void eventTimeoutCallbackInvoke(int timer, uintptr_t callback, uintptr_t opaque)
void eventHandleCallbackFree(uintptr_t callback, uintptr_t opaque);
void eventTimeoutCallbackFree(uintptr_t callback, uintptr_t opaque);
#endif /* LIBVIRT_GO_EVENTS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_EVENTS_WRAPPER_H__ */
......@@ -35,7 +35,7 @@ import (
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include "network_compat.h"
#include "network_events_cfuncs.h"
#include "network_events_wrapper.h"
*/
import "C"
......
......@@ -32,8 +32,8 @@ package libvirt
#include <libvirt/virterror.h>
#include <assert.h>
#include "network_compat.h"
#include "network_events_cfuncs.h"
#include "callbacks_cfuncs.h"
#include "network_events_wrapper.h"
#include "callbacks_wrapper.h"
#include <stdint.h>
extern void networkEventLifecycleCallback(virConnectPtr, virNetworkPtr, int, int, int);
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_NETWORK_EVENTS_CFUNCS_H__
#define LIBVIRT_GO_NETWORK_EVENTS_CFUNCS_H__
#ifndef LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__
#define LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__
void networkEventLifecycleCallback_cgo(virConnectPtr c, virNetworkPtr d,
int event, int detail, void* data);
......@@ -35,4 +35,4 @@ int virConnectNetworkEventRegisterAny_cgo(virConnectPtr c, virNetworkPtr d,
long goCallbackId);
#endif /* LIBVIRT_GO_NETWORK_EVENTS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_NETWORK_EVENTS_WRAPPER_H__ */
......@@ -35,7 +35,7 @@ import (
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include "node_device_compat.h"
#include "node_device_events_cfuncs.h"
#include "node_device_events_wrapper.h"
*/
import "C"
......
......@@ -32,8 +32,8 @@ package libvirt
#include <libvirt/virterror.h>
#include <assert.h>
#include "node_device_compat.h"
#include "node_device_events_cfuncs.h"
#include "callbacks_cfuncs.h"
#include "node_device_events_wrapper.h"
#include "callbacks_wrapper.h"
#include <stdint.h>
extern void nodeDeviceEventLifecycleCallback(virConnectPtr, virNodeDevicePtr, int, int, int);
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_NODE_DEVICE_EVENTS_CFUNCS_H__
#define LIBVIRT_GO_NODE_DEVICE_EVENTS_CFUNCS_H__
#ifndef LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__
#define LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__
void nodeDeviceEventLifecycleCallback_cgo(virConnectPtr c, virNodeDevicePtr d,
int event, int detail, void* data);
......@@ -37,4 +37,4 @@ int virConnectNodeDeviceEventRegisterAny_cgo(virConnectPtr c, virNodeDevicePtr
long goCallbackId);
#endif /* LIBVIRT_GO_NODE_DEVICE_EVENTS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__ */
......@@ -38,7 +38,7 @@ package libvirt
#include <libvirt/virterror.h>
#include <stdlib.h>
#include "qemu_compat.h"
#include "qemu_cfuncs.h"
#include "qemu_wrapper.h"
*/
import "C"
......
......@@ -35,8 +35,8 @@ package libvirt
#include <libvirt/libvirt-qemu.h>
#include <libvirt/virterror.h>
#include "qemu_compat.h"
#include "qemu_cfuncs.h"
#include "callbacks_cfuncs.h"
#include "qemu_wrapper.h"
#include "callbacks_wrapper.h"
#include <assert.h>
#include <stdint.h>
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
#define LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__
#ifndef LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
#define LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__
void domainQemuMonitorEventCallback_cgo(virConnectPtr c, virDomainPtr d,
const char *event, long long secs,
......@@ -36,4 +36,4 @@ int virConnectDomainQemuMonitorEventRegister_cgo(virConnectPtr c, virDomainPtr
long goCallbackId, unsigned int flags);
#endif /* LIBVIRT_GO_DOMAIN_EVENTS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_DOMAIN_EVENTS_WRAPPER_H__ */
......@@ -35,7 +35,7 @@ import (
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include "secret_compat.h"
#include "secret_events_cfuncs.h"
#include "secret_events_wrapper.h"
*/
import "C"
......
......@@ -32,8 +32,8 @@ package libvirt
#include <libvirt/virterror.h>
#include <assert.h>
#include "secret_compat.h"
#include "secret_events_cfuncs.h"
#include "callbacks_cfuncs.h"
#include "secret_events_wrapper.h"
#include "callbacks_wrapper.h"
#include <stdint.h>
extern void secretEventLifecycleCallback(virConnectPtr, virSecretPtr, int, int, int);
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_SECRET_EVENTS_CFUNCS_H__
#define LIBVIRT_GO_SECRET_EVENTS_CFUNCS_H__
#ifndef LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__
#define LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__
void secretEventLifecycleCallback_cgo(virConnectPtr c, virSecretPtr d,
int event, int detail, void* data);
......@@ -37,4 +37,4 @@ int virConnectSecretEventRegisterAny_cgo(virConnectPtr c, virSecretPtr d,
long goCallbackId);
#endif /* LIBVIRT_GO_SECRET_EVENTS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__ */
......@@ -35,7 +35,7 @@ import (
#cgo pkg-config: libvirt
#include <libvirt/libvirt.h>
#include "storage_pool_compat.h"
#include "storage_pool_events_cfuncs.h"
#include "storage_pool_events_wrapper.h"
*/
import "C"
......
......@@ -32,8 +32,8 @@ package libvirt
#include <libvirt/virterror.h>
#include <assert.h>
#include "storage_pool_compat.h"
#include "storage_pool_events_cfuncs.h"
#include "callbacks_cfuncs.h"
#include "storage_pool_events_wrapper.h"
#include "callbacks_wrapper.h"
#include <stdint.h>
extern void storagePoolEventLifecycleCallback(virConnectPtr, virStoragePoolPtr, int, int, int);
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_STORAGE_POOL_EVENTS_CFUNCS_H__
#define LIBVIRT_GO_STORAGE_POOL_EVENTS_CFUNCS_H__
#ifndef LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__
#define LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__
void storagePoolEventLifecycleCallback_cgo(virConnectPtr c, virStoragePoolPtr d,
int event, int detail, void* data);
......@@ -37,4 +37,4 @@ int virConnectStoragePoolEventRegisterAny_cgo(virConnectPtr c, virStoragePoolPt
long goCallbackId);
#endif /* LIBVIRT_GO_STORAGE_POOL_EVENTS_CFUNCS_H__ */
#endif /* LIBVIRT_GO_STORAGE_POOL_EVENTS_WRAPPER_H__ */
......@@ -31,7 +31,7 @@ package libvirt
#include <libvirt/libvirt.h>
#include <libvirt/virterror.h>
#include <stdlib.h>
#include "stream_cfuncs.h"
#include "stream_wrapper.h"
#include "stream_compat.h"
*/
import "C"
......
......@@ -33,7 +33,7 @@ package libvirt
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
#include "stream_cfuncs.h"
#include "stream_wrapper.h"
int streamSourceCallback(virStreamPtr st, char *cdata, size_t nbytes, int callbackID);
int streamSourceHoleCallback(virStreamPtr st, int *inData, long long *length, int callbackID);
......
......@@ -24,8 +24,8 @@
*
*/
#ifndef LIBVIRT_GO_STREAM_CFUNCS_H__
#define LIBVIRT_GO_STREAM_CFUNCS_H__
#ifndef LIBVIRT_GO_STREAM_WRAPPER_H__
#define LIBVIRT_GO_STREAM_WRAPPER_H__
int virStreamSendAll_cgo(virStreamPtr st, int callbackID);
int virStreamRecvAll_cgo(virStreamPtr st, int callbackID);
......@@ -34,4 +34,4 @@ int virStreamSparseRecvAll_cgo(virStreamPtr st, int callbackID, int holeCallback
int virStreamEventAddCallback_cgo(virStreamPtr st, int events, int callbackID);
#endif /* LIBVIRT_GO_STREAM_CFUNCS_H__ */
#endif /* LIBVIRT_GO_STREAM_WRAPPER_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment