[libvirt] [PATCH v2 05/28] Rename conf.{c,h} to virconf.{c,h}

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; --- daemon/libvirtd-config.c | 2 +- daemon/libvirtd.c | 2 +- po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/libvirt.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/locking/sanlock_helper.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/qemu/qemu_conf.c | 2 +- src/security/security_selinux.c | 2 +- src/uml/uml_conf.c | 2 +- src/util/{conf.c => virconf.c} | 2 +- src/util/{conf.h => virconf.h} | 0 src/vmx/vmx.c | 2 +- src/vmx/vmx.h | 2 +- src/xen/xen_inotify.c | 2 +- src/xen/xm_internal.h | 2 +- src/xenxs/xen_sxpr.c | 2 +- src/xenxs/xen_sxpr.h | 2 +- src/xenxs/xen_xm.c | 2 +- src/xenxs/xen_xm.h | 2 +- tests/conftest.c | 2 +- tests/libvirtdconftest.c | 2 +- 27 files changed, 26 insertions(+), 26 deletions(-) rename src/util/{conf.c => virconf.c} (99%) rename src/util/{conf.h => virconf.h} (100%) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 7838044..0ca185c 100644 --- 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 f88be9b..9b0e45a 100644 --- 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 7b4567b..6dcda84 100644 --- 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 53d1bd4..c273883 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/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 e28ed05..8f7a869 100644 --- 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 f03008f..77457c8 100644 --- 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 d7906c5..08caa16 100644 --- 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 c64de67..c2d9a76 100644 --- 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 3902ede..c88c5af 100644 --- 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 a072343..2eadc07 100644 --- 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 a73b49c..ad69312 100644 --- 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 9b89ceb..905734b 100644 --- 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 a796aa9..91af49b 100644 --- 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 1f73fd2..4456a20 100644 --- 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 8f72658..b669b5a 100644 --- 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 3b97545..221a1eb 100644 --- a/src/util/conf.c +++ b/src/util/virconf.c @@ -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 100% rename from src/util/conf.h rename to src/util/virconf.h diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index a4d1f2e..4de9f33 100644 --- 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 406c27e..f4877b1 100644 --- 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 2e40015..bcafdd0 100644 --- 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 98b5ad7..df77ac8 100644 --- 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 3e8396b..ed0c9e1 100644 --- 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 d4502bd..4ff640c 100644 --- 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 d1197cd..5e284df 100644 --- 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 c3d0ad4..629a4b3 100644 --- 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 4342a52..aacc526 100644 --- 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 ee1f8a0..c2b02a6 100644 --- 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 -- 1.7.11.7