From patchwork Sun Aug 29 19:02:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 62960 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 650F9B70DE for ; Mon, 30 Aug 2010 05:17:57 +1000 (EST) Received: from localhost ([127.0.0.1]:50964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OpnO5-0004qx-VP for incoming@patchwork.ozlabs.org; Sun, 29 Aug 2010 15:17:54 -0400 Received: from [140.186.70.92] (port=51367 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Opn00-00029j-Mq for qemu-devel@nongnu.org; Sun, 29 Aug 2010 14:53:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Opmzy-0001bK-18 for qemu-devel@nongnu.org; Sun, 29 Aug 2010 14:53:00 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:48282) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Opmzx-0001b7-Uo for qemu-devel@nongnu.org; Sun, 29 Aug 2010 14:52:57 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o7TIqfaZ013743 for ; Sun, 29 Aug 2010 14:52:41 -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 o7TIqvku096494 for ; Sun, 29 Aug 2010 14:52:57 -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 o7TIqufk004186 for ; Sun, 29 Aug 2010 12:52:56 -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 o7TIqkJY003851; Sun, 29 Aug 2010 12:52:56 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Sun, 29 Aug 2010 12:02:42 -0700 Message-Id: <1283108572-20228-17-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: aliguori@us.ibm.com, "M. Mohan Kumar" , Venkateswararao Jujjuri Subject: [Qemu-devel] [PATCH -V4 16/26] [virtio-9p] qemu: virtio-9p: Implement LOPEN 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: M. Mohan Kumar Implement 9p2000.L version of open(LOPEN) interface in qemu 9p server. For LOPEN, no need to convert the flags to and from 9p mode to VFS mode. Synopsis: size[4] Tlopen tag[2] fid[4] mode[4] size[4] Rlopen tag[2] qid[13] iounit[4] Current qemu 9p server does not support following flags: O_NOCTTY, O_NONBLOCK, O_ASYNC & O_CLOEXEC [Fix mode format - jvrao@linux.vnet.ibm.com] Signed-off-by: M. Mohan Kumar Signed-off-by: Venkateswararao Jujjuri --- hw/virtio-9p.c | 32 ++++++++++++++++++++++++++++---- hw/virtio-9p.h | 4 +++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 88dd496..deeacbd 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -1621,8 +1621,19 @@ out: qemu_free(vs); } +static inline int valid_flags(int flag) +{ + if (flag & O_NOCTTY || flag & O_NONBLOCK || flag & O_ASYNC || + flag & O_CLOEXEC) + return 0; + else + return 1; +} + static void v9fs_open_post_lstat(V9fsState *s, V9fsOpenState *vs, int err) { + int flags; + if (err) { err = -errno; goto out; @@ -1634,8 +1645,16 @@ static void v9fs_open_post_lstat(V9fsState *s, V9fsOpenState *vs, int err) vs->fidp->dir = v9fs_do_opendir(s, &vs->fidp->path); v9fs_open_post_opendir(s, vs, err); } else { - vs->fidp->fd = v9fs_do_open(s, &vs->fidp->path, - omode_to_uflags(vs->mode)); + if (s->proto_version == V9FS_PROTO_2000L) { + if (!valid_flags(vs->mode)) { + err = -EINVAL; + goto out; + } + flags = vs->mode; + } else { + flags = omode_to_uflags(vs->mode); + } + vs->fidp->fd = v9fs_do_open(s, &vs->fidp->path, flags); v9fs_open_post_open(s, vs, err); } return; @@ -1650,12 +1669,16 @@ static void v9fs_open(V9fsState *s, V9fsPDU *pdu) V9fsOpenState *vs; ssize_t err = 0; - vs = qemu_malloc(sizeof(*vs)); vs->pdu = pdu; vs->offset = 7; + vs->mode = 0; - pdu_unmarshal(vs->pdu, vs->offset, "db", &fid, &vs->mode); + if (s->proto_version == V9FS_PROTO_2000L) { + pdu_unmarshal(vs->pdu, vs->offset, "dd", &fid, &vs->mode); + } else { + pdu_unmarshal(vs->pdu, vs->offset, "db", &fid, &vs->mode); + } vs->fidp = lookup_fid(s, fid); if (vs->fidp == NULL) { @@ -3076,6 +3099,7 @@ static pdu_handler_t *pdu_handlers[] = { [P9_TRENAME] = v9fs_rename, [P9_TMKDIR] = v9fs_mkdir, [P9_TVERSION] = v9fs_version, + [P9_TLOPEN] = v9fs_open, [P9_TATTACH] = v9fs_attach, [P9_TSTAT] = v9fs_stat, [P9_TWALK] = v9fs_walk, diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 4d179b7..cd7c67e 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -15,6 +15,8 @@ enum { P9_TSTATFS = 8, P9_RSTATFS, + P9_TLOPEN = 12, + P9_RLOPEN, P9_TLCREATE = 14, P9_RLCREATE, P9_TSYMLINK = 16, @@ -259,7 +261,7 @@ typedef struct V9fsWalkState { typedef struct V9fsOpenState { V9fsPDU *pdu; size_t offset; - int8_t mode; + int32_t mode; V9fsFidState *fidp; V9fsQID qid; struct stat stbuf;