| Message ID | d2e05ff145f160cb99454f98821dc0250247f1f8.1529196703.git.keno@juliacomputing.com |
|---|---|
| State | New |
| Headers | show |
| Series | 9p: Add support for Darwin | expand |
On Sat, 16 Jun 2018 20:56:52 -0400 Keno Fischer <keno@juliacomputing.com> wrote: > This implements the darwin equivalent of the functions that were > moved to 9p-util(-linux) earlier in this series in the new > 9p-util-darwin file. > > Signed-off-by: Keno Fischer <keno@juliacomputing.com> > --- > hw/9pfs/9p-util-darwin.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ > hw/9pfs/Makefile.objs | 1 + > 2 files changed, 65 insertions(+) > create mode 100644 hw/9pfs/9p-util-darwin.c > > diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c > new file mode 100644 > index 0000000..cdb4c9e > --- /dev/null > +++ b/hw/9pfs/9p-util-darwin.c > @@ -0,0 +1,64 @@ > +/* > + * 9p utilities (Darwin Implementation) > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "qemu/xattr.h" > +#include "9p-util.h" > + > +ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char *name, > + void *value, size_t size) > +{ > + int ret; > + int fd = openat_file(dirfd, filename, > + O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); > + if (fd == -1) { > + return -1; > + } > + ret = fgetxattr(fd, name, value, size, 0, 0); Hmm... I had said it looked good, but not that good actually. This isn't strictly equivalent of what we have with Linux, because it requires the file to have appropriate access rights. Why not just use the magic sycall from patch 11 and call getxattr() ? > + close_preserve_errno(fd); > + return ret; > +} > + > +ssize_t flistxattrat_nofollow(int dirfd, const char *filename, > + char *list, size_t size) > +{ > + int ret; > + int fd = openat_file(dirfd, filename, > + O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); > + if (fd == -1) { > + return -1; > + } > + ret = flistxattr(fd, list, size, 0); > + close_preserve_errno(fd); > + return ret; > +} > + > +ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, > + const char *name) > +{ > + int ret; > + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); > + if (fd == -1) { > + return -1; > + } > + ret = fremovexattr(fd, name, 0); > + close_preserve_errno(fd); > + return ret; > +} > + > +int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name, > + void *value, size_t size, int flags) > +{ > + int ret; > + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); > + if (fd == -1) { > + return -1; > + } > + ret = fsetxattr(fd, name, value, size, 0, flags); > + close_preserve_errno(fd); > + return ret; > +} > diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs > index 95e3bc0..0de39af 100644 > --- a/hw/9pfs/Makefile.objs > +++ b/hw/9pfs/Makefile.objs > @@ -1,6 +1,7 @@ > ifeq ($(call lor,$(CONFIG_VIRTIO_9P),$(CONFIG_XEN)),y) > common-obj-y = 9p.o > common-obj-$(CONFIG_LINUX) += 9p-util-linux.o > +common-obj-$(CONFIG_DARWIN) += 9p-util-darwin.o > common-obj-y += 9p-local.o 9p-xattr.o > common-obj-y += 9p-xattr-user.o 9p-posix-acl.o > common-obj-y += coth.o cofs.o codir.o cofile.o
diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c new file mode 100644 index 0000000..cdb4c9e --- /dev/null +++ b/hw/9pfs/9p-util-darwin.c @@ -0,0 +1,64 @@ +/* + * 9p utilities (Darwin Implementation) + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/xattr.h" +#include "9p-util.h" + +ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char *name, + void *value, size_t size) +{ + int ret; + int fd = openat_file(dirfd, filename, + O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = fgetxattr(fd, name, value, size, 0, 0); + close_preserve_errno(fd); + return ret; +} + +ssize_t flistxattrat_nofollow(int dirfd, const char *filename, + char *list, size_t size) +{ + int ret; + int fd = openat_file(dirfd, filename, + O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = flistxattr(fd, list, size, 0); + close_preserve_errno(fd); + return ret; +} + +ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, + const char *name) +{ + int ret; + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = fremovexattr(fd, name, 0); + close_preserve_errno(fd); + return ret; +} + +int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name, + void *value, size_t size, int flags) +{ + int ret; + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = fsetxattr(fd, name, value, size, 0, flags); + close_preserve_errno(fd); + return ret; +} diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index 95e3bc0..0de39af 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -1,6 +1,7 @@ ifeq ($(call lor,$(CONFIG_VIRTIO_9P),$(CONFIG_XEN)),y) common-obj-y = 9p.o common-obj-$(CONFIG_LINUX) += 9p-util-linux.o +common-obj-$(CONFIG_DARWIN) += 9p-util-darwin.o common-obj-y += 9p-local.o 9p-xattr.o common-obj-y += 9p-xattr-user.o 9p-posix-acl.o common-obj-y += coth.o cofs.o codir.o cofile.o
This implements the darwin equivalent of the functions that were moved to 9p-util(-linux) earlier in this series in the new 9p-util-darwin file. Signed-off-by: Keno Fischer <keno@juliacomputing.com> --- hw/9pfs/9p-util-darwin.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ hw/9pfs/Makefile.objs | 1 + 2 files changed, 65 insertions(+) create mode 100644 hw/9pfs/9p-util-darwin.c