From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIs93-00039x-Ip for qemu-devel@nongnu.org; Tue, 12 Jan 2016 01:09:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIs8z-0006Dc-Fh for qemu-devel@nongnu.org; Tue, 12 Jan 2016 01:09:29 -0500 Received: from e28smtp05.in.ibm.com ([125.16.236.5]:34903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIs8y-0006DC-Qa for qemu-devel@nongnu.org; Tue, 12 Jan 2016 01:09:25 -0500 Received: from localhost by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jan 2016 11:39:22 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id E3531394005B for ; Tue, 12 Jan 2016 11:38:49 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay02.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0C68mnS24051912 for ; Tue, 12 Jan 2016 11:38:48 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0C68iZ0024427 for ; Tue, 12 Jan 2016 11:38:48 +0530 From: "Aneesh Kumar K.V" Date: Tue, 12 Jan 2016 11:38:14 +0530 Message-Id: <1452578912-12546-8-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1452578912-12546-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1452578912-12546-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 07/25] 9pfs: rename virtio-9p-xattr{, -user}.{c, h} to 9p-xattr{, -user}.{c, h} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: Wei Liu , qemu-devel@nongnu.org, "Aneesh Kumar K.V" From: Wei Liu These three files are not virtio specific. Rename them to generic names. Fix comments and header inclusion in various files. Signed-off-by: Wei Liu Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/9p-handle.c | 2 +- hw/9pfs/9p-local.c | 2 +- hw/9pfs/9p-posix-acl.c | 2 +- hw/9pfs/9p-synth.c | 2 +- hw/9pfs/{virtio-9p-xattr-user.c => 9p-xattr-user.c} | 5 ++--- hw/9pfs/{virtio-9p-xattr.c => 9p-xattr.c} | 5 ++--- hw/9pfs/{virtio-9p-xattr.h => 9p-xattr.h} | 6 +++--- hw/9pfs/Makefile.objs | 4 ++-- hw/9pfs/virtio-9p-device.c | 2 +- hw/9pfs/virtio-9p.c | 2 +- 10 files changed, 15 insertions(+), 17 deletions(-) rename hw/9pfs/{virtio-9p-xattr-user.c => 9p-xattr-user.c} (97%) rename hw/9pfs/{virtio-9p-xattr.c => 9p-xattr.c} (97%) rename hw/9pfs/{virtio-9p-xattr.h => 9p-xattr.h} (97%) diff --git a/hw/9pfs/9p-handle.c b/hw/9pfs/9p-handle.c index a48dbc9e8d37..51a9d15fee0d 100644 --- a/hw/9pfs/9p-handle.c +++ b/hw/9pfs/9p-handle.c @@ -12,7 +12,7 @@ */ #include "virtio-9p.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" #include #include #include diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 877ad86c7ab8..ac553e0db745 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -12,7 +12,7 @@ */ #include "virtio-9p.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" #include "fsdev/qemu-fsdev.h" /* local_ops */ #include #include diff --git a/hw/9pfs/9p-posix-acl.c b/hw/9pfs/9p-posix-acl.c index 1ee7bdc807ad..073af39983ca 100644 --- a/hw/9pfs/9p-posix-acl.c +++ b/hw/9pfs/9p-posix-acl.c @@ -15,7 +15,7 @@ #include "qemu/xattr.h" #include "virtio-9p.h" #include "fsdev/file-op-9p.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" #define MAP_ACL_ACCESS "user.virtfs.system.posix_acl_access" #define MAP_ACL_DEFAULT "user.virtfs.system.posix_acl_default" diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index 6d34b89eef8d..b1064e3aeaeb 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -14,7 +14,7 @@ #include "hw/virtio/virtio.h" #include "virtio-9p.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" #include "fsdev/qemu-fsdev.h" #include "9p-synth.h" #include "qemu/rcu.h" diff --git a/hw/9pfs/virtio-9p-xattr-user.c b/hw/9pfs/9p-xattr-user.c similarity index 97% rename from hw/9pfs/virtio-9p-xattr-user.c rename to hw/9pfs/9p-xattr-user.c index 46133e06dbdf..163b158362d9 100644 --- a/hw/9pfs/virtio-9p-xattr-user.c +++ b/hw/9pfs/9p-xattr-user.c @@ -1,5 +1,5 @@ /* - * Virtio 9p user. xattr callback + * 9p user. xattr callback * * Copyright IBM, Corp. 2010 * @@ -12,10 +12,9 @@ */ #include -#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "fsdev/file-op-9p.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" static ssize_t mp_user_getxattr(FsContext *ctx, const char *path, diff --git a/hw/9pfs/virtio-9p-xattr.c b/hw/9pfs/9p-xattr.c similarity index 97% rename from hw/9pfs/virtio-9p-xattr.c rename to hw/9pfs/9p-xattr.c index 07183887c5ee..1d7861b27be1 100644 --- a/hw/9pfs/virtio-9p-xattr.c +++ b/hw/9pfs/9p-xattr.c @@ -1,5 +1,5 @@ /* - * Virtio 9p xattr callback + * 9p xattr callback * * Copyright IBM, Corp. 2010 * @@ -11,10 +11,9 @@ * */ -#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "fsdev/file-op-9p.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" static XattrOperations *get_xattr_operations(XattrOperations **h, diff --git a/hw/9pfs/virtio-9p-xattr.h b/hw/9pfs/9p-xattr.h similarity index 97% rename from hw/9pfs/virtio-9p-xattr.h rename to hw/9pfs/9p-xattr.h index 327b32b5aa9e..4d39a20262ad 100644 --- a/hw/9pfs/virtio-9p-xattr.h +++ b/hw/9pfs/9p-xattr.h @@ -1,5 +1,5 @@ /* - * Virtio 9p + * 9p * * Copyright IBM, Corp. 2010 * @@ -10,8 +10,8 @@ * the COPYING file in the top-level directory. * */ -#ifndef _QEMU_VIRTIO_9P_XATTR_H -#define _QEMU_VIRTIO_9P_XATTR_H +#ifndef _QEMU_9P_XATTR_H +#define _QEMU_9P_XATTR_H #include "qemu/xattr.h" diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index ba62571d5706..838c5e1eb951 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -1,6 +1,6 @@ common-obj-y = virtio-9p.o -common-obj-y += 9p-local.o virtio-9p-xattr.o -common-obj-y += virtio-9p-xattr-user.o 9p-posix-acl.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 common-obj-y += coxattr.o 9p-synth.o common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 667b54aeb829..92ac19b24b83 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -17,7 +17,7 @@ #include "qemu/sockets.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" #include "coth.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 0f178dec32f3..30ff82865ea4 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -18,7 +18,7 @@ #include "qemu/sockets.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" -#include "virtio-9p-xattr.h" +#include "9p-xattr.h" #include "coth.h" #include "trace.h" #include "migration/migration.h" -- 2.5.0