Rename conf.{c,h} to virconf.{c,h}

diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 78380441fd09be740a357b0be285d57c71596a50..0ca185c069c4c879e7a60cc4ed5ea2e8dd948b7c 100644 (file)
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "libvirtd-config.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "virterror_internal.h"
 #include "logging.h"

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index f88be9bedda1c02c9303a3f4a4d130146584c69e..9b0e45a24b76405f3852c9c44bac49d8234abfc3 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -47,7 +47,7 @@
 #include "uuid.h"
 #include "remote_driver.h"
 #include "memory.h"
-#include "conf.h"
+#include "virconf.h"
 #include "virnetlink.h"
 #include "virnetserver.h"
 #include "threads.h"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7b4567bff9b144947cfdcc0a4ce677a1c95b79f5..6dcda84b29a8b8c222f69491953c0b77ac03faa4 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -138,7 +138,6 @@ src/storage/storage_driver.c
 src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
-src/util/conf.c
 src/util/dnsmasq.c
 src/util/event_poll.c
 src/util/hooks.c
@@ -158,6 +157,7 @@ src/util/virauth.c
 src/util/virauthconfig.c
 src/util/vircgroup.c
 src/util/vircommand.c
+src/util/virconf.c
 src/util/virdbus.c
 src/util/virfile.c
 src/util/virhash.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 53d1bd405225bce98be5787bac149ace66b5e51a..c27388301fa82b9aa35db43726daa51b512648fb 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/conf.c util/conf.h                         \
                util/event.c util/event.h                       \
                util/event_poll.c util/event_poll.h             \
                util/hooks.c util/hooks.h                       \
@@ -84,6 +83,7 @@ UTIL_SOURCES =                                                        \
                util/virbitmap.c util/virbitmap.h               \
                util/virbuffer.c util/virbuffer.h               \
                util/vircommand.c util/vircommand.h             \
+               util/virconf.c util/virconf.h                   \
                util/virfile.c util/virfile.h                   \
                util/virnodesuspend.c util/virnodesuspend.h     \
                util/virobject.c util/virobject.h               \

diff --git a/src/libvirt.c b/src/libvirt.c
index e28ed0546ffcfcd57a4db699ffede60627f11b3f..8f7a86953817985bae9412d707f79d60dcf1bd08 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -54,7 +54,7 @@
 #include "memory.h"
 #include "configmake.h"
 #include "intprops.h"
-#include "conf.h"
+#include "virconf.h"
 #include "rpc/virnettlscontext.h"
 #include "vircommand.h"
 #include "virrandom.h"

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index f03008f20ea0de87a08ad73c69bf36314a20d5a5..77457c8c02614d35ff033710252ffc1dcd3a6c93 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -33,7 +33,7 @@
 #include "internal.h"
 #include "logging.h"
 #include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
 #include "datatypes.h"
 #include "virfile.h"
 #include "memory.h"

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index d7906c5726913dc58e0cabb258c1e3b675351f68..08caa1644ae93c283d475514ecf3983e61c5d405 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -40,7 +40,7 @@
 #include "virterror_internal.h"
 #include "logging.h"
 #include "memory.h"
-#include "conf.h"
+#include "virconf.h"
 #include "rpc/virnetserver.h"
 #include "virrandom.h"
 #include "virhash.h"

diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index c64de6793ef49a04ef382cd4184f3b6e1d383057..c2d9a76129db60e126bd77221d0934ae250e4cc1 100644 (file)
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "lock_daemon_config.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "virterror_internal.h"
 #include "logging.h"

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 3902edee9f8bc6fcbb58ddf0db4ccb465baf284f..c88c5af9aa4c2d17184a71db11d5f7f93dea9908 100644 (file)
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "lock_driver.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "logging.h"
 #include "uuid.h"

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index a0723439a73acf26a11f3a368e7d50933e5d1793..2eadc07f72c1f02286935b5b1c9ecb1e5da15a97 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -43,7 +43,7 @@
 #include "util.h"
 #include "virfile.h"
 #include "md5.h"
-#include "conf.h"
+#include "virconf.h"
 
 #include "configmake.h"
 

diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c
index a73b49ca41820c25b479c9ffc1fc8125add8c24e..ad69312c2f2daa9947f48e4dd9d66f8d977113f0 100644 (file)
--- a/src/locking/sanlock_helper.c
+++ b/src/locking/sanlock_helper.c
@@ -5,7 +5,7 @@
 
 #include "configmake.h"
 #include "internal.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "domain_conf.h"
 

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 9b89ceb2dd79073b11b4153f9162df8f257e0522..905734b5fb7943cc5945aa9054b359da67bb8372 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -29,7 +29,7 @@
 #include "lxc_conf.h"
 #include "nodeinfo.h"
 #include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "logging.h"
 #include "uuid.h"

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index a796aa9cbd1ea5aa56bcabac3598eac162bfcb2a..91af49bf29413c5d87758f11ec2edb4d8b7a6b80 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -41,7 +41,7 @@
 #include "qemu_bridge_filter.h"
 #include "uuid.h"
 #include "virbuffer.h"
-#include "conf.h"
+#include "virconf.h"
 #include "util.h"
 #include "memory.h"
 #include "datatypes.h"

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 1f73fd2390118418590b795c9780721b935a1236..4456a20c2c3cb94a3340d97f35a006ab63937f5f 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -44,7 +44,7 @@
 #include "virhash.h"
 #include "virrandom.h"
 #include "util.h"
-#include "conf.h"
+#include "virconf.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 8f72658662f7cd49c8bf9665e396c09f97c3a640..b669b5a292a55e7c9a0a7642e50a716f42c2f5c2 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -37,7 +37,7 @@
 #include "uml_conf.h"
 #include "uuid.h"
 #include "virbuffer.h"
-#include "conf.h"
+#include "virconf.h"
 #include "util.h"
 #include "memory.h"
 #include "nodeinfo.h"

diff --git a/src/util/conf.c b/src/util/virconf.c
similarity index 99%
rename from src/util/conf.c
rename to src/util/virconf.c
index 3b975455c528f92717fd7329eb72e0a5f062bd42..695e6d8f15383291bc82b80ac3a1733c0ac1127a 100644 (file)
--- a/src/util/conf.c
+++ b/src/util/virconf.c
@@ -1,5 +1,5 @@
-/**
- * conf.c: parser for a subset of the Python encoded Xen configuration files
+/*
+ * virconf.c: parser for a subset of the Python encoded Xen configuration files
  *
  * Copyright (C) 2006-2012 Red Hat, Inc.
  *
@@ -32,7 +32,7 @@
 
 #include "virterror_internal.h"
 #include "virbuffer.h"
-#include "conf.h"
+#include "virconf.h"
 #include "util.h"
 #include "c-ctype.h"
 #include "logging.h"

diff --git a/src/util/conf.h b/src/util/virconf.h
similarity index 97%
rename from src/util/conf.h
rename to src/util/virconf.h
index 224592dd2dccea35f494a5cbefe35ccc96f62ece..577af8c5474571d691e918489d15e5114bb3ac10 100644 (file)
--- a/src/util/conf.h
+++ b/src/util/virconf.h
@@ -1,5 +1,5 @@
-/**
- * conf.h: parser for a subset of the Python encoded Xen configuration files
+/*
+ * virconf.h: parser for a subset of the Python encoded Xen configuration files
  *
  * Copyright (C) 2006, 2007 Red Hat, Inc.
  *

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index a4d1f2e99ce04b78f777344de5455efa36a69c9e..4de9f3382092683ca2a596a375ac24107e144bb8 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -27,7 +27,7 @@
 
 #include "internal.h"
 #include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "logging.h"
 #include "uuid.h"

diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h
index 406c27ee90d4f4f3c1c3587a5d5a6306aec80f5a..f4877b11c405cb65cc45187cb196a766b049c71f 100644 (file)
--- a/src/vmx/vmx.h
+++ b/src/vmx/vmx.h
@@ -24,7 +24,7 @@
 # define __VIR_VMX_H__
 
 # include "internal.h"
-# include "conf.h"
+# include "virconf.h"
 # include "domain_conf.h"
 
 typedef struct _virVMXContext virVMXContext;

diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 2e40015bd41dd455bf46611b263f12c1c9db4115..bcafdd089af84f5071df2ecee2a87ae7f7e06db7 100644 (file)
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -32,7 +32,7 @@
 #include "driver.h"
 #include "memory.h"
 #include "xen_driver.h"
-#include "conf.h"
+#include "virconf.h"
 #include "domain_conf.h"
 #include "xen_inotify.h"
 #include "xend_internal.h"

diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h
index 98b5ad7bdace17ed259000398cede3f81dfa2989..df77ac80cda5790a532568e42657efa0ff09ed8f 100644 (file)
--- a/src/xen/xm_internal.h
+++ b/src/xen/xm_internal.h
@@ -27,7 +27,7 @@
 
 # include "internal.h"
 # include "driver.h"
-# include "conf.h"
+# include "virconf.h"
 # include "domain_conf.h"
 
 extern struct xenUnifiedDriver xenXMDriver;

diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 3e8396b1781040942ce47d548cd46eb3d677ae78..ed0c9e10e68d2be0756b370aae24714edebf7a43 100644 (file)
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -28,7 +28,7 @@
 
 #include "internal.h"
 #include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "verify.h"
 #include "uuid.h"

diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h
index d4502bd0e940f02a9a2b228350e44ce819f8de97..4ff640c40a5da35e468ffce074fcb6f3ce2620be 100644 (file)
--- a/src/xenxs/xen_sxpr.h
+++ b/src/xenxs/xen_sxpr.h
@@ -28,7 +28,7 @@
 # define __VIR_XEN_SXPR_H__
 
 # include "internal.h"
-# include "conf.h"
+# include "virconf.h"
 # include "domain_conf.h"
 # include "sexpr.h"
 

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index d1197cde0d4a2063b250e3687062284a1509df2f..5e284df7cf1920a61aca94c7059bad57fc92f409 100644 (file)
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -27,7 +27,7 @@
 
 #include "internal.h"
 #include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 #include "verify.h"
 #include "uuid.h"

diff --git a/src/xenxs/xen_xm.h b/src/xenxs/xen_xm.h
index c3d0ad46b1516474e298eee15053689a225abc00..629a4b32632dbe3eee8198b682fc1c95d0241569 100644 (file)
--- a/src/xenxs/xen_xm.h
+++ b/src/xenxs/xen_xm.h
@@ -27,7 +27,7 @@
 # define __VIR_XEN_XM_H__
 
 # include "internal.h"
-# include "conf.h"
+# include "virconf.h"
 # include "domain_conf.h"
 
 virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def,

diff --git a/tests/conftest.c b/tests/conftest.c
index 4342a5253dcc041fa2b6ff9d80085e8fc923394b..aacc5265dd9184aa047812bc974a1f0a9c835d37 100644 (file)
--- a/tests/conftest.c
+++ b/tests/conftest.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "conf.h"
+#include "virconf.h"
 #include "memory.h"
 
 int main(int argc, char **argv)

diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index ee1f8a0c607533035afa0e591fc5f7a5572a588b..c2b02a6e40d3f276b418a2b9dac722df252ae61a 100644 (file)
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -28,7 +28,7 @@
 #include "c-ctype.h"
 #include "virterror_internal.h"
 #include "logging.h"
-#include "conf.h"
+#include "virconf.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE