From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHGfV-000425-Rm for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHGfT-0005nZ-GQ for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:21 -0500 Received: from smtp.citrix.com ([66.165.176.89]:3508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHGfT-0005nN-CF for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:19 -0500 From: Wei Liu Date: Thu, 7 Jan 2016 19:56:02 +0000 Message-ID: <1452196584-17259-6-git-send-email-wei.liu2@citrix.com> In-Reply-To: <1452196584-17259-1-git-send-email-wei.liu2@citrix.com> References: <1452196584-17259-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 05/27] 9pfs: rename virtio-9p-proxy.{c, h} to 9p-proxy.{c, h} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Wei Liu , "Aneesh Kumar K.V" , Greg Kurz Those two files are not virtio specific. Rename them to use generic names. Fix includes in various C files. Change define guards and comments in header files. Signed-off-by: Wei Liu --- fsdev/virtfs-proxy-helper.c | 2 +- hw/9pfs/{virtio-9p-proxy.c => 9p-proxy.c} | 5 ++--- hw/9pfs/{virtio-9p-proxy.h => 9p-proxy.h} | 6 +++--- hw/9pfs/Makefile.objs | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) rename hw/9pfs/{virtio-9p-proxy.c => 9p-proxy.c} (99%) rename hw/9pfs/{virtio-9p-proxy.h => 9p-proxy.h} (95%) diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index ad1da0d..7753654 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -24,7 +24,7 @@ #include "qemu/sockets.h" #include "qemu/xattr.h" #include "virtio-9p-marshal.h" -#include "hw/9pfs/virtio-9p-proxy.h" +#include "hw/9pfs/9p-proxy.h" #include "fsdev/virtio-9p-marshal.h" #define PROGNAME "virtfs-proxy-helper" diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/9p-proxy.c similarity index 99% rename from hw/9pfs/virtio-9p-proxy.c rename to hw/9pfs/9p-proxy.c index 1bc7881..67c1fb9 100644 --- a/hw/9pfs/virtio-9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -1,5 +1,5 @@ /* - * Virtio 9p Proxy callback + * 9p Proxy callback * * Copyright IBM, Corp. 2011 * @@ -11,11 +11,10 @@ */ #include #include -#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "qemu/error-report.h" #include "fsdev/qemu-fsdev.h" -#include "virtio-9p-proxy.h" +#include "9p-proxy.h" typedef struct V9fsProxy { int sockfd; diff --git a/hw/9pfs/virtio-9p-proxy.h b/hw/9pfs/9p-proxy.h similarity index 95% rename from hw/9pfs/virtio-9p-proxy.h rename to hw/9pfs/9p-proxy.h index 005c1ad..56150b9 100644 --- a/hw/9pfs/virtio-9p-proxy.h +++ b/hw/9pfs/9p-proxy.h @@ -1,5 +1,5 @@ /* - * Virtio 9p Proxy callback + * 9p Proxy callback * * Copyright IBM, Corp. 2011 * @@ -9,8 +9,8 @@ * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. */ -#ifndef _QEMU_VIRTIO_9P_PROXY_H -#define _QEMU_VIRTIO_9P_PROXY_H +#ifndef _QEMU_9P_PROXY_H +#define _QEMU_9P_PROXY_H #define PROXY_MAX_IO_SZ (64 * 1024) #define V9FS_FD_VALID INT_MAX diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index 0721462..cd5d146 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -4,6 +4,6 @@ common-obj-y += virtio-9p-xattr-user.o 9p-posix-acl.o common-obj-y += coth.o cofs.o codir.o cofile.o common-obj-y += coxattr.o virtio-9p-synth.o common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o -common-obj-y += virtio-9p-proxy.o +common-obj-y += 9p-proxy.o obj-y += virtio-9p-device.o -- 2.1.4