From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVKDf-0007H1-8y for qemu-devel@nongnu.org; Tue, 29 Nov 2011 04:43:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RVKDa-0000tR-R4 for qemu-devel@nongnu.org; Tue, 29 Nov 2011 04:43:19 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:41744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVKDa-0000tL-Km for qemu-devel@nongnu.org; Tue, 29 Nov 2011 04:43:14 -0500 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 29 Nov 2011 02:43:13 -0700 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAT9hBCv126614 for ; Tue, 29 Nov 2011 02:43:11 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAT9hAE1024161 for ; Tue, 29 Nov 2011 02:43:10 -0700 From: "Aneesh Kumar K.V" In-Reply-To: <4ED40CE2.70903@codemonkey.ws> References: <1321864151-13988-1-git-send-email-pbonzini@redhat.com> <8762ibl5xg.fsf@linux.vnet.ibm.com> <4ED40CE2.70903@codemonkey.ws> Date: Tue, 29 Nov 2011 15:13:01 +0530 Message-ID: <87k46j8dsq.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 1.0] 9pfs: improve portability to older systems List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Paolo Bonzini , qemu-devel@nongnu.org On Mon, 28 Nov 2011 16:36:18 -0600, Anthony Liguori wrote: > On 11/23/2011 12:16 AM, Aneesh Kumar K.V wrote: > > On Mon, 21 Nov 2011 09:29:11 +0100, Paolo Bonzini wrote: > >> Small requirements on "new" features have percolated to virtio-9p-local.c. > >> In particular, the utimensat wrapper actually only supports dirfd = AT_FDCWD > >> and flags = AT_SYMLINK_NOFOLLOW in the fallback code. Remove the arguments > >> so that virtio-9p-local.c will not use AT_* constants. > >> > >> At the same time, fail local_ioc_getversion if the ioctl is not supported > >> by the host. > >> > >> Signed-off-by: Paolo Bonzini > > Hrm, I may have messed this up. My mailbox processing script seems to have > found Aneesh's patch instead of Paolo's. > > Can ya'll take a look at 2507718baf311ea78156c6777d38410a9f89ce89 and tell me if > I need to revert it? > No i don't think that needs a revert. But we may need the below patch. I have also send the change as a separate mail to the list. >>From db7fdc1c8eb95d556c18ee44fd4f9d5a3aabf9c4 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Tue, 29 Nov 2011 15:10:52 +0530 Subject: [PATCH] hw/9pfs: Improve portability to older systems commit ae0f940e6b4f5177892dd6a12762282fa9089972 2507718baf311ea78156c6777d38410a9f89ce89 missed updating virtio-9p-handle.c. Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/virtio-9p-handle.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c index 7644ae5..93552a1 100644 --- a/hw/9pfs/virtio-9p-handle.c +++ b/hw/9pfs/virtio-9p-handle.c @@ -599,7 +599,8 @@ static int handle_unlinkat(FsContext *ctx, V9fsPath *dir, static int handle_ioc_getversion(FsContext *ctx, V9fsPath *path, mode_t st_mode, uint64_t *st_gen) { - int err; + int err = -ENOTTY; +#ifdef FS_IOC_GETVERSION V9fsFidOpenState fid_open; /* @@ -615,6 +616,7 @@ static int handle_ioc_getversion(FsContext *ctx, V9fsPath *path, } err = ioctl(fid_open.fd, FS_IOC_GETVERSION, st_gen); handle_close(ctx, &fid_open); +#endif return err; } @@ -630,6 +632,7 @@ static int handle_init(FsContext *ctx) ret = data->mountfd; goto err_out; } +#ifdef FS_IOC_GETVERSION ret = statfs(ctx->fs_root, &stbuf); if (!ret) { switch (stbuf.f_type) { @@ -641,6 +644,7 @@ static int handle_init(FsContext *ctx) break; } } +#endif memset(&fh, 0, sizeof(struct file_handle)); ret = name_to_handle(data->mountfd, ".", &fh, &mnt_id, 0); if (ret && errno == EOVERFLOW) { -- 1.7.5.4