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

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

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		\

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

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
 

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

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,

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"

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

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"
 

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"

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
 

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"

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,

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
 

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"

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);
 

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"

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.

tests/virbitmaptest.c

@@ -21,7 +21,7 @@
 
 #include "testutils.h"
 
-#include "bitmap.h"
+#include "virbitmap.h"
 
 static int test1(const void *data ATTRIBUTE_UNUSED)
 {

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"

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"