[libvirt] [dbus PATCH 01/15] Introduce StorageVol Interface
Katerina Koukiou
kkoukiou at redhat.com
Tue Jun 12 09:00:14 UTC 2018
Signed-off-by: Katerina Koukiou <kkoukiou at redhat.com>
---
data/Makefile.am | 3 +-
data/org.libvirt.StorageVol.xml | 7 +++
src/Makefile.am | 3 +-
src/connect.c | 6 +++
src/connect.h | 1 +
src/storagevol.c | 96 +++++++++++++++++++++++++++++++++++++++++
src/storagevol.h | 9 ++++
src/util.c | 35 +++++++++++++++
src/util.h | 16 +++++++
9 files changed, 174 insertions(+), 2 deletions(-)
create mode 100644 data/org.libvirt.StorageVol.xml
create mode 100644 src/storagevol.c
create mode 100644 src/storagevol.h
diff --git a/data/Makefile.am b/data/Makefile.am
index fdec857..5688cab 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,7 +24,8 @@ interfaces_files = \
org.libvirt.Network.xml \
org.libvirt.NWFilter.xml \
org.libvirt.Secret.xml \
- org.libvirt.StoragePool.xml
+ org.libvirt.StoragePool.xml \
+ org.libvirt.StorageVol.xml
interfacesdir = $(DBUS_INTERFACES_DIR)
interfaces_DATA = $(interfaces_files)
diff --git a/data/org.libvirt.StorageVol.xml b/data/org.libvirt.StorageVol.xml
new file mode 100644
index 0000000..c72c847
--- /dev/null
+++ b/data/org.libvirt.StorageVol.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<node name="/org/libvirt/storagevol">
+ <interface name="org.libvirt.StorageVol">
+ </interface>
+</node>
diff --git a/src/Makefile.am b/src/Makefile.am
index 22128c2..539e722 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,8 @@ DAEMON_SOURCES = \
network.c network.h \
nwfilter.c nwfilter.h \
secret.c secret.h \
- storagepool.c storagepool.h
+ storagepool.c storagepool.h \
+ storagevol.c storagevol.h
EXTRA_DIST = \
$(DAEMON_SOURCES)
diff --git a/src/connect.c b/src/connect.c
index 75ae1cd..1090e3e 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -5,6 +5,7 @@
#include "nwfilter.h"
#include "secret.h"
#include "storagepool.h"
+#include "storagevol.h"
#include "util.h"
#include <gio/gunixfdlist.h>
@@ -1612,6 +1613,7 @@ virtDBusConnectFree(virtDBusConnect *connect)
g_free(connect->nwfilterPath);
g_free(connect->secretPath);
g_free(connect->storagePoolPath);
+ g_free(connect->storageVolPath);
g_free(connect);
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virtDBusConnect, virtDBusConnectFree);
@@ -1679,6 +1681,10 @@ virtDBusConnectNew(virtDBusConnect **connectp,
if (error && *error)
return;
+ virtDBusStorageVolRegister(connect, error);
+ if (error && *error)
+ return;
+
*connectp = connect;
connect = NULL;
}
diff --git a/src/connect.h b/src/connect.h
index fe672ed..341dfc4 100644
--- a/src/connect.h
+++ b/src/connect.h
@@ -17,6 +17,7 @@ struct virtDBusConnect {
gchar *nwfilterPath;
gchar *secretPath;
gchar *storagePoolPath;
+ gchar *storageVolPath;
virConnectPtr connection;
GMutex lock;
diff --git a/src/storagevol.c b/src/storagevol.c
new file mode 100644
index 0000000..dad7d11
--- /dev/null
+++ b/src/storagevol.c
@@ -0,0 +1,96 @@
+#include "storagevol.h"
+#include "util.h"
+
+#include <libvirt/libvirt.h>
+
+static virtDBusGDBusPropertyTable virtDBusStorageVolPropertyTable[] = {
+ { 0 }
+};
+
+static virtDBusGDBusMethodTable virtDBusStorageVolMethodTable[] = {
+ { 0 }
+};
+
+static gchar **
+virtDBusStorageVolEnumerate(gpointer userData)
+{
+ virtDBusConnect *connect = userData;
+ g_autoptr(virStoragePoolPtr) storagePools = NULL;
+ gint numPools = 0;
+ gint numVols = 0;
+ gint numVolsTotal = 0;
+ gint offset = 0;
+ gchar **ret = NULL;
+
+ if (!virtDBusConnectOpen(connect, NULL))
+ return NULL;
+
+ numPools = virConnectListAllStoragePools(connect->connection,
+ &storagePools, 0);
+ if (numPools < 0)
+ return NULL;
+
+ if (numPools == 0)
+ return NULL;
+
+ for (gint i = 0; i < numPools; i++) {
+ g_autoptr(virStorageVolPtr) storageVols = NULL;
+
+ numVols = virStoragePoolListAllVolumes(storagePools[i],
+ &storageVols, 0);
+ if (numVols < 0)
+ return NULL;
+
+ if (numVols == 0)
+ return NULL;
+
+ numVolsTotal += numVols;
+ }
+
+ ret = g_new0(gchar *, numVolsTotal + 1);
+
+ for (gint i = 0; i < numPools; i++) {
+ g_autoptr(virStorageVolPtr) storageVols = NULL;
+
+ numVols = virStoragePoolListAllVolumes(storagePools[i],
+ &storageVols, 0);
+ if (numVols < 0)
+ return NULL;
+
+ if (numVols == 0)
+ return NULL;
+
+ for (gint j = 0; j < numVols; j++) {
+ ret[offset] = virtDBusUtilBusPathForVirStorageVol(storageVols[j],
+ connect->storageVolPath);
+ offset++;
+ }
+ }
+
+ return ret;
+}
+
+static GDBusInterfaceInfo *interfaceInfo;
+
+void
+virtDBusStorageVolRegister(virtDBusConnect *connect,
+ GError **error)
+{
+ connect->storageVolPath = g_strdup_printf("%s/storagevol",
+ connect->connectPath);
+
+ if (!interfaceInfo) {
+ interfaceInfo = virtDBusGDBusLoadIntrospectData(VIRT_DBUS_STORAGEVOL_INTERFACE,
+ error);
+ if (!interfaceInfo)
+ return;
+ }
+
+ virtDBusGDBusRegisterSubtree(connect->bus,
+ connect->storageVolPath,
+ interfaceInfo,
+ virtDBusStorageVolEnumerate,
+ virtDBusStorageVolMethodTable,
+ virtDBusStorageVolPropertyTable,
+ connect);
+}
diff --git a/src/storagevol.h b/src/storagevol.h
new file mode 100644
index 0000000..e2a893b
--- /dev/null
+++ b/src/storagevol.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "connect.h"
+
+#define VIRT_DBUS_STORAGEVOL_INTERFACE "org.libvirt.StorageVol"
+
+void
+virtDBusStorageVolRegister(virtDBusConnect *connect,
+ GError **error);
diff --git a/src/util.c b/src/util.c
index 1268736..1d11ce6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -417,3 +417,38 @@ virtDBusUtilVirStoragePoolListFree(virStoragePoolPtr *storagePools)
g_free(storagePools);
}
+
+virStorageVolPtr
+virtDBusUtilVirStorageVolFromBusPath(virConnectPtr connection,
+ const gchar *path,
+ const gchar *storageVolPath)
+{
+ g_autofree gchar *key = NULL;
+ gsize prefixLen = strlen(storageVolPath);
+
+ key = virtDBusUtilDecodeStr(path + prefixLen + 1);
+
+ return virStorageVolLookupByKey(connection, key);
+}
+
+gchar *
+virtDBusUtilBusPathForVirStorageVol(virStorageVolPtr storageVol,
+ const gchar *storageVolPath)
+{
+ const gchar *key = NULL;
+ g_autofree const gchar *encodedKey = NULL;
+
+ key = virStorageVolGetKey(storageVol);
+ encodedKey = virtDBusUtilEncodeStr(key);
+
+ return g_strdup_printf("%s/%s", storageVolPath, encodedKey);
+}
+
+void
+virtDBusUtilVirStorageVolListFree(virStorageVolPtr *storageVols)
+{
+ for (gint i = 0; storageVols[i] != NULL; i++)
+ virStorageVolFree(storageVols[i]);
+
+ g_free(storageVols);
+}
diff --git a/src/util.h b/src/util.h
index 56e0409..bf08d5d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -133,3 +133,19 @@ virtDBusUtilVirStoragePoolListFree(virStoragePoolPtr *storagePools);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStoragePool, virStoragePoolFree);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStoragePoolPtr,
virtDBusUtilVirStoragePoolListFree);
+
+virStorageVolPtr
+virtDBusUtilVirStorageVolFromBusPath(virConnectPtr connection,
+ const gchar *path,
+ const gchar *storageVolPath);
+
+gchar *
+virtDBusUtilBusPathForVirStorageVol(virStorageVolPtr storageVol,
+ const gchar *storageVolPath);
+
+void
+virtDBusUtilVirStorageVolListFree(virStorageVolPtr *storageVols);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageVol, virStorageVolFree);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageVolPtr,
+ virtDBusUtilVirStorageVolListFree);
--
2.15.0
More information about the libvir-list
mailing list