Move DEBUG macros to central location.

diff --git a/ChangeLog b/ChangeLog
index e0b69a39e17c5bce727f016e3b2f429592c37c19..da496a64651eeea4817fd77a218063ad1b37150d 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/qemud/remote.c b/qemud/remote.c
index 3e43dcfd4945421ca3a9e3f9be5b892dff108b1f..8acd95dc2788aee9588907f81f1eda27c9ce2926 100644 (file)
--- a/qemud/remote.c
+++ b/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.
      */

diff --git a/src/hash.c b/src/hash.c
index 01def44d91261f8db17e34728176c29ae2a96f12..d4b8a746a4e983e6f98db1772310be759ffe1128 100644 (file)
--- a/src/hash.c
+++ b/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 */
 
 /*

diff --git a/src/internal.h b/src/internal.h
index d96504d5b9b10baba2d32680262d15a6e5ed3f4a..a3d48faa1fcbceb8c7bb5692277956177dee8a40 100644 (file)
--- a/src/internal.h
+++ b/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__

diff --git a/src/libvirt.c b/src/libvirt.c
index ed98323a88d1f792ff095cde519a42b95678b1ae..e06e9f311a8e1ca485ac3d0fb73d62cfcef7c749 100644 (file)
--- a/src/libvirt.c
+++ b/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

diff --git a/src/lxc_conf.c b/src/lxc_conf.c
index 4228b866d401dbdf23675fea14abdcdff5a78fb3..bea6bbe27346ac37796c02ec44ce393262fae18f 100644 (file)
--- a/src/lxc_conf.c
+++ b/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, ...)

diff --git a/src/lxc_container.c b/src/lxc_container.c
index f3ec1663a3a45f1d408274641a5eb1eb7b3c3429..7599b75e416981efb44d1eaa2ea1c2139134ff82 100644 (file)
--- a/src/lxc_container.c
+++ b/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.

diff --git a/src/lxc_controller.c b/src/lxc_controller.c
index 908ddf1ace3af54439389b729c9014a538395fef..4721c8081870f177a4dd0bc49056d57a789c308c 100644 (file)
--- a/src/lxc_controller.c
+++ b/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 {

diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index e3e40abdb7a2a6c6c55acdb28f453f824250fce0..64c3d219415b9ca040558a9c9c141792fed31b77 100644 (file)
--- a/src/lxc_driver.c
+++ b/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;

diff --git a/src/remote_internal.c b/src/remote_internal.c
index da1ced62cbf6f603cc167cce7258e66bdcaa205b..06b0f4f374afdf9db972229cc8d0df2bf9fb0891 100644 (file)
--- a/src/remote_internal.c
+++ b/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 */

diff --git a/src/storage_backend_disk.c b/src/storage_backend_disk.c
index ea6d720ac494df705b9053a6efcaad74633ce14d..e9c94462917fba9f04138dd038a716afd017dde5 100644 (file)
--- a/src/storage_backend_disk.c
+++ b/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,

diff --git a/src/veth.c b/src/veth.c
index 7cfee5637341cc393ed18efe23d73858cf1f1060..e2dcb9545eab2c4c7553092c13e84fc1efe75900 100644 (file)
--- a/src/veth.c
+++ b/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:

diff --git a/src/xen_internal.c b/src/xen_internal.c
index 3cfc5e3cfbfa42f34ba90b0b09837366e35eb058..c3aaa605e5f6ffe076129aa16c21a3627b120d40 100644 (file)
--- a/src/xen_internal.c
+++ b/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.

diff --git a/src/xen_unified.c b/src/xen_unified.c
index 58073915ba3cc774bd16cfd4c46ad040f4a3b6a8..dae68d38e3877d56db118760c1a1d22cdd792da7 100644 (file)
--- a/src/xen_unified.c
+++ b/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

diff --git a/src/xend_internal.c b/src/xend_internal.c
index d6dcd3eaa3ca20a9e3332019ebf7d9616a312869..0125913472d694219e0dddcf2e70bd8b6406ea65 100644 (file)
--- a/src/xend_internal.c
+++ b/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
 
 /*