[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/22] fsdev: 9p-marshal: introduce V9fsBlob
From: |
Wei Liu |
Subject: |
[Qemu-devel] [PATCH 11/22] fsdev: 9p-marshal: introduce V9fsBlob |
Date: |
Tue, 5 Jan 2016 19:05:50 +0000 |
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 <address@hidden>
---
fsdev/9p-marshal.c | 7 +++++++
fsdev/9p-marshal.h | 14 ++++++++++++++
fsdev/virtio-9p-marshal.c | 26 ++++++++++++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c
index 610978e..b457d49 100644
--- a/fsdev/9p-marshal.c
+++ b/fsdev/9p-marshal.c
@@ -55,3 +55,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;
+}
diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h
index e91b24e..5a0150b 100644
--- a/fsdev/9p-marshal.h
+++ b/fsdev/9p-marshal.h
@@ -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
diff --git a/fsdev/virtio-9p-marshal.c b/fsdev/virtio-9p-marshal.c
index f236bab..c3ac316 100644
--- a/fsdev/virtio-9p-marshal.c
+++ b/fsdev/virtio-9p-marshal.c
@@ -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",
--
2.1.4
- [Qemu-devel] [PATCH 02/22] 9pfs: rename virtio-9p-handle.c to 9p-handle.c, (continued)
- [Qemu-devel] [PATCH 02/22] 9pfs: rename virtio-9p-handle.c to 9p-handle.c, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 09/22] 9pfs: remove dead code, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 06/22] 9pfs: rename virtio-9p-synth.{c, h} to 9p-synth.{c, h}, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 04/22] 9pfs: rename virtio-9p-posix-acl.c to 9p-posix-acl.c, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 07/22] 9pfs: rename virtio-9p-xattr{, -user}.{c, h} to 9p-xattr{, -user}.{c, h}, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 01/22] 9pfs: rename virtio-9p-coth.{c, h} to coth.{c, h}, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 05/22] 9pfs: rename virtio-9p-proxy.{c, h} to 9p-proxy.{c, h}, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 11/22] fsdev: 9p-marshal: introduce V9fsBlob,
Wei Liu <=
- [Qemu-devel] [PATCH 10/22] fsdev: break out 9p-marshal.{c, h} from virtio-9p-marshal.{c, h}, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 15/22] 9pfs: PDU processing functions should start pdu_ prefix, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 22/22] 9pfs: disentangle V9fsState, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 18/22] 9pfs: factor out pdu_push_and_notify, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 21/22] 9pfs: factor out v9fs_device_{, un}realize_common, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 19/22] 9pfs: break out virtio_init_iov_from_pdu, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 16/22] 9pfs: make pdu_{, un}marshal proper functions, Wei Liu, 2016/01/05
- [Qemu-devel] [PATCH 20/22] 9pfs: break out generic code from virtio-9p.{c, h}, Wei Liu, 2016/01/05