From patchwork Thu Apr 29 12:14:51 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: 51280 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 7A34AB6EFF for ; Thu, 29 Apr 2010 22:38:03 +1000 (EST) Received: from localhost ([127.0.0.1]:55544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7Syv-0003Cp-Qc for incoming@patchwork.ozlabs.org; Thu, 29 Apr 2010 08:36:41 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7Sei-0005hH-GH for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:15:48 -0400 Received: from [140.186.70.92] (port=45863 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7See-0005f4-PR for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:15:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7Sec-0006sh-Tl for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:15:44 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:37047) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7Sec-0006sU-Co for qemu-devel@nongnu.org; Thu, 29 Apr 2010 08:15:42 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp04.au.ibm.com (8.14.3/8.13.1) with ESMTP id o3TCBhrZ021469 for ; Thu, 29 Apr 2010 22:11:43 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3TCFfwm1061086 for ; Thu, 29 Apr 2010 22:15:41 +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 o3TCFdVT020114 for ; Thu, 29 Apr 2010 22:15:40 +1000 Received: from skywalker.in.ibm.com ([9.124.222.113]) by d23av04.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o3TCF896018931; Thu, 29 Apr 2010 22:15:37 +1000 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Thu, 29 Apr 2010 17:44:51 +0530 Message-Id: <1272543303-9830-10-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4.360.g11766c 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> 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, jvrao@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH -V6 09/21] virtio-9p: Add P9_TVERSION 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 Implement P9_TVERSION support. [sripathik@in.ibm.com: Handle unknown 9P versions as per the standards] Signed-off-by: Anthony Liguori Signed-off-by: Aneesh Kumar K.V --- hw/virtio-9p.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index c31f48c..c1c7723 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -843,9 +843,20 @@ static void v9fs_dummy(V9fsState *s, V9fsPDU *pdu) static void v9fs_version(V9fsState *s, V9fsPDU *pdu) { - if (debug_9p_pdu) { - pprint_pdu(pdu); + int32_t msize; + V9fsString version; + size_t offset = 7; + + pdu_unmarshal(pdu, offset, "ds", &msize, &version); + + if (strcmp(version.data, "9P2000.u")) { + v9fs_string_sprintf(&version, "unknown"); } + + offset += pdu_marshal(pdu, offset, "ds", msize, &version); + complete_pdu(s, pdu, offset); + + v9fs_string_free(&version); } static void v9fs_attach(V9fsState *s, V9fsPDU *pdu)