From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4Qmt-00047W-SO for qemu-devel@nongnu.org; Fri, 16 Sep 2011 01:16:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4Qms-0001G8-Jh for qemu-devel@nongnu.org; Fri, 16 Sep 2011 01:16:31 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:38048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4Qmr-0001FP-VV for qemu-devel@nongnu.org; Fri, 16 Sep 2011 01:16:30 -0400 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id p8G59TeC004477 for ; Fri, 16 Sep 2011 15:09:29 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8G5ENkH1581152 for ; Fri, 16 Sep 2011 15:14:25 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8G5GB4F031707 for ; Fri, 16 Sep 2011 15:16:11 +1000 From: "M. Mohan Kumar" Date: Fri, 16 Sep 2011 10:46:10 +0530 Message-Id: <1316150170-25453-1-git-send-email-mohan@in.ibm.com> Subject: [Qemu-devel] [PATCH] hw/9pfs: Add open flag mapping List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Venkateswararao Jujjuri , "Aneesh Kumar K.V" Guest and the host may not be running same architecture. Hence fcntl flag mapping is needed. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Aneesh Kumar K.V Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- hw/9pfs/virtio-9p.h | 24 ++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 181c6c2..818062f 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -72,6 +72,52 @@ static int omode_to_uflags(int8_t mode) return ret; } +static int dotl_to_at_flags(int flags) +{ + int rflags = 0; + if (flags & P9_DOTL_AT_REMOVEDIR) { + rflags |= AT_REMOVEDIR; + } + return rflags; +} + +struct dotl_openflag_map { + int dotl_flag; + int open_flag; +}; + +static int dotl_to_open_flags(int flags) +{ + int oflags = 0; + int i; + + struct dotl_openflag_map dotl_oflag_map[] = { + { P9_DOTL_CREATE, O_CREAT }, + { P9_DOTL_EXCL, O_EXCL }, + { P9_DOTL_NOCTTY , O_NOCTTY }, + { P9_DOTL_TRUNC, O_TRUNC }, + { P9_DOTL_APPEND, O_APPEND }, + { P9_DOTL_NONBLOCK, O_NONBLOCK } , + { P9_DOTL_DSYNC, O_DSYNC }, + { P9_DOTL_FASYNC, FASYNC }, + { P9_DOTL_DIRECT, O_DIRECT }, + { P9_DOTL_LARGEFILE, O_LARGEFILE }, + { P9_DOTL_DIRECTORY, O_DIRECTORY }, + { P9_DOTL_NOFOLLOW, O_NOFOLLOW }, + { P9_DOTL_NOATIME, O_NOATIME }, + { P9_DOTL_CLOEXEC, O_CLOEXEC }, + { P9_DOTL_SYNC, O_SYNC }, + }; + + for (i = 0; i < ARRAY_SIZE(dotl_oflag_map); i++) { + if (flags & dotl_oflag_map[i].dotl_flag) { + oflags |= dotl_oflag_map[i].open_flag; + } + } + + return oflags; +} + void cred_init(FsCred *credp) { credp->fc_uid = -1; @@ -87,7 +133,8 @@ static int get_dotl_openflags(V9fsState *s, int oflags) * Filter the client open flags */ flags = s->ctx.open_flags; - flags |= oflags; + flags |= oflags & O_ACCMODE; + flags |= dotl_to_open_flags(oflags); flags &= ~(O_NOCTTY | O_ASYNC | O_CREAT); /* * Ignore direct disk access hint until the server supports it. @@ -2440,6 +2487,7 @@ static void v9fs_unlinkat(void *opaque) V9fsPDU *pdu = opaque; pdu_unmarshal(pdu, offset, "dsd", &dfid, &name, &flags); + flags = dotl_to_at_flags(flags); dfidp = get_fid(pdu, dfid); if (dfidp == NULL) { diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 0f2a55e..b9c267b 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -362,6 +362,30 @@ typedef struct V9fsMkState { V9fsString fullname; } V9fsMkState; +/* 9p2000.L open flags */ +#define P9_DOTL_RDONLY 00000000 +#define P9_DOTL_WRONLY 00000001 +#define P9_DOTL_RDWR 00000002 +#define P9_DOTL_NOACCESS 00000003 +#define P9_DOTL_CREATE 00000100 +#define P9_DOTL_EXCL 00000200 +#define P9_DOTL_NOCTTY 00000400 +#define P9_DOTL_TRUNC 00001000 +#define P9_DOTL_APPEND 00002000 +#define P9_DOTL_NONBLOCK 00004000 +#define P9_DOTL_DSYNC 00010000 +#define P9_DOTL_FASYNC 00020000 +#define P9_DOTL_DIRECT 00040000 +#define P9_DOTL_LARGEFILE 00100000 +#define P9_DOTL_DIRECTORY 00200000 +#define P9_DOTL_NOFOLLOW 00400000 +#define P9_DOTL_NOATIME 01000000 +#define P9_DOTL_CLOEXEC 02000000 +#define P9_DOTL_SYNC 04000000 + +/* 9p2000.L at flags */ +#define P9_DOTL_AT_REMOVEDIR 0x200 + /* 9P2000.L lock type */ #define P9_LOCK_TYPE_RDLCK 0 #define P9_LOCK_TYPE_WRLCK 1 -- 1.7.6