summaryrefslogtreecommitdiffstats
path: root/hw/9pfs
diff options
context:
space:
mode:
authorPaolo Bonzini2011-11-21 09:29:11 +0100
committerAnthony Liguori2011-11-28 18:36:27 +0100
commitae0f940e6b4f5177892dd6a12762282fa9089972 (patch)
tree3e855a839233c0d0cc2e52daa6e4c30911da5fc5 /hw/9pfs
parentMerge remote-tracking branch 'kwolf/block-stable' into staging (diff)
downloadqemu-ae0f940e6b4f5177892dd6a12762282fa9089972.tar.gz
qemu-ae0f940e6b4f5177892dd6a12762282fa9089972.tar.xz
qemu-ae0f940e6b4f5177892dd6a12762282fa9089972.zip
9pfs: improve portability to older systems
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 <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/9pfs')
-rw-r--r--hw/9pfs/virtio-9p-local.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index 7f1c0894de..cbd07e8659 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -583,8 +583,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path,
char buffer[PATH_MAX];
char *path = fs_path->data;
- return qemu_utimensat(AT_FDCWD, rpath(s, path, buffer), buf,
- AT_SYMLINK_NOFOLLOW);
+ return qemu_utimens(rpath(s, path, buffer), buf);
}
static int local_remove(FsContext *ctx, const char *path)
@@ -694,6 +693,7 @@ static int local_ioc_getversion(FsContext *ctx, V9fsPath *path,
mode_t st_mode, uint64_t *st_gen)
{
int err;
+#ifdef FS_IOC_GETVERSION
V9fsFidOpenState fid_open;
/*
@@ -709,6 +709,9 @@ static int local_ioc_getversion(FsContext *ctx, V9fsPath *path,
}
err = ioctl(fid_open.fd, FS_IOC_GETVERSION, st_gen);
local_close(ctx, &fid_open);
+#else
+ err = -ENOTTY;
+#endif
return err;
}