Move DEBUG macros to central location.

ChangeLog

@@ -1,3 +1,11 @@
+Mon Oct  6 15:47:00 EST 2008 Cole Robinson <crobinso@redhat.com>
+
+	* qemud/remote.c src/hash.c src/internal.h src/lxc_conf.c
+	  src/lxc_container.c src/lxc_controller.c src/lxc_driver.c
+	  src/remote_internal.c src/storage_backend_disk.c src/veth.c
+	  src/xen_internal.c src/xen_unified.c src/xend_internal.c:
+	  Move DEBUG and DEBUG0 macros to central location.
+
 Mon Oct  6 15:32:00 EST 2008 Cole Robinson <crobinso@redhat.com>
 
 	* src/qemu_conf.c: Fix possible segfault if starting a qemu guest with

qemud/remote.c

@@ -52,8 +52,6 @@
 #include "qemud.h"
 #include "memory.h"
 
-#define DEBUG 0
-
 #define REMOTE_DEBUG(fmt,...) qemudDebug("REMOTE: " fmt, __VA_ARGS__)
 
 static void remoteDispatchError (struct qemud_client *client,
@@ -427,10 +425,6 @@ remoteDispatchOpen (struct qemud_server *server ATTRIBUTE_UNUSED,
 
     name = args->name ? *args->name : NULL;
 
-#if DEBUG
-    fprintf (stderr, "remoteDispatchOpen: name = %s\n", name);
-#endif
-
     /* If this connection arrived on a readonly socket, force
      * the connection to be readonly.
      */

src/hash.c

@@ -29,9 +29,6 @@
 
 #define MAX_HASH_LEN 8
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 /* #define DEBUG_GROW */
 
 /*

src/internal.h

@@ -85,6 +85,9 @@ extern int debugFlag;
     do { } while (0)
 #endif /* !ENABLE_DEBUG */
 
+#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
+#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
+
 /* C99 uses __func__.  __FUNCTION__ is legacy. */
 #ifndef __GNUC__
 #define __FUNCTION__ __func__

src/libvirt.c

@@ -76,9 +76,6 @@ static int virStateDriverTabCount = 0;
 #endif
 static int initialized = 0;
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 #ifdef ENABLE_DEBUG
 int debugFlag = 0;
 #endif

src/lxc_conf.c

@@ -29,10 +29,6 @@
 
 #include "lxc_conf.h"
 
-/* debug macros */
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 /* Functions */
 void lxcError(virConnectPtr conn, virDomainPtr dom, int code,
               const char *fmt, ...)

src/lxc_container.c

@@ -46,9 +46,6 @@
 #include "memory.h"
 #include "veth.h"
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 /*
  * GLibc headers are behind the kernel, so we define these
  * constants if they're not present already.

src/lxc_controller.c

@@ -44,9 +44,6 @@
 #include "util.h"
 #include "cgroup.h"
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 int debugFlag = 0;
 
 struct cgroup_device_policy {

src/lxc_driver.c

@@ -46,11 +46,6 @@
 #include "cgroup.h"
 
 
-/* debug macros */
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
-
 static int lxcStartup(void);
 static int lxcShutdown(void);
 static lxc_driver_t *lxc_driver = NULL;

src/remote_internal.c

@@ -74,9 +74,6 @@
 #include "memory.h"
 #include "util.h"
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt,__VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 /* Per-connection private data. */
 #define MAGIC 999               /* private_data->magic if OK */
 #define DEAD 998                /* private_data->magic if dead/closed */

src/storage_backend_disk.c

@@ -30,9 +30,6 @@
 #include "util.h"
 #include "memory.h"
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 enum {
     VIR_STORAGE_POOL_DISK_DOS = 0,
     VIR_STORAGE_POOL_DISK_DVH,

src/veth.c

@@ -18,9 +18,6 @@
 #include "memory.h"
 #include "util.h"
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 /* Functions */
 /**
  * getFreeVethName:

src/xen_internal.c

@@ -48,9 +48,6 @@
 #include "capabilities.h"
 #include "memory.h"
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 /*
  * so far there is 2 versions of the structures usable for doing
  * hypervisor calls.

src/xen_unified.c

@@ -40,9 +40,6 @@
 #include "util.h"
 #include "memory.h"
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt,__VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 static int
 xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info);
 static int

src/xend_internal.c

@@ -46,9 +46,6 @@
 /* required for cpumap_t */
 #include <xen/dom0_ops.h>
 
-#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt,__VA_ARGS__)
-#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
-
 #ifndef PROXY
 
 /*