Skip to content

Commit

Permalink
9pfs: rename virtio-9p-proxy.{c,h} to 9p-proxy.{c,h}
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Liu authored and kvaneesh committed Jan 8, 2016
1 parent d57b780 commit 494a8eb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion fsdev/virtfs-proxy-helper.c
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions hw/9pfs/virtio-9p-proxy.c → hw/9pfs/9p-proxy.c
@@ -1,5 +1,5 @@
/*
* Virtio 9p Proxy callback
* 9p Proxy callback
*
* Copyright IBM, Corp. 2011
*
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions hw/9pfs/virtio-9p-proxy.h → hw/9pfs/9p-proxy.h
@@ -1,5 +1,5 @@
/*
* Virtio 9p Proxy callback
* 9p Proxy callback
*
* Copyright IBM, Corp. 2011
*
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hw/9pfs/Makefile.objs
Expand Up @@ -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

0 comments on commit 494a8eb

Please sign in to comment.