diff options
author | Wei Liu <wei.liu2@citrix.com> | 2015-11-18 18:21:14 +0000 |
---|---|---|
committer | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2016-01-08 12:38:15 +0530 |
commit | 494a8ebe713055d3946183f4b395f85a18b43e9e (patch) | |
tree | 593b396849e1f0a473cc9b2ebd6dda5ab1d9e67c | |
parent | d57b78002cd1a32f8382fc818da3940df69ff81a (diff) |
9pfs: rename virtio-9p-proxy.{c,h} to 9p-proxy.{c,h}
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 <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
-rw-r--r-- | fsdev/virtfs-proxy-helper.c | 2 | ||||
-rw-r--r-- | hw/9pfs/9p-proxy.c (renamed from hw/9pfs/virtio-9p-proxy.c) | 5 | ||||
-rw-r--r-- | hw/9pfs/9p-proxy.h (renamed from hw/9pfs/virtio-9p-proxy.h) | 6 | ||||
-rw-r--r-- | hw/9pfs/Makefile.objs | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index ad1da0d6f5..77536548d0 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 index 1bc7881f03..67c1fb93f8 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 <sys/socket.h> #include <sys/un.h> -#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 index 005c1ad757..56150b948b 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 0721462d88..cd5d146a24 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 |