[libvirt] [go PATCH 12/37] storage volume: move wrapper functions out of compat header

Daniel P. Berrangé berrange at redhat.com
Mon Jul 16 13:23:58 UTC 2018


Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 storage_volume.go                             |  1 +
 storage_volume_compat.h                       |  4 ---
 ...ume_compat.go => storage_volume_wrapper.go |  1 +
 storage_volume_wrapper.h                      | 34 +++++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)
 rename storage_volume_compat.go => storage_volume_wrapper.go (97%)
 create mode 100644 storage_volume_wrapper.h

diff --git a/storage_volume.go b/storage_volume.go
index 56a3026..3526ed4 100644
--- a/storage_volume.go
+++ b/storage_volume.go
@@ -32,6 +32,7 @@ package libvirt
 #include <libvirt/virterror.h>
 #include <stdlib.h>
 #include "storage_volume_compat.h"
+#include "storage_volume_wrapper.h"
 */
 import "C"
 
diff --git a/storage_volume_compat.h b/storage_volume_compat.h
index 69e2dd8..bd3cee9 100644
--- a/storage_volume_compat.h
+++ b/storage_volume_compat.h
@@ -29,10 +29,6 @@
 
 /* 3.0.0 */
 
-int virStorageVolGetInfoFlagsWrapper(virStorageVolPtr vol,
-				    virStorageVolInfoPtr info,
-				    unsigned int flags);
-
 #ifndef VIR_STORAGE_VOL_USE_ALLOCATION
 #define VIR_STORAGE_VOL_USE_ALLOCATION 0
 #endif
diff --git a/storage_volume_compat.go b/storage_volume_wrapper.go
similarity index 97%
rename from storage_volume_compat.go
rename to storage_volume_wrapper.go
index a1f622e..62c5df8 100644
--- a/storage_volume_compat.go
+++ b/storage_volume_wrapper.go
@@ -31,6 +31,7 @@ package libvirt
 #include <libvirt/libvirt.h>
 #include <assert.h>
 #include "storage_volume_compat.h"
+#include "storage_volume_wrapper.h"
 
 int virStorageVolGetInfoFlagsWrapper(virStorageVolPtr vol,
 				    virStorageVolInfoPtr info,
diff --git a/storage_volume_wrapper.h b/storage_volume_wrapper.h
new file mode 100644
index 0000000..a97a59a
--- /dev/null
+++ b/storage_volume_wrapper.h
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef LIBVIRT_GO_STORAGE_VOLUME_WRAPPER_H__
+#define LIBVIRT_GO_STORAGE_VOLUME_WRAPPER_H__
+
+int virStorageVolGetInfoFlagsWrapper(virStorageVolPtr vol,
+				    virStorageVolInfoPtr info,
+				    unsigned int flags);
+
+#endif /* LIBVIRT_GO_STORAGE_VOLUME_WRAPPER_H__ */
-- 
2.17.1




More information about the libvir-list mailing list