Rename dnsmasq.{c,h} to virdnsmasq.{c,h}

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6dcda84b29a8b8c222f69491953c0b77ac03faa4..6081c261bff506ecfe8ee6bcd66c0bfa4ab98e23 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/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

diff --git a/src/Makefile.am b/src/Makefile.am
index c27388301fa82b9aa35db43726daa51b512648fb..efb23c1fc82019870bb7f8a30d315e67bc097731 100644 (file)
--- a/src/Makefile.am
+++ b/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               \

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 84098de2b7e694450eee51a637fdaaa76bf0405f..7bb6b2a98388842028749c2dbf15e0b60ada8638 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/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"

diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index fea27e0cc5de3f5f3372e183fc825aec9d990091..4bf64eafb1042d2753d17357cbdab4087f6276f9 100644 (file)
--- a/src/network/bridge_driver.h
+++ b/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);
 

diff --git a/src/util/dnsmasq.c b/src/util/virdnsmasq.c
similarity index 99%
rename from src/util/dnsmasq.c
rename to src/util/virdnsmasq.c
index 18be2ffb6d13c0672e886993214d68f17e84e104..1c930602dfcec62377b3420b8fbdf2a8e8b6fd9b 100644 (file)
--- a/src/util/dnsmasq.c
+++ b/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"

diff --git a/src/util/dnsmasq.h b/src/util/virdnsmasq.h
similarity index 98%
rename from src/util/dnsmasq.h
rename to src/util/virdnsmasq.h
index b83bc96c9e5f32e054e3097753bba11693a43800..a97d3e60191dd1dc434c29451d467bdb83db39f3 100644 (file)
--- a/src/util/dnsmasq.h
+++ b/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>
  *