From patchwork Tue Jan 5 19:05:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 563279 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 809D114030F for ; Wed, 6 Jan 2016 06:32:36 +1100 (AEDT) Received: from localhost ([::1]:51196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGXLO-00051n-2x for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2016 14:32:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGXKt-00042j-2D for qemu-devel@nongnu.org; Tue, 05 Jan 2016 14:32:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGXKp-0000zV-RL for qemu-devel@nongnu.org; Tue, 05 Jan 2016 14:32:03 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:40706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGXKp-0000yz-Mp for qemu-devel@nongnu.org; Tue, 05 Jan 2016 14:31:59 -0500 X-IronPort-AV: E=Sophos;i="5.20,525,1444694400"; d="scan'208";a="329177113" From: Wei Liu To: Date: Tue, 5 Jan 2016 19:05:50 +0000 Message-ID: <1452020761-24457-12-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.63 Cc: Wei Liu , "Aneesh Kumar K.V" , Greg Kurz Subject: [Qemu-devel] [PATCH 11/22] fsdev: 9p-marshal: introduce V9fsBlob 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 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 --- 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",