qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, "M. Mohan Kumar" <mohan@in.ibm.com>,
	Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH -V5 16/28] [virtio-9p] qemu: virtio-9p: Implement LOPEN
Date: Thu,  2 Sep 2010 12:39:36 -0700	[thread overview]
Message-ID: <1283456388-13083-17-git-send-email-jvrao@linux.vnet.ibm.com> (raw)
In-Reply-To: <1283456388-13083-1-git-send-email-jvrao@linux.vnet.ibm.com>

From: M. Mohan Kumar <mohan@in.ibm.com>

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 <mohan@in.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
---
 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;
-- 
1.6.5.2

  parent reply	other threads:[~2010-09-02 19:29 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-02 19:39 [Qemu-devel] [PATCH-V5 00/28] Consolidated VirtFS work Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 01/28] qemu: virtio-9p: Recognize 9P2000.L protocol Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 02/28] qemu: virtio-9p: Implement statfs support in server Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 03/28] virtio-9p: Return correct error from v9fs_remove Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 04/28] [V4] virtio-9p: readdir implementation for 9p2000.L Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 05/28] virtio-9p: Compute iounit based on host filesystem block size Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 06/28] virtio-9p: getattr server implementation for 9P2000.L protocol Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 07/28] virtio-9p: Do not reset atime Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 08/28] [virtio-9p] Make v9fs_do_utimensat accept timespec structures instead of v9stat Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 09/28] virtio-9p: Implement server side of setattr for 9P2000.L protocol Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 10/28] [virtio-9p] Implement TLINK for 9P2000.L Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 11/28] [virtio-9p] Define and implement TSYMLINK " Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 12/28] [virtio-9p] This patch implements TLCREATE for 9p2000.L protocol Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 13/28] qemu: virtio-9p: Implement TMKNOD Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 14/28] qemu: virtio-9p: Implement TMKDIR Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 15/28] rename - change name of file or directory Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` Venkateswararao Jujjuri (JV) [this message]
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 17/28] virtio-9p: Add fidtype so that we can do type specific operation Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 18/28] virtio-9p: Implement TXATTRWALK Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 19/28] virtio-9p: Implement TXATTRCREATE Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 20/28] virtio-9p: Hide user.virtfs xattr in case of mapped security Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 21/28] virtio-9p: Add SM_NONE security model Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 22/28] virtio-9p: Use lchown which won't follow symlink Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 23/28] virtio-9p: Fix the memset usage Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 24/28] virtio-9p: Add support for removing xattr Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 25/28] virtio-9p: Make sure -virtfs option works correctly Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 26/28] [virtio-9p] Remove all instances of unnecessary dotu variable Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 27/28] [virtio-9p] This patch implements TLERROR/RLERROR on the qemu 9P server Venkateswararao Jujjuri (JV)
2010-09-02 19:39 ` [Qemu-devel] [PATCH -V5 28/28] virtio-9p: Change handling of flags in open() path for 9P2000.L Venkateswararao Jujjuri (JV)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1283456388-13083-17-git-send-email-jvrao@linux.vnet.ibm.com \
    --to=jvrao@linux.vnet.ibm.com \
    --cc=aliguori@us.ibm.com \
    --cc=mohan@in.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).