From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43781 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OrFTS-0004P4-HL for qemu-devel@nongnu.org; Thu, 02 Sep 2010 15:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OrFTQ-0004il-Km for qemu-devel@nongnu.org; Thu, 02 Sep 2010 15:29:26 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:55340) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OrFTQ-0004ib-Fi for qemu-devel@nongnu.org; Thu, 02 Sep 2010 15:29:24 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o82JKLY1012539 for ; Thu, 2 Sep 2010 13:20:21 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o82JTNh3036528 for ; Thu, 2 Sep 2010 13:29:23 -0600 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 o82JTMLk022482 for ; Thu, 2 Sep 2010 13:29:22 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Thu, 2 Sep 2010 12:39:47 -0700 Message-Id: <1283456388-13083-28-git-send-email-jvrao@linux.vnet.ibm.com> In-Reply-To: <1283456388-13083-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1283456388-13083-1-git-send-email-jvrao@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V5 27/28] [virtio-9p] This patch implements TLERROR/RLERROR on the qemu 9P server. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Arun R Bharadwaj , aliguori@us.ibm.com, Venkateswararao Jujjuri 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 60a40b9..4b15ce7 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -844,17 +844,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, -- 1.6.5.2