[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v2 21/28] Rename sysinfo.{c, h} to virsysinfo.{c, h}



From: "Daniel P. Berrange" <berrange redhat com>

---
 po/POTFILES.in                       | 2 +-
 src/Makefile.am                      | 2 +-
 src/conf/domain_conf.h               | 2 +-
 src/qemu/qemu_driver.c               | 2 +-
 src/util/{sysinfo.c => virsysinfo.c} | 2 +-
 src/util/{sysinfo.h => virsysinfo.h} | 0
 tests/sysinfotest.c                  | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename src/util/{sysinfo.c => virsysinfo.c} (99%)
 rename src/util/{sysinfo.h => virsysinfo.h} (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9c142a4..1420774 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/sysinfo.c
 src/util/util.c
 src/util/viraudit.c
 src/util/virauth.c
@@ -175,6 +174,7 @@ src/util/virsexpr.c
 src/util/virsocketaddr.c
 src/util/virstatslinux.c
 src/util/virstoragefile.c
+src/util/virsysinfo.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 2e0c175..e19a482 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/sysinfo.c util/sysinfo.h			\
 		util/threads.c util/threads.h			\
 		util/threads-pthread.h				\
 		util/threads-win32.h				\
@@ -87,6 +86,7 @@ UTIL_SOURCES =							\
 		util/virsexpr.c util/virsexpr.h			\
 		util/virstatslinux.c util/virstatslinux.h	\
 		util/virstoragefile.c util/virstoragefile.h	\
+		util/virsysinfo.c util/virsysinfo.h		\
 		util/virtypedparam.c util/virtypedparam.h	\
 		util/xml.c util/xml.h				\
 		util/virterror.c util/virterror_internal.h	\
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9c328a3..e267b19 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -39,7 +39,7 @@
 # include "nwfilter_params.h"
 # include "nwfilter_conf.h"
 # include "virnetdevmacvlan.h"
-# include "sysinfo.h"
+# include "virsysinfo.h"
 # include "virnetdevvportprofile.h"
 # include "virnetdevopenvswitch.h"
 # include "virnetdevbandwidth.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b96d4a9..7359e7b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -77,7 +77,7 @@
 #include "libvirt_internal.h"
 #include "xml.h"
 #include "cpu/cpu.h"
-#include "sysinfo.h"
+#include "virsysinfo.h"
 #include "domain_nwfilter.h"
 #include "virhook.h"
 #include "virstoragefile.h"
diff --git a/src/util/sysinfo.c b/src/util/virsysinfo.c
similarity index 99%
rename from src/util/sysinfo.c
rename to src/util/virsysinfo.c
index 6da87ce..683f538 100644
--- a/src/util/sysinfo.c
+++ b/src/util/virsysinfo.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 
 #include "virterror_internal.h"
-#include "sysinfo.h"
+#include "virsysinfo.h"
 #include "util.h"
 #include "virlog.h"
 #include "viralloc.h"
diff --git a/src/util/sysinfo.h b/src/util/virsysinfo.h
similarity index 100%
rename from src/util/sysinfo.h
rename to src/util/virsysinfo.h
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 9340af2..fb0ff6a 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -31,7 +31,7 @@
 #include "internal.h"
 
 #include "virbuffer.h"
-#include "sysinfo.h"
+#include "virsysinfo.h"
 #include "testutils.h"
 #include "util.h"
 #include "virfile.h"
-- 
1.7.11.7


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]