Rename dnsmasq.{c,h} to virdnsmasq.{c,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/dnsmasq.c
 src/util/event_poll.c
 src/util/hooks.c
 src/util/hostusb.c
@@ -159,6 +158,7 @@ src/util/vircgroup.c
 src/util/vircommand.c
 src/util/virconf.c
 src/util/virdbus.c
+src/util/virdnsmasq.c
 src/util/virfile.c
 src/util/virhash.c
 src/util/virinitctl.c

src/Makefile.am

@@ -58,7 +58,6 @@ UTIL_SOURCES =							\
 		util/hooks.c util/hooks.h			\
 		util/iptables.c util/iptables.h			\
 		util/ebtables.c util/ebtables.h			\
-		util/dnsmasq.c util/dnsmasq.h                   \
 		util/json.c util/json.h				\
 		util/logging.c util/logging.h			\
 		util/memory.c util/memory.h			\
@@ -84,6 +83,7 @@ UTIL_SOURCES =							\
 		util/virbuffer.c util/virbuffer.h		\
 		util/vircommand.c util/vircommand.h		\
 		util/virconf.c util/virconf.h			\
+		util/virdnsmasq.c util/virdnsmasq.h             \
 		util/virfile.c util/virfile.h			\
 		util/virnodesuspend.c util/virnodesuspend.h	\
 		util/virobject.c util/virobject.h		\

src/network/bridge_driver.c

@@ -58,7 +58,7 @@
 #include "uuid.h"
 #include "iptables.h"
 #include "logging.h"
-#include "dnsmasq.h"
+#include "virdnsmasq.h"
 #include "configmake.h"
 #include "virnetdev.h"
 #include "pci.h"

src/network/bridge_driver.h

@@ -31,7 +31,7 @@
 # include "network_conf.h"
 # include "domain_conf.h"
 # include "vircommand.h"
-# include "dnsmasq.h"
+# include "virdnsmasq.h"
 
 int networkRegister(void);
 

src/util/virdnsmasq.c

@@ -1,4 +1,6 @@
 /*
+ * virdnsmasq.c: Helper APIs for managing dnsmasq
+ *
  * Copyright (C) 2007-2012 Red Hat, Inc.
  * Copyright (C) 2010 Satoru SATOH <satoru.satoh@gmail.com>
  *
@@ -40,7 +42,7 @@
 #include "internal.h"
 #include "datatypes.h"
 #include "virbitmap.h"
-#include "dnsmasq.h"
+#include "virdnsmasq.h"
 #include "util.h"
 #include "vircommand.h"
 #include "memory.h"

src/util/virdnsmasq.h

@@ -1,4 +1,6 @@
 /*
+ * virdnsmasq.h: Helper APIs for managing dnsmasq
+ *
  * Copyright (C) 2007-2012 Red Hat, Inc.
  * Copyright (C) 2010 Satoru SATOH <satoru.satoh@gmail.com>
  *