[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 12/27] 9pfs: use V9fsBlob to transmit xattr
From: |
Aneesh Kumar K.V |
Subject: |
Re: [Qemu-devel] [PATCH v2 12/27] 9pfs: use V9fsBlob to transmit xattr |
Date: |
Fri, 08 Jan 2016 14:00:31 +0530 |
User-agent: |
Notmuch/0.20.2 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) |
Wei Liu <address@hidden> writes:
> And make v9fs_pack static function. Now we only need to export
> v9fs_{,un}marshal to device.
>
> Signed-off-by: Wei Liu <address@hidden>
> ---
> fsdev/virtio-9p-marshal.c | 4 ++--
> fsdev/virtio-9p-marshal.h | 3 ---
> hw/9pfs/virtio-9p.c | 21 +++++++++++++--------
> 3 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/fsdev/virtio-9p-marshal.c b/fsdev/virtio-9p-marshal.c
> index c3ac316..d120bd2 100644
> --- a/fsdev/virtio-9p-marshal.c
> +++ b/fsdev/virtio-9p-marshal.c
> @@ -70,8 +70,8 @@ static ssize_t v9fs_unpack(void *dst, struct iovec *out_sg,
> int out_num,
> return v9fs_packunpack(dst, out_sg, out_num, offset, size, 0);
> }
>
> -ssize_t v9fs_pack(struct iovec *in_sg, int in_num, size_t offset,
> - const void *src, size_t size)
> +static ssize_t v9fs_pack(struct iovec *in_sg, int in_num, size_t offset,
> + const void *src, size_t size)
> {
> return v9fs_packunpack((void *)src, in_sg, in_num, offset, size, 1);
> }
> diff --git a/fsdev/virtio-9p-marshal.h b/fsdev/virtio-9p-marshal.h
> index 0709bcd..766a48e 100644
> --- a/fsdev/virtio-9p-marshal.h
> +++ b/fsdev/virtio-9p-marshal.h
> @@ -3,9 +3,6 @@
>
> #include "9p-marshal.h"
>
> -
> -ssize_t v9fs_pack(struct iovec *in_sg, int in_num, size_t offset,
> - const void *src, size_t size);
> ssize_t v9fs_unmarshal(struct iovec *out_sg, int out_num, size_t offset,
> int bswap, const char *fmt, ...);
> ssize_t v9fs_marshal(struct iovec *in_sg, int in_num, size_t offset,
> diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
> index 30ff828..654c103 100644
> --- a/hw/9pfs/virtio-9p.c
> +++ b/hw/9pfs/virtio-9p.c
> @@ -1561,6 +1561,7 @@ static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu,
> V9fsFidState *fidp,
> size_t offset = 7;
> int read_count;
> int64_t xattr_len;
> + V9fsBlob blob;
>
> xattr_len = fidp->fs.xattr.len;
> read_count = xattr_len - off;
> @@ -1572,14 +1573,18 @@ static int v9fs_xattr_read(V9fsState *s, V9fsPDU
> *pdu, V9fsFidState *fidp,
> */
> read_count = 0;
> }
> - err = pdu_marshal(pdu, offset, "d", read_count);
> - if (err < 0) {
> - return err;
> - }
> - offset += err;
> - err = v9fs_pack(pdu->elem.in_sg, pdu->elem.in_num, offset,
> - ((char *)fidp->fs.xattr.value) + off,
> - read_count);
> +
> + v9fs_blob_init(&blob);
> +
> + blob.data = g_malloc(read_count);
> + memcpy(blob.data, ((char *)fidp->fs.xattr.value) + off,
> + read_count);
> + blob.size = read_count;
> +
> + err = pdu_marshal(pdu, offset, "dB", read_count, &blob);
Is this correct ?
earlier we had read_count <data>
now we have
read_count, <blob> which is read_count, blob->size, data
-aneesh
- [Qemu-devel] [PATCH v2 03/27] 9pfs: rename virtio-9p-local.c to 9p-local.c, (continued)
- [Qemu-devel] [PATCH v2 03/27] 9pfs: rename virtio-9p-local.c to 9p-local.c, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 04/27] 9pfs: rename virtio-9p-posix-acl.c to 9p-posix-acl.c, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 09/27] 9pfs: remove dead code, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 07/27] 9pfs: rename virtio-9p-xattr{, -user}.{c, h} to 9p-xattr{, -user}.{c, h}, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 06/27] 9pfs: rename virtio-9p-synth.{c, h} to 9p-synth.{c, h}, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 02/27] 9pfs: rename virtio-9p-handle.c to 9p-handle.c, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 05/27] 9pfs: rename virtio-9p-proxy.{c, h} to 9p-proxy.{c, h}, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 08/27] 9pfs: merge hw/virtio/virtio-9p.h into hw/9pfs/virtio-9p.h, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 01/27] 9pfs: rename virtio-9p-coth.{c, h} to coth.{c, h}, Wei Liu, 2016/01/07
- [Qemu-devel] [PATCH v2 12/27] 9pfs: use V9fsBlob to transmit xattr, Wei Liu, 2016/01/07
- Re: [Qemu-devel] [PATCH v2 12/27] 9pfs: use V9fsBlob to transmit xattr,
Aneesh Kumar K.V <=
[Qemu-devel] [PATCH v2 10/27] fsdev: break out 9p-marshal.{c, h} from virtio-9p-marshal.{c, h}, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 24/27] 9pfs: rename virtio_9p_set_fd_limit to use v9fs_ prefix, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 26/27] 9pfs: factor out v9fs_device_{, un}realize_common, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 16/27] 9pfs: make pdu_{, un}marshal proper functions, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 14/27] 9pfs: PDU processing functions don't need to take V9fsState as argument, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 13/27] fsdev: rename virtio-9p-marshal.{c, h} to 9p-iov-marshal.{c, h}, Wei Liu, 2016/01/07
[Qemu-devel] [PATCH v2 18/27] 9pfs: factor out pdu_push_and_notify, Wei Liu, 2016/01/07