From patchwork Thu Apr 15 14:11:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 50247 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6ED94B7D06 for ; Fri, 16 Apr 2010 00:32:56 +1000 (EST) Received: from localhost ([127.0.0.1]:41123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2Q2S-0005tE-7A for incoming@patchwork.ozlabs.org; Thu, 15 Apr 2010 10:27:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2PtN-0003Ru-60 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:05 -0400 Received: from [140.186.70.92] (port=50355 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2PtF-0003Fy-9x for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2Pn9-0000Mk-Cx for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:11:59 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:41213) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2Pn4-0000Ka-U7 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:11:37 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp06.in.ibm.com (8.14.3/8.13.1) with ESMTP id o3FEBXsa000702 for ; Thu, 15 Apr 2010 19:41:33 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3FEBXBK3031192 for ; Thu, 15 Apr 2010 19:41:33 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o3FEBW4h031033 for ; Thu, 15 Apr 2010 19:41:32 +0530 Received: from skywalker.in.ibm.com ([9.77.204.187]) by d28av01.in.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o3FEBDaO030329; Thu, 15 Apr 2010 19:41:32 +0530 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Thu, 15 Apr 2010 19:41:10 +0530 Message-Id: <1271340671-19558-21-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4.360.g11766c In-Reply-To: <1271340671-19558-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1271340671-19558-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: ericvh@gmail.com, aliguori@us.ibm.com, aneesh.kumar@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH -V5 20/21] virtio-9p: Add P9_TFLUSH support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Anthony Liguori Don't do anything special for flush. Signed-off-by: Anthony Liguori Signed-off-by: Aneesh Kumar K.V --- hw/virtio-9p.c | 35 ++--------------------------------- 1 files changed, 2 insertions(+), 33 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 94b7999..1b64ec8 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -934,35 +934,6 @@ static void print_sg(struct iovec *sg, int cnt) printf("}\n"); } -static void v9fs_dummy(V9fsState *s, V9fsPDU *pdu) -{ - /* Note: The following have been added to prevent GCC from complaining - * They will be removed in the subsequent patches */ - (void)pdu_unmarshal; - (void) complete_pdu; - (void) v9fs_string_init; - (void) v9fs_string_free; - (void) v9fs_string_null; - (void) v9fs_string_sprintf; - (void) v9fs_string_copy; - (void) v9fs_string_size; - (void) v9fs_do_lstat; - (void) v9fs_do_setuid; - (void) v9fs_do_readlink; - (void) v9fs_do_close; - (void) v9fs_do_closedir; - (void) alloc_fid; - (void) free_fid; - (void) fid_to_qid; - (void) v9mode_to_mode; - (void) donttouch_stat; - (void) v9fs_stat_free; - (void) stat_to_v9stat; - (void) adjust_sg; - (void) cap_sg; - (void) print_sg; -} - static void v9fs_fix_path(V9fsString *dst, V9fsString *src, int len) { V9fsString str; @@ -1961,10 +1932,8 @@ out: static void v9fs_flush(V9fsState *s, V9fsPDU *pdu) { - v9fs_dummy(s, pdu); - if (debug_9p_pdu) { - pprint_pdu(pdu); - } + /* A nop call with no return */ + complete_pdu(s, pdu, 7); } typedef struct V9fsRemoveState {