Re: [PATCH v3 04/15] util: virstoragefile: Add data structure for storing storage source slices

[Ján Tomko]

On Wed, Feb 12, 2020 at 07:03:15PM +0100, Peter Krempa wrote:

Introduce virStorageSourceSlice which will store the 'offset' and 'size'
of a virStorageSource and declare it as 'sliceStorage' and 'sliceFormat'
attributes of a virStorageSource.

Signed-off-by: Peter Krempa 
---
src/util/virstoragefile.c | 29 +
src/util/virstoragefile.h | 12 
2 files changed, 41 insertions(+)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature

[PATCH v3 04/15] util: virstoragefile: Add data structure for storing storage source slices

[Peter Krempa]

Introduce virStorageSourceSlice which will store the 'offset' and 'size'
of a virStorageSource and declare it as 'sliceStorage' and 'sliceFormat'
attributes of a virStorageSource.

Signed-off-by: Peter Krempa 
---
 src/util/virstoragefile.c | 29 +
 src/util/virstoragefile.h | 12 
 2 files changed, 41 insertions(+)

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 7ffb2cdcf4..890ec69929 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2248,6 +2248,30 @@ virStorageSourcePoolDefCopy(const 
virStorageSourcePoolDef *src)
 }


+static virStorageSourceSlicePtr
+virStorageSourceSliceCopy(const virStorageSourceSlice *src)
+{
+virStorageSourceSlicePtr ret = g_new0(virStorageSourceSlice, 1);
+
+ret->offset = src->offset;
+ret->size = src->size;
+ret->nodename = g_strdup(src->nodename);
+
+return ret;
+}
+
+
+static void
+virStorageSourceSliceFree(virStorageSourceSlicePtr slice)
+{
+if (!slice)
+return;
+
+g_free(slice->nodename);
+g_free(slice);
+}
+
+
 /**
  * virStorageSourcePtr:
  *
@@ -2302,6 +2326,9 @@ virStorageSourceCopy(const virStorageSource *src,
 def->tlsAlias = g_strdup(src->tlsAlias);
 def->tlsCertdir = g_strdup(src->tlsCertdir);

+if (src->sliceStorage)
+def->sliceStorage = virStorageSourceSliceCopy(src->sliceStorage);
+
 if (src->nhosts) {
 if (!(def->hosts = virStorageNetHostDefCopy(src->nhosts, src->hosts)))
 return NULL;
@@ -2581,6 +2608,8 @@ virStorageSourceClear(virStorageSourcePtr def)
 VIR_FREE(def->timestamps);
 VIR_FREE(def->externalDataStoreRaw);

+virStorageSourceSliceFree(def->sliceStorage);
+
 virObjectUnref(def->externalDataStore);
 def->externalDataStore = NULL;

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 39e50a989d..1f41e6e357 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -242,6 +242,16 @@ struct _virStorageSourceNVMeDef {
 /* Don't forget to update virStorageSourceNVMeDefCopy */
 };

+
+typedef struct _virStorageSourceSlice virStorageSourceSlice;
+typedef virStorageSourceSlice *virStorageSourceSlicePtr;
+struct _virStorageSourceSlice {
+unsigned long long offset;
+unsigned long long size;
+char *nodename;
+};
+
+
 typedef struct _virStorageDriverData virStorageDriverData;
 typedef virStorageDriverData *virStorageDriverDataPtr;

@@ -286,6 +296,8 @@ struct _virStorageSource {
 bool nocow;
 bool sparse;

+virStorageSourceSlicePtr sliceStorage;
+
 virStoragePermsPtr perms;
 virStorageTimestampsPtr timestamps;
 unsigned long long capacity; /* in bytes, 0 if unknown */
-- 
2.24.1