From patchwork Sun Aug 29 19:02:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 62967 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 BDCA7B70F2 for ; Mon, 30 Aug 2010 05:49:21 +1000 (EST) Received: from localhost ([127.0.0.1]:55533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OpncS-000129-Mq for incoming@patchwork.ozlabs.org; Sun, 29 Aug 2010 15:32:44 -0400 Received: from [140.186.70.92] (port=51457 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Opn06-0002DY-I4 for qemu-devel@nongnu.org; Sun, 29 Aug 2010 14:53:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Opn03-0001df-Au for qemu-devel@nongnu.org; Sun, 29 Aug 2010 14:53:06 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:53833) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Opn03-0001db-8g for qemu-devel@nongnu.org; Sun, 29 Aug 2010 14:53:03 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e7.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o7TIcwne005294 for ; Sun, 29 Aug 2010 14:38:58 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o7TIr25A048810 for ; Sun, 29 Aug 2010 14:53:02 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o7TIr1wR004403 for ; Sun, 29 Aug 2010 12:53:02 -0600 Received: from localhost.localdomain (elm9m80.beaverton.ibm.com [9.47.81.80]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o7TIqkJh003851; Sun, 29 Aug 2010 12:53:01 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Sun, 29 Aug 2010 12:02:51 -0700 Message-Id: <1283108572-20228-26-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1283108572-20228-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1283108572-20228-1-git-send-email-jvrao@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Arun R Bharadwaj , aliguori@us.ibm.com, Venkateswararao Jujjuri Subject: [Qemu-devel] [PATCH -V4 25/26] [virtio-9p] This patch implements TLERROR/RLERROR on the qemu 9P server. 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: Arun R Bharadwaj Signed-off-by: Arun R Bharadwaj Signed-off-by: Venkateswararao Jujjuri --- hw/virtio-9p.c | 19 +++++++++++++------ hw/virtio-9p.h | 2 ++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 94dff78..b6cbbbb 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -832,17 +832,24 @@ static void complete_pdu(V9fsState *s, V9fsPDU *pdu, ssize_t len) 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; + } } /* fill out the header */ diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 016ba1d..0816ad6 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -13,6 +13,8 @@ #define VIRTIO_9P_MOUNT_TAG 0 enum { + P9_TLERROR = 6, + P9_RLERROR, P9_TSTATFS = 8, P9_RSTATFS, P9_TLOPEN = 12,