From fde9df8dcca7d0ff5d2eb0ad9a7de4585eaf8a82 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 13 Dec 2012 15:14:15 +0000
Subject: [PATCH] Rename stats_linux.{c,h} to virstatslinux.{c,h}

---
 po/POTFILES.in                              | 2 +-
 src/Makefile.am                             | 2 +-
 src/lxc/lxc_driver.c                        | 2 +-
 src/openvz/openvz_driver.c                  | 2 +-
 src/qemu/qemu_driver.c                      | 2 +-
 src/uml/uml_driver.c                        | 2 +-
 src/util/{stats_linux.c => virstatslinux.c} | 4 ++--
 src/util/{stats_linux.h => virstatslinux.h} | 2 +-
 src/xen/xen_hypervisor.c                    | 2 +-
 tests/statstest.c                           | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)
 rename src/util/{stats_linux.c => virstatslinux.c} (97%)
 rename src/util/{stats_linux.h => virstatslinux.h} (95%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4e841a1dbe..cf9c575dfb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
 src/util/iohelper.c
-src/util/stats_linux.c
 src/util/storage_file.c
 src/util/sysinfo.c
 src/util/util.c
@@ -175,6 +174,7 @@ src/util/virprocess.c
 src/util/virrandom.c
 src/util/virsexpr.c
 src/util/virsocketaddr.c
+src/util/virstatslinux.c
 src/util/virterror.c
 src/util/virterror_internal.h
 src/util/virtime.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f639956ce3..2496f9c9c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/stats_linux.c util/stats_linux.h		\
 		util/storage_file.c util/storage_file.h		\
 		util/sysinfo.c util/sysinfo.h			\
 		util/threads.c util/threads.h			\
@@ -87,6 +86,7 @@ UTIL_SOURCES =							\
 		util/virpidfile.c util/virpidfile.h		\
 		util/virprocess.c util/virprocess.h		\
 		util/virsexpr.c util/virsexpr.h			\
+		util/virstatslinux.c util/virstatslinux.h	\
 		util/virtypedparam.c util/virtypedparam.h	\
 		util/xml.c util/xml.h				\
 		util/virterror.c util/virterror_internal.h	\
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a595dd99f1..936d21e0e7 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -51,7 +51,7 @@
 #include "virnetdevveth.h"
 #include "nodeinfo.h"
 #include "uuid.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
 #include "virhook.h"
 #include "virfile.h"
 #include "virpidfile.h"
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 4c884998e2..f83a78f96d 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -58,7 +58,7 @@
 #include "virlog.h"
 #include "vircommand.h"
 #include "viruri.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
 
 #define VIR_FROM_THIS VIR_FROM_OPENVZ
 
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 02dd77b697..d7bdd46460 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -64,7 +64,7 @@
 #include "virbuffer.h"
 #include "util.h"
 #include "nodeinfo.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
 #include "capabilities.h"
 #include "viralloc.h"
 #include "uuid.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index cece114b00..b20998fdab 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -49,7 +49,7 @@
 #include "virbuffer.h"
 #include "util.h"
 #include "nodeinfo.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
 #include "capabilities.h"
 #include "viralloc.h"
 #include "uuid.h"
diff --git a/src/util/stats_linux.c b/src/util/virstatslinux.c
similarity index 97%
rename from src/util/stats_linux.c
rename to src/util/virstatslinux.c
index 67ef82e589..3baa72a916 100644
--- a/src/util/stats_linux.c
+++ b/src/util/virstatslinux.c
@@ -1,5 +1,5 @@
 /*
- * Linux block and network stats.
+ * virstatslinux.c: Linux block and network stats.
  *
  * Copyright (C) 2007-2010 Red Hat, Inc.
  *
@@ -35,7 +35,7 @@
 # include "virterror_internal.h"
 # include "datatypes.h"
 # include "util.h"
-# include "stats_linux.h"
+# include "virstatslinux.h"
 # include "viralloc.h"
 # include "virfile.h"
 
diff --git a/src/util/stats_linux.h b/src/util/virstatslinux.h
similarity index 95%
rename from src/util/stats_linux.h
rename to src/util/virstatslinux.h
index 5847177ab0..d5900edcf5 100644
--- a/src/util/stats_linux.h
+++ b/src/util/virstatslinux.h
@@ -1,5 +1,5 @@
 /*
- * Linux block and network stats.
+ * virstatslinux.h: Linux block and network stats.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  *
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 183788826a..a692deb175 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -70,7 +70,7 @@
 #include "xen_driver.h"
 #include "xen_hypervisor.h"
 #include "xs_internal.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
 #include "block_stats.h"
 #include "xend_internal.h"
 #include "virbuffer.h"
diff --git a/tests/statstest.c b/tests/statstest.c
index ad71bf91d0..30f9ab0d12 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <sys/utsname.h>
 
-#include "stats_linux.h"
+#include "virstatslinux.h"
 #include "internal.h"
 #include "xen/block_stats.h"
 #include "testutils.h"