From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7SfE-00062g-02 for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:16:20 -0400 Received: from [140.186.70.92] (port=46011 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7SfC-000614-5Y for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:16:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7Sf9-0006yB-1N for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:16:17 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:57018) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7Sf8-0006y3-B8 for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:16:14 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp03.au.ibm.com (8.14.3/8.13.1) with ESMTP id o3TCCsnW013917 for ; Thu, 29 Apr 2010 22:12:54 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3TC9RNW1560616 for ; Thu, 29 Apr 2010 22:09:27 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o3TCGCdM021120 for ; Thu, 29 Apr 2010 22:16:12 +1000 From: "Aneesh Kumar K.V" Date: Thu, 29 Apr 2010 17:45:02 +0530 Message-Id: <1272543303-9830-21-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1272543303-9830-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1272543303-9830-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V6 20/21] virtio-9p: Add P9_TFLUSH support List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ericvh@gmail.com, aliguori@us.ibm.com, jvrao@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com 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 ca8cf6e..e5d0112 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -932,35 +932,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; @@ -1959,10 +1930,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 { -- 1.7.0.4.360.g11766c