From patchwork Tue Jan 5 19:05:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 563290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F29D01402BC for ; Wed, 6 Jan 2016 06:37:31 +1100 (AEDT) Received: from localhost ([::1]:51256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGXQ8-0006LT-Pq for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2016 14:37:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGXLT-0005Fn-WF for qemu-devel@nongnu.org; Tue, 05 Jan 2016 14:32:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGXLR-0001EU-Qk for qemu-devel@nongnu.org; Tue, 05 Jan 2016 14:32:39 -0500 Received: from smtp.citrix.com ([66.165.176.89]:26940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGXLR-00018c-HU for qemu-devel@nongnu.org; Tue, 05 Jan 2016 14:32:37 -0500 X-IronPort-AV: E=Sophos;i="5.20,525,1444694400"; d="scan'208";a="323036148" From: Wei Liu To: Date: Tue, 5 Jan 2016 19:05:51 +0000 Message-ID: <1452020761-24457-13-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452020761-24457-1-git-send-email-wei.liu2@citrix.com> References: <1452020761-24457-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: "Michael S. Tsirkin" , Wei Liu , "Aneesh Kumar K.V" , Greg Kurz Subject: [Qemu-devel] [PATCH 12/22] 9pfs: use V9fsBlob to transmit xattr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org And make v9fs_pack static function. Now we only need to export v9fs_{,un}marshal to device. Signed-off-by: Wei Liu --- 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 084fa6a..5da25ec 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); + + v9fs_blob_free(&blob); + if (err < 0) { return err; }