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

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"

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"

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

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		\

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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
 

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"

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"

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.
  *

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"

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;

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"

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;

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"

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"
 

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"

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,

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)

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