[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v2 02/28] Rename bitmap.{c,h} to virbitmap.{c,h}



From: "Daniel P. Berrange" <berrange redhat com>

Signed-off-by: Daniel P. Berrange <berrange redhat com>
---
 src/Makefile.am                    | 2 +-
 src/conf/cpu_conf.h                | 2 +-
 src/conf/domain_conf.c             | 3 +--
 src/conf/domain_conf.h             | 2 +-
 src/conf/network_conf.h            | 2 +-
 src/conf/snapshot_conf.c           | 2 +-
 src/libxl/libxl_conf.h             | 2 +-
 src/qemu/qemu_capabilities.c       | 2 +-
 src/qemu/qemu_conf.h               | 2 +-
 src/qemu/qemu_driver.c             | 2 +-
 src/qemu/qemu_monitor.h            | 2 +-
 src/qemu/qemu_monitor_json.h       | 2 +-
 src/qemu/qemu_process.c            | 2 +-
 src/util/dnsmasq.c                 | 2 +-
 src/util/processinfo.h             | 2 +-
 src/util/{bitmap.c => virbitmap.c} | 2 +-
 src/util/{bitmap.h => virbitmap.h} | 0
 tests/virbitmaptest.c              | 2 +-
 tools/virsh-domain.c               | 2 +-
 tools/virsh.c                      | 2 +-
 20 files changed, 19 insertions(+), 20 deletions(-)
 rename src/util/{bitmap.c => virbitmap.c} (99%)
 rename src/util/{bitmap.h => virbitmap.h} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index e87b0c8..a6cab58 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/bitmap.c util/bitmap.h			\
 		util/buf.c util/buf.h				\
 		util/command.c util/command.h			\
 		util/conf.c util/conf.h				\
@@ -84,6 +83,7 @@ UTIL_SOURCES =							\
 		util/viraudit.c util/viraudit.h			\
 		util/virauth.c util/virauth.h			\
 		util/virauthconfig.c util/virauthconfig.h	\
+		util/virbitmap.c util/virbitmap.h		\
 		util/virfile.c util/virfile.h			\
 		util/virnodesuspend.c util/virnodesuspend.h	\
 		util/virobject.c util/virobject.h		\
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 5bff70e..bd6dfd9 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -27,7 +27,7 @@
 # include "util.h"
 # include "buf.h"
 # include "xml.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 # include "virarch.h"
 
 # define VIR_CPU_VENDOR_ID_LENGTH 12
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ccb3b63..ff6d979 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -44,14 +44,13 @@
 #include "nwfilter_conf.h"
 #include "storage_file.h"
 #include "virfile.h"
-#include "bitmap.h"
+#include "virbitmap.h"
 #include "count-one-bits.h"
 #include "secret_conf.h"
 #include "netdev_vport_profile_conf.h"
 #include "netdev_bandwidth_conf.h"
 #include "netdev_vlan_conf.h"
 #include "device_conf.h"
-#include "bitmap.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index af2b01c..01b76ec 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -46,7 +46,7 @@
 # include "virnetdevvlan.h"
 # include "virobject.h"
 # include "device_conf.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 # include "storage_file.h"
 
 /* forward declarations of all device types, required by
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 72cf64b..4d70fe6 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -38,7 +38,7 @@
 # include "virnetdevvlan.h"
 # include "virmacaddr.h"
 # include "device_conf.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 
 enum virNetworkForwardType {
     VIR_NETWORK_FORWARD_NONE   = 0,
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index bba1bb7..95b7943 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "bitmap.h"
+#include "virbitmap.h"
 #include "buf.h"
 #include "count-one-bits.h"
 #include "datatypes.h"
diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 6bcf805..c8808a1 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -34,7 +34,7 @@
 # include "domain_event.h"
 # include "capabilities.h"
 # include "configmake.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 
 
 # define LIBXL_VNC_PORT_MIN  5900
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 50d999a..f07f6bb 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -35,7 +35,7 @@
 #include "cpu/cpu.h"
 #include "domain_conf.h"
 #include "command.h"
-#include "bitmap.h"
+#include "virbitmap.h"
 #include "virnodesuspend.h"
 #include "qemu_monitor.h"
 
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index cfa6fff..bcf21c3 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -39,7 +39,7 @@
 # include "hostusb.h"
 # include "cpu_conf.h"
 # include "driver.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 # include "command.h"
 # include "threadpool.h"
 # include "locking/lock_manager.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7d8dd21..7e8a1d8 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -91,7 +91,7 @@
 #include "virnodesuspend.h"
 #include "virtime.h"
 #include "virtypedparam.h"
-#include "bitmap.h"
+#include "virbitmap.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index dbfab88..8c42b12 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -28,7 +28,7 @@
 # include "internal.h"
 
 # include "domain_conf.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 # include "virhash.h"
 # include "json.h"
 # include "device_conf.h"
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index acca4ec..2b09a8f 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -28,7 +28,7 @@
 # include "internal.h"
 
 # include "qemu_monitor.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 
 int qemuMonitorJSONIOProcess(qemuMonitorPtr mon,
                              const char *data,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 89796af..030e000 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -69,7 +69,7 @@
 #include "virprocess.h"
 #include "virtime.h"
 #include "virnetdevtap.h"
-#include "bitmap.h"
+#include "virbitmap.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index 8d714dc..dfd6034 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -39,7 +39,7 @@
 
 #include "internal.h"
 #include "datatypes.h"
-#include "bitmap.h"
+#include "virbitmap.h"
 #include "dnsmasq.h"
 #include "util.h"
 #include "command.h"
diff --git a/src/util/processinfo.h b/src/util/processinfo.h
index 116c092..0ae23c6 100644
--- a/src/util/processinfo.h
+++ b/src/util/processinfo.h
@@ -23,7 +23,7 @@
 # define __VIR_PROCESSINFO_H__
 
 # include "internal.h"
-# include "bitmap.h"
+# include "virbitmap.h"
 
 int virProcessInfoSetAffinity(pid_t pid, virBitmapPtr map);
 
diff --git a/src/util/bitmap.c b/src/util/virbitmap.c
similarity index 99%
rename from src/util/bitmap.c
rename to src/util/virbitmap.c
index c29f5f3..0f13389 100644
--- a/src/util/bitmap.c
+++ b/src/util/virbitmap.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "bitmap.h"
+#include "virbitmap.h"
 #include "memory.h"
 #include "buf.h"
 #include "util.h"
diff --git a/src/util/bitmap.h b/src/util/virbitmap.h
similarity index 100%
rename from src/util/bitmap.h
rename to src/util/virbitmap.h
diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index af94dab..db76672 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -21,7 +21,7 @@
 
 #include "testutils.h"
 
-#include "bitmap.h"
+#include "virbitmap.h"
 
 static int test1(const void *data ATTRIBUTE_UNUSED)
 {
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 561e0e7..765f30c 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -37,7 +37,7 @@
 #include <libxml/xmlsave.h>
 
 #include "internal.h"
-#include "bitmap.h"
+#include "virbitmap.h"
 #include "buf.h"
 #include "c-ctype.h"
 #include "conf/domain_conf.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 465cb44..2f7d4a3 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -69,7 +69,7 @@
 #include "command.h"
 #include "virkeycode.h"
 #include "virnetdevbandwidth.h"
-#include "util/bitmap.h"
+#include "virbitmap.h"
 #include "conf/domain_conf.h"
 #include "virtypedparam.h"
 
-- 
1.7.11.7


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]