From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=38877 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OYfGq-00076b-3C
	for qemu-devel@nongnu.org; Tue, 13 Jul 2010 09:11:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <aneesh.kumar@linux.vnet.ibm.com>) id 1OYfGf-000578-Lq
	for qemu-devel@nongnu.org; Tue, 13 Jul 2010 09:11:26 -0400
Received: from e23smtp02.au.ibm.com ([202.81.31.144]:52457)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aneesh.kumar@linux.vnet.ibm.com>) id 1OYfGf-00056E-5f
	for qemu-devel@nongnu.org; Tue, 13 Jul 2010 09:11:25 -0400
Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246])
	by e23smtp02.au.ibm.com (8.14.4/8.13.1) with ESMTP id o6DD7QaY032331
	for <qemu-devel@nongnu.org>; Tue, 13 Jul 2010 23:07:26 +1000
Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138])
	by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id
	o6DDBL72696326
	for <qemu-devel@nongnu.org>; Tue, 13 Jul 2010 23:11:21 +1000
Received: from d23av02.au.ibm.com (loopback [127.0.0.1])
	by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id
	o6DDBKdS020879
	for <qemu-devel@nongnu.org>; Tue, 13 Jul 2010 23:11:20 +1000
Message-ID: <4C3C65F6.4020908@linux.vnet.ibm.com>
Date: Tue, 13 Jul 2010 18:41:18 +0530
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 2/2] [virtio-9p] Implement TLERROR/RLERROR.
References: <20100713105441.GA11854@linux.vnet.ibm.com>
	<20100713105630.GB11854@linux.vnet.ibm.com>
In-Reply-To: <20100713105630.GB11854@linux.vnet.ibm.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: arun@linux.vnet.ibm.com
Cc: qemu-devel@nongnu.org

On Tuesday 13 July 2010 04:26 PM, Arun R Bharadwaj wrote:
> * Arun R Bharadwaj<arun@linux.vnet.ibm.com>  [2010-07-13 16:24:41]:
>
> This patch implements TLERROR/RLERROR in the qemu 9P server.
>
> Signed-off-by: Arun R Bharadwaj<arun@linux.vnet.ibm.com>
> ---
>   hw/virtio-9p.c |   19 +++++++++++++------
>   hw/virtio-9p.h |    2 ++
>   2 files changed, 15 insertions(+), 6 deletions(-)
>
> Index: qemu/hw/virtio-9p.h
> ===================================================================
> --- qemu.orig/hw/virtio-9p.h
> +++ qemu/hw/virtio-9p.h
> @@ -13,6 +13,8 @@
>   #define VIRTIO_9P_MOUNT_TAG 0
>
>   enum {
> +    P9_TLERROR = 6,
> +    P9_RLERROR,
>       P9_TVERSION = 100,
>       P9_RVERSION,
>       P9_TAUTH = 102,
> Index: qemu/hw/virtio-9p.c
> ===================================================================
> --- qemu.orig/hw/virtio-9p.c
> +++ qemu/hw/virtio-9p.c
> @@ -744,17 +744,24 @@ static void complete_pdu(V9fsState *s, V
>       int8_t id = pdu->id + 1; /* Response */
>
>       if (len<  0) {
> -        V9fsString str;
>           int err = -len;
> +        len = 7;
>
> -        str.data = strerror(err);
> -        str.size = strlen(str.data);
> +        if (s->proto_version != V9FS_PROTO_2000L) {
> +            V9fsString str;
> +
> +            str.data = strerror(err);
> +            str.size = strlen(str.data);
> +
> +            len += pdu_marshal(pdu, len, "s",&str);
> +            id = P9_RERROR;
> +        }
>
> -        len = 7;
> -        len += pdu_marshal(pdu, len, "s",&str);
>           len += pdu_marshal(pdu, len, "d", err);
>
> -        id = P9_RERROR;
> +        if (s->proto_version == V9FS_PROTO_2000L) {
> +            id = P9_RLERROR;
> +        }
>       }

I guess this can go in the else part of the above if loop
ie

if (s->proto_version != V9FS_PROTO_2000L) {

  id = P9_RERROR;
} else {
id = P9_RLERROR;
}


-aneesh