@@ -54,3 +54,10 @@ void v9fs_string_copy(V9fsString *lhs, V9fsString *rhs)
v9fs_string_free(lhs);
v9fs_string_sprintf(lhs, "%s", rhs->data);
}
+
+void v9fs_blob_free(V9fsBlob *blob)
+{
+ g_free(blob->data);
+ blob->data = NULL;
+ blob->size = 0;
+}
@@ -7,6 +7,12 @@ typedef struct V9fsString
char *data;
} V9fsString;
+typedef struct V9fsBlob
+{
+ uint16_t size;
+ void *data;
+} V9fsBlob;
+
typedef struct V9fsQID
{
int8_t type;
@@ -81,4 +87,12 @@ extern void v9fs_string_null(V9fsString *str);
extern void v9fs_string_sprintf(V9fsString *str, const char *fmt, ...);
extern void v9fs_string_copy(V9fsString *lhs, V9fsString *rhs);
+static inline void v9fs_blob_init(V9fsBlob *blob)
+{
+ blob->data = NULL;
+ blob->size = 0;
+}
+
+extern void v9fs_blob_free(V9fsBlob *blob);
+
#endif
@@ -142,6 +142,21 @@ ssize_t v9fs_unmarshal(struct iovec *out_sg, int out_num, size_t offset,
}
break;
}
+ case 'B': {
+ V9fsBlob *blob = va_arg(ap, V9fsBlob *);
+ copied = v9fs_unmarshal(out_sg, out_num, offset, bswap,
+ "w", &blob->size);
+ if (copied > 0) {
+ offset += copied;
+ blob->data = g_malloc(blob->size);
+ copied = v9fs_unpack(blob->data, out_sg, out_num, offset,
+ blob->size);
+ if (copied < 0) {
+ v9fs_blob_free(blob);
+ }
+ }
+ break;
+ }
case 'Q': {
V9fsQID *qidp = va_arg(ap, V9fsQID *);
copied = v9fs_unmarshal(out_sg, out_num, offset, bswap, "bdq",
@@ -241,6 +256,17 @@ ssize_t v9fs_marshal(struct iovec *in_sg, int in_num, size_t offset,
}
break;
}
+ case 'B': {
+ V9fsBlob *blob = va_arg(ap, V9fsBlob *);
+ copied = v9fs_marshal(in_sg, in_num, offset, bswap,
+ "w", blob->size);
+ if (copied > 0) {
+ offset += copied;
+ copied = v9fs_pack(in_sg, in_num, offset, blob->data,
+ blob->size);
+ }
+ break;
+ }
case 'Q': {
V9fsQID *qidp = va_arg(ap, V9fsQID *);
copied = v9fs_marshal(in_sg, in_num, offset, bswap, "bdq",
Introduce a concept of blob. It will be used to pack / unpack xattr value. With this change there is no need to expose v9fs_pack to device code anymore. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- fsdev/9p-marshal.c | 7 +++++++ fsdev/9p-marshal.h | 14 ++++++++++++++ fsdev/virtio-9p-marshal.c | 26 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+)