From patchwork Fri Apr 21 20:14:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 9693651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1A77B601D4 for ; Fri, 21 Apr 2017 20:18:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C68E28673 for ; Fri, 21 Apr 2017 20:18:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00C5A28677; Fri, 21 Apr 2017 20:18:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7483428673 for ; Fri, 21 Apr 2017 20:18:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d1exl-00009w-1w; Fri, 21 Apr 2017 20:15:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d1exj-00007g-Q9 for xen-devel@lists.xenproject.org; Fri, 21 Apr 2017 20:15:27 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 24/A2-02183-E586AF85; Fri, 21 Apr 2017 20:15:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRWlGSWpSXmKPExsVybKJsh25cxq8 Ig21n5Cy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oy/J5exFPRyVzzcvZ29gfErRxcjF4eQwFRG iZPH7rJAOG1MEicmzWfqYuTkYBMwlPj7ZBMbiC0iICPReWkRI0gRs8BqJolnr8+DJYQFbCTOH FrGCGKzCKhKvPvfyNzFyMHBK+Au8WpXJkhYQkAOaMFkVhCbEyh8fPIHVohl7YwST240gSV4BQ QlTs58wgLSyyygLrF+nhBImFlAXqJ562xmiDkZEvN65rBC2F4Si25cgrLVJK6e28Q8gVFwFpJ JsxAmzUIyaQEj8ypGjeLUorLUIl1Dc72kosz0jJLcxMwcXUMDY73c1OLixPTUnMSkYr3k/NxN jMCwZQCCHYwvT3seYpTkYFIS5Q35/TNCiC8pP6UyI7E4I76oNCe1+BCjDAeHkgRvT/qvCCHBo tT01Iq0zBxgBMGkJTh4lER4L4OkeYsLEnOLM9MhUqcYFaXEeXeCJARAEhmleXBtsKi9xCgrJc zLCHSIEE9BalFuZgmq/CtGcQ5GJWFeL5ApPJl5JXDTXwEtZgJafNbvB8jikkSElFQDo/LmM5e PT/2lf+Jm5qdNlx/WfYsPE5I6ySCzYnmGS1mN37SlpS5cEyf81dqi3Wardd24NasxwzRA76Jn 4+Zj0ma/JjJ4zZzEleXIIVgsquh5W9extTcnRO7BKZlJF21/xAVWzKnonPRg8fS559//PBy9o jFWePLXgt/vNPLnJccsmfrI2Ut3nxJLcUaioRZzUXEiANqf0LnVAgAA X-Env-Sender: sstabellini@kernel.org X-Msg-Ref: server-5.tower-31.messagelabs.com!1492805725!93585481!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18455 invoked from network); 21 Apr 2017 20:15:26 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-5.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 21 Apr 2017 20:15:26 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08CDA2025A; Fri, 21 Apr 2017 20:15:24 +0000 (UTC) Received: from localhost.localdomain (unknown [99.165.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D5F320256; Fri, 21 Apr 2017 20:15:22 +0000 (UTC) From: Stefano Stabellini To: peter.maydell@linaro.org Date: Fri, 21 Apr 2017 13:14:52 -0700 Message-Id: <1492805702-19690-11-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492805702-19690-1-git-send-email-sstabellini@kernel.org> References: <1492805702-19690-1-git-send-email-sstabellini@kernel.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Cc: jgross@suse.com, sstabellini@kernel.org, stefanha@gmail.com, qemu-devel@nongnu.org, Greg Kurz , Stefano Stabellini , "Aneesh Kumar K.V" , stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org Subject: [Xen-devel] [PULL 11/21] 9p: introduce a type for the 9p header X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use the new type in virtio-9p-device. Signed-off-by: Stefano Stabellini Reviewed-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daudé CC: anthony.perard@citrix.com CC: jgross@suse.com CC: Aneesh Kumar K.V CC: Greg Kurz --- hw/9pfs/9p.h | 6 ++++++ hw/9pfs/virtio-9p-device.c | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index b7e8362..5312d8a 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -119,6 +119,12 @@ static inline char *rpath(FsContext *ctx, const char *path) typedef struct V9fsPDU V9fsPDU; struct V9fsState; +typedef struct { + uint32_t size_le; + uint8_t id; + uint16_t tag_le; +} QEMU_PACKED P9MsgHeader; + struct V9fsPDU { uint32_t size; diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 27a4a32..3782f43 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -46,11 +46,7 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) VirtQueueElement *elem; while ((pdu = pdu_alloc(s))) { - struct { - uint32_t size_le; - uint8_t id; - uint16_t tag_le; - } QEMU_PACKED out; + P9MsgHeader out; elem = virtqueue_pop(vq, sizeof(VirtQueueElement)); if (!elem) {