[libvirt] [go PATCH 09/37] node device: move wrapper functions out of compat header
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
node_device_compat.go | 46 -----------------------------------
node_device_compat.h | 3 ---
node_device_events_wrapper.go | 10 ++++++++
node_device_events_wrapper.h | 9 ++++---
4 files changed, 16 insertions(+), 52 deletions(-)
delete mode 100644 node_device_compat.go
diff --git a/node_device_compat.go b/node_device_compat.go
deleted file mode 100644
index f2d32d9..0000000
--- a/node_device_compat.go
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This file is part of the libvirt-go project
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Copyright (c) 2013 Alex Zorin
- * Copyright (C) 2016 Red Hat, Inc.
- *
- */
-
-package libvirt
-
-/*
-#cgo pkg-config: libvirt
-#include <libvirt/libvirt.h>
-#include <assert.h>
-#include "node_device_compat.h"
-
-int virConnectNodeDeviceEventDeregisterAnyWrapper(virConnectPtr conn,
- int callbackID)
-{
-#if LIBVIR_VERSION_NUMBER < 2002000
- assert(0); // Caller should have checked version
-#else
- return virConnectNodeDeviceEventDeregisterAny(conn, callbackID);
-#endif
-}
-
-*/
-import "C"
diff --git a/node_device_compat.h b/node_device_compat.h
index e214bd6..3202039 100644
--- a/node_device_compat.h
+++ b/node_device_compat.h
@@ -51,8 +51,5 @@ typedef void (*virConnectNodeDeviceEventGenericCallback)(virConnectPtr
conn,
void *opaque);
#endif
-int virConnectNodeDeviceEventDeregisterAnyWrapper(virConnectPtr conn,
- int callbackID);
-
#endif /* LIBVIRT_GO_NODE_DEVICE_COMPAT_H__ */
diff --git a/node_device_events_wrapper.go b/node_device_events_wrapper.go
index ff7b6e4..20441f4 100644
--- a/node_device_events_wrapper.go
+++ b/node_device_events_wrapper.go
@@ -60,5 +60,15 @@ int virConnectNodeDeviceEventRegisterAnyWrapper(virConnectPtr c,
virNodeDeviceP
#endif
}
+int virConnectNodeDeviceEventDeregisterAnyWrapper(virConnectPtr conn,
+ int callbackID)
+{
+#if LIBVIR_VERSION_NUMBER < 2002000
+ assert(0); // Caller should have checked version
+#else
+ return virConnectNodeDeviceEventDeregisterAny(conn, callbackID);
+#endif
+}
+
*/
import "C"
diff --git a/node_device_events_wrapper.h b/node_device_events_wrapper.h
index ae76b3e..a9576e7 100644
--- a/node_device_events_wrapper.h
+++ b/node_device_events_wrapper.h
@@ -28,13 +28,16 @@
#define LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__
void nodeDeviceEventLifecycleCallbackHelper(virConnectPtr c, virNodeDevicePtr d,
- int event, int detail, void* data);
+ int event, int detail, void* data);
void nodeDeviceEventGenericCallbackHelper(virConnectPtr c, virNodeDevicePtr d, void*
data);
int virConnectNodeDeviceEventRegisterAnyWrapper(virConnectPtr c, virNodeDevicePtr d,
- int eventID, virConnectNodeDeviceEventGenericCallback cb,
- long goCallbackId);
+ int eventID,
virConnectNodeDeviceEventGenericCallback cb,
+ long goCallbackId);
+
+int virConnectNodeDeviceEventDeregisterAnyWrapper(virConnectPtr conn,
+ int callbackID);
#endif /* LIBVIRT_GO_NODE_DEVICE_EVENTS_WRAPPER_H__ */
--
2.17.1