From patchwork Mon Jun 28 21:55:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 57199 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 0A970B6EE9 for ; Tue, 29 Jun 2010 08:00:48 +1000 (EST) Received: from localhost ([127.0.0.1]:38634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTMNc-0001k8-Gc for incoming@patchwork.ozlabs.org; Mon, 28 Jun 2010 18:00:40 -0400 Received: from [140.186.70.92] (port=59153 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTMFB-00059A-63 for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:52:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTMF7-0006rl-N5 for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:51:56 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:39944) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTMF7-0006rR-G0 for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:51:53 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5SLhlIC013751 for ; Mon, 28 Jun 2010 15:43:47 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5SLpnpn112098 for ; Mon, 28 Jun 2010 15:51:49 -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 o5SLpilm026844 for ; Mon, 28 Jun 2010 15:51:45 -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 o5SLpX8C026203; Mon, 28 Jun 2010 15:51:43 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Mon, 28 Jun 2010 14:55:13 -0700 Message-Id: <1277762117-11212-16-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1277762117-11212-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1277762117-11212-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 16/20] 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 Signed-off-by: M. Mohan Kumar Signed-off-by: Venkateswararao Jujjuri --- hw/virtio-9p.c | 24 ++++++++++++++++++++++-- hw/virtio-9p.h | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 156d5dd..a9da10f 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -1591,8 +1591,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; @@ -1604,8 +1615,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; @@ -3046,6 +3065,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 e9cc458..0c79400 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,