From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOgyb-0000B8-0n for qemu-devel@nongnu.org; Fri, 01 Jun 2018 06:08:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOgyW-0004Us-MN for qemu-devel@nongnu.org; Fri, 01 Jun 2018 06:08:04 -0400 Received: from 2.mo4.mail-out.ovh.net ([46.105.72.36]:33866) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fOgyW-0004UY-Co for qemu-devel@nongnu.org; Fri, 01 Jun 2018 06:08:00 -0400 Received: from player793.ha.ovh.net (unknown [10.109.122.23]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id C9BA117CB5E for ; Fri, 1 Jun 2018 12:07:58 +0200 (CEST) Date: Fri, 1 Jun 2018 12:07:55 +0200 From: Greg Kurz Message-ID: <20180601120755.707b743d@bahia.lan> In-Reply-To: <667649d1ce2e1a948a5be1103a21cb495eff2c13.1527814874.git.keno@juliacomputing.com> References: <667649d1ce2e1a948a5be1103a21cb495eff2c13.1527814874.git.keno@juliacomputing.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 08/20] 9p: Rename 9p-util -> 9p-util-linux List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Keno Fischer Cc: qemu-devel@nongnu.org On Thu, 31 May 2018 21:26:03 -0400 Keno Fischer wrote: > The current file only has the Linux versions of these functions. > Rename the file accordingly and update the Makefile to only build > it on Linux. A Darwin version of these will follow later in the > series. > > Signed-off-by: Keno Fischer > --- > Reviewed-by: Greg Kurz > Changes since v1: New patch > > hw/9pfs/9p-util-linux.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ > hw/9pfs/9p-util.c | 59 ------------------------------------------------- > hw/9pfs/Makefile.objs | 3 ++- > 3 files changed, 61 insertions(+), 60 deletions(-) > create mode 100644 hw/9pfs/9p-util-linux.c > delete mode 100644 hw/9pfs/9p-util.c > > diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c > new file mode 100644 > index 0000000..defa3a4 > --- /dev/null > +++ b/hw/9pfs/9p-util-linux.c > @@ -0,0 +1,59 @@ > +/* > + * 9p utilities (Linux Implementation) > + * > + * Copyright IBM, Corp. 2017 > + * > + * Authors: > + * Greg Kurz > + * > + * 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) > +{ > + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > + int ret; > + > + ret = lgetxattr(proc_path, name, value, size); > + g_free(proc_path); > + return ret; > +} > + > +ssize_t flistxattrat_nofollow(int dirfd, const char *filename, > + char *list, size_t size) > +{ > + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > + int ret; > + > + ret = llistxattr(proc_path, list, size); > + g_free(proc_path); > + return ret; > +} > + > +ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, > + const char *name) > +{ > + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > + int ret; > + > + ret = lremovexattr(proc_path, name); > + g_free(proc_path); > + return ret; > +} > + > +int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name, > + void *value, size_t size, int flags) > +{ > + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > + int ret; > + > + ret = lsetxattr(proc_path, name, value, size, flags); > + g_free(proc_path); > + return ret; > +} > diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util.c > deleted file mode 100644 > index 614b7fc..0000000 > --- a/hw/9pfs/9p-util.c > +++ /dev/null > @@ -1,59 +0,0 @@ > -/* > - * 9p utilities > - * > - * Copyright IBM, Corp. 2017 > - * > - * Authors: > - * Greg Kurz > - * > - * 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) > -{ > - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > - int ret; > - > - ret = lgetxattr(proc_path, name, value, size); > - g_free(proc_path); > - return ret; > -} > - > -ssize_t flistxattrat_nofollow(int dirfd, const char *filename, > - char *list, size_t size) > -{ > - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > - int ret; > - > - ret = llistxattr(proc_path, list, size); > - g_free(proc_path); > - return ret; > -} > - > -ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, > - const char *name) > -{ > - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > - int ret; > - > - ret = lremovexattr(proc_path, name); > - g_free(proc_path); > - return ret; > -} > - > -int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name, > - void *value, size_t size, int flags) > -{ > - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); > - int ret; > - > - ret = lsetxattr(proc_path, name, value, size, flags); > - g_free(proc_path); > - return ret; > -} > diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs > index fd90b62..083508f 100644 > --- a/hw/9pfs/Makefile.objs > +++ b/hw/9pfs/Makefile.objs > @@ -1,4 +1,5 @@ > -common-obj-y = 9p.o 9p-util.o > +common-obj-y = 9p.o > +common-obj-$(CONFIG_LINUX) += 9p-util-linux.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