[Qemu-devel] [PATCH 0/2] Remove naked #define DEBUG to allow -DDEBUG builds

[Qemu-devel] [PATCH 0/2] Remove naked #define DEBUG to allow -DDEBUG builds

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Hi,

To address https://sourceforge.net/tracker/?func=detail&aid=1945129&group_id=180599&atid=893831
this patch removes two cases where drivers would define 'DEBUG' naked
instead of using E1000_DEBUG or similar. Such usage of DEBUG conflicts
with the possibility to build QEMU with --extra-cflags=-DDEBUG

Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>

Jes Sorensen (2):
  Remove unused DEBUG defines from hw/msix.c
  Change #define DEBUG to #define E1000_DEBUG in hw/e1000.c

 hw/e1000.c |    4 ++--
 hw/msix.c  |    9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

[Qemu-devel] [PATCH 1/2] Remove unused DEBUG defines from hw/msix.c

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Remove unused DEBUG defines from hw/msix.c to avoid having anything
define the word DEBUG without any additions such as MSIX_DEBUG.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 hw/msix.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/hw/msix.c b/hw/msix.c
index 1613bb4..d99403a 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -42,15 +42,6 @@
 #define MSIX_MAX_ENTRIES 32
 
 
-#ifdef MSIX_DEBUG
-#define DEBUG(fmt, ...)                                       \
-    do {                                                      \
-      fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__);    \
-    } while (0)
-#else
-#define DEBUG(fmt, ...) do { } while(0)
-#endif
-
 /* Flag for interrupt controller to declare MSI-X support */
 int msix_supported;
 
-- 
1.6.6.1

[Qemu-devel] [PATCH 2/2] Change #define DEBUG to #define E1000_DEBUG in hw/e1000.c

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Change #define DEBUG to #define E1000_DEBUG in hw/e1000.c to make
it possible to build QEMU with -DDEBUG

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 hw/e1000.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/e1000.c b/hw/e1000.c
index 96d045d..0da65f9 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -33,9 +33,9 @@
 
 #include "e1000_hw.h"
 
-#define DEBUG
+#define E1000_DEBUG
 
-#ifdef DEBUG
+#ifdef E1000_DEBUG
 enum {
     DEBUG_GENERAL,	DEBUG_IO,	DEBUG_MMIO,	DEBUG_INTERRUPT,
     DEBUG_RX,		DEBUG_TX,	DEBUG_MDIC,	DEBUG_EEPROM,
-- 
1.6.6.1

Re: [Qemu-devel] [PATCH 1/2] Remove unused DEBUG defines from hw/msix.c

[Anthony Liguori]

On 06/14/2010 10:05 AM, Jes.Sorensen@redhat.com wrote:
> From: Jes Sorensen<Jes.Sorensen@redhat.com>
>
> Remove unused DEBUG defines from hw/msix.c to avoid having anything
> define the word DEBUG without any additions such as MSIX_DEBUG.
>
> Signed-off-by: Jes Sorensen<Jes.Sorensen@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   hw/msix.c |    9 ---------
>   1 files changed, 0 insertions(+), 9 deletions(-)
>
> diff --git a/hw/msix.c b/hw/msix.c
> index 1613bb4..d99403a 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -42,15 +42,6 @@
>   #define MSIX_MAX_ENTRIES 32
>
>
> -#ifdef MSIX_DEBUG
> -#define DEBUG(fmt, ...)                                       \
> -    do {                                                      \
> -      fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__);    \
> -    } while (0)
> -#else
> -#define DEBUG(fmt, ...) do { } while(0)
> -#endif
> -
>   /* Flag for interrupt controller to declare MSI-X support */
>   int msix_supported;
>
>