Rename bitmap.{c,h} to virbitmap.{c,h}

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index e87b0c8077560ff81a6a5e53acd7563fcf910035..a6cab5857ff7939d68c0b97b348d3d1eb2bd847e 100644 (file)
--- 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 5bff70e6f36ec71449607291a51047a67c620342..bd6dfd96f694a235d901cabfb62024ad974c0170 100644 (file)
--- 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 b02bc66c1de8cb8900729d968625017da58273cc..f33d49178aad94bb388a8177fb6a1b8bed4ba4e9 100644 (file)
--- 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 af2b01cb7823b27d4f9481404e6a2ee4e0601103..01b76ecc95a42135ac8d78b8eb62f58758a45312 100644 (file)
--- 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 72cf64b4fc4fcd9f1ee44b4928a4a377c484f539..4d70fe65b0b191c1b44471e2f32f2111b17b284c 100644 (file)
--- 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 bba1bb714848209204937f1fbfa01ad677d1911e..95b7943d95054d6feea94f021d303f120321dbfe 100644 (file)
--- 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 6bcf805cf121c7843a5ef91682a2d24c792f9c05..c8808a199d7c83716987523a18cee1df091f8884 100644 (file)
--- 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 a6ac169da214c2285bc04f1e230a1480491ad548..f552078740fd9b8d50b7a7d0daad2decf675dd15 100644 (file)
--- 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 cfa6fffba303abe9e30038eae1f88ccf40c57917..bcf21c3ffa90c6f1f8a269cbf9943d2a32294ffe 100644 (file)
--- 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 7d8dd216c8793e78c3dec97fd3b4dfb7fac16b39..7e8a1d8ef5a5deb48ce7adc44da553354840ae48 100644 (file)
--- 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 dbfab880393fa5fdfc58d2d26087c4a04fd2b92f..8c42b12e4890dc9e6c2be44e73f859cb39679b9a 100644 (file)
--- 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 acca4ec111415c6e490996d29e7d676f219077d4..2b09a8f3403b6d501ebe7a09012ad12884f21f6f 100644 (file)
--- 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 89796afea927b4e2358791351940c2332e1dd4ab..030e0005d817214c3b22b2dce412bb99d2b1c7b5 100644 (file)
--- 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 8d714dc7a99d4f5a7c6f81ff4bed8204e095f5a7..dfd60349cbcf9f1c4174a2a5a9da90b8aafbda7e 100644 (file)
--- 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 116c0926e899bc48f4f1ec9bf3334c89ddc21be1..0ae23c6908375ce6257c4705622ce885b7324bf7 100644 (file)
--- 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 c29f5f36c7f38fea3a5ff32cd86132b9d7549c01..f63dd209c31f99e8b1e24dbc3299c2ebc538ce15 100644 (file)
--- a/src/util/bitmap.c
+++ b/src/util/virbitmap.c
@@ -1,5 +1,5 @@
 /*
- * bitmap.h: Simple bitmap operations
+ * virbitmap.h: Simple bitmap operations
  *
  * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2010 Novell, Inc.
@@ -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 98%
rename from src/util/bitmap.h
rename to src/util/virbitmap.h
index 346a1fb7b0ada07af87e276df901812cc1423d93..0f68b791adcbe573c718b226ecfc1076aac285df 100644 (file)
--- a/src/util/bitmap.h
+++ b/src/util/virbitmap.h
@@ -1,5 +1,5 @@
 /*
- * bitmap.h: Simple bitmap operations
+ * virbitmap.h: Simple bitmap operations
  *
  * Copyright (C) 2012 Red Hat, Inc.
  * Copyright (C) 2010 Novell, Inc.

diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index af94dab5f5f937be0202fef6fb60c4f4db1e82fe..db766729a7a3299377736191452127eefdefbf92 100644 (file)
--- 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 561e0e75f7a7ff0c4e63065579afc5ad56405e20..765f30c0cc93643c35e2053a9ab8b38501f3f23e 100644 (file)
--- 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 465cb444e9aac0c061a18e954ba6c66f0fd5864e..2f7d4a36c7e1ded7480e33388e3a284149b7a5e1 100644 (file)
--- 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"