Rename sysinfo.{c,h} to virsysinfo.{c,h}

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9c142a486f1791c0afb9c02d6bcd674a4db56d68..1420774df42f1ede1519807af9251b5a7d2e28f2 100644 (file)
--- 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 2e0c175d659256fceaa8e2c0cba7c80531e50bb4..e19a482744ae2314b036260ef3a691d2f0e62b4d 100644 (file)
--- 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 9c328a31363d41032ec91b423a01ee2d1435d92e..e267b19d36cb734d4deb876798e1fe5c5980a86c 100644 (file)
--- 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 b96d4a9544d3a1527855a0ccd56eaaaa5ca4308e..7359e7b79d1e395eaf9d8f962807db7f3ad0b6ce 100644 (file)
--- 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 6da87ce7bb5b5f61b844e3c566498b68bc121d84..d5788b5c5512322d82ea35560f2a83ed10f0baea 100644 (file)
--- a/src/util/sysinfo.c
+++ b/src/util/virsysinfo.c
@@ -1,5 +1,5 @@
 /*
- * sysinfo.c: get SMBIOS/sysinfo information from the host
+ * virsysinfo.c: get SMBIOS/sysinfo information from the host
  *
  * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2010 Daniel Veillard
@@ -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 97%
rename from src/util/sysinfo.h
rename to src/util/virsysinfo.h
index 0b1f000e9698a8708efe0675db8d7a1b9e40953f..83a33612a41aa06cee69a26a65424a7a50ecbba2 100644 (file)
--- a/src/util/sysinfo.h
+++ b/src/util/virsysinfo.h
@@ -1,5 +1,5 @@
 /*
- * sysinfo.h: structure and entry points for sysinfo support
+ * virsysinfo.h: get SMBIOS/sysinfo information from the host
  *
  * Copyright (C) 2010-2011 Red Hat, Inc.
  * Copyright (C) 2010 Daniel Veillard

diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index c5133766753dac33d4d8b6e6f4c138b86c692e5d..5dca523beee5ef02f0a466d4ce94dd140f826b7a 100644 (file)
--- 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"