From patchwork Thu Jan 7 19:56:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 564416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 66D951402E2 for ; Fri, 8 Jan 2016 06:57:02 +1100 (AEDT) Received: from localhost ([::1]:60687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHGg8-0005He-F2 for incoming@patchwork.ozlabs.org; Thu, 07 Jan 2016 14:57:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHGfV-00041v-Pr 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-0005nf-Im for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:21 -0500 Received: from smtp.citrix.com ([66.165.176.89]:63817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHGfT-0005mi-EL for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:19 -0500 X-IronPort-AV: E=Sophos;i="5.20,534,1444694400"; d="scan'208";a="323539134" From: Wei Liu To: Date: Thu, 7 Jan 2016 19:56:03 +0000 Message-ID: <1452196584-17259-7-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 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 X-DLP: MIA2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: Wei Liu , "Aneesh Kumar K.V" , Greg Kurz Subject: [Qemu-devel] [PATCH v2 06/27] 9pfs: rename virtio-9p-synth.{c, h} to 9p-synth.{c, h} X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These 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 --- hw/9pfs/{virtio-9p-synth.c => 9p-synth.c} | 2 +- hw/9pfs/{virtio-9p-synth.h => 9p-synth.h} | 6 +++--- hw/9pfs/Makefile.objs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename hw/9pfs/{virtio-9p-synth.c => 9p-synth.c} (99%) rename hw/9pfs/{virtio-9p-synth.h => 9p-synth.h} (94%) diff --git a/hw/9pfs/virtio-9p-synth.c b/hw/9pfs/9p-synth.c similarity index 99% rename from hw/9pfs/virtio-9p-synth.c rename to hw/9pfs/9p-synth.c index a0ab9a8..6d34b89 100644 --- a/hw/9pfs/virtio-9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -16,7 +16,7 @@ #include "virtio-9p.h" #include "virtio-9p-xattr.h" #include "fsdev/qemu-fsdev.h" -#include "virtio-9p-synth.h" +#include "9p-synth.h" #include "qemu/rcu.h" #include "qemu/rcu_queue.h" #include diff --git a/hw/9pfs/virtio-9p-synth.h b/hw/9pfs/9p-synth.h similarity index 94% rename from hw/9pfs/virtio-9p-synth.h rename to hw/9pfs/9p-synth.h index ab05a8e..eaf5a0c 100644 --- a/hw/9pfs/virtio-9p-synth.h +++ b/hw/9pfs/9p-synth.h @@ -1,5 +1,5 @@ /* - * Virtio 9p + * 9p * * Copyright IBM, Corp. 2011 * @@ -10,8 +10,8 @@ * the COPYING file in the top-level directory. * */ -#ifndef HW_9PFS_VIRTIO9P_SYNTH_H -#define HW_9PFS_VIRTIO9P_SYNTH_H 1 +#ifndef HW_9PFS_SYNTH_H +#define HW_9PFS_SYNTH_H 1 #include #include diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index cd5d146..ba62571 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -2,7 +2,7 @@ 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 += coth.o cofs.o codir.o cofile.o -common-obj-y += coxattr.o virtio-9p-synth.o +common-obj-y += coxattr.o 9p-synth.o common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o common-obj-y += 9p-proxy.o