Skip to contentSkip to conversation

Introduce DPRINTF() macro and convert serial printf() calls to DPRINTF()'s

PATCH In review Michal Novotny 4 participants 7 messages Sep 13, 2010 – Sep 14, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Introduce DPRINTF() macro and convert serial printf() calls to DPRINTF()'s

Hi,
this is the patch to introduce DPRINTF() macro as used in the rest of the qemu source files for printing debug messages when the debugging macro is set (i.e. the debugging is enabled) - e.g. as used in LSI SCSI controller implementation.

---

hw/serial.c +13 -12
index b66d13a..49431b2 100644
@@ -99,6 +99,14 @@
 #define RECV_FIFO           1
 #define MAX_XMIT_RETRY      4
 
+#ifdef DEBUG_SERIAL
+#define DPRINTF(fmt, ...) \
+do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0);
+#else
+#define DPRINTF(fmt, ...) \
+do {} while(0);
+#endif
+
 typedef struct SerialFIFO {
     uint8_t data[UART_FIFO_LENGTH];
     uint8_t count;
@@ -267,10 +275,9 @@ static void serial_update_parameters(SerialState *s)
     ssp.stop_bits = stop_bits;
     s->char_transmit_time =  (get_ticks_per_sec() / speed) * frame_size;
     qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
-#if 0
-    printf("speed=%d parity=%c data=%d stop=%d\n",
+
+    DPRINTF("speed=%d parity=%c data=%d stop=%d\n",
            speed, parity, data_bits, stop_bits);
-#endif
 }
 
 static void serial_update_msl(SerialState *s)
@@ -360,9 +367,7 @@ static void serial_ioport_write(void *opaque, uint32_t addr, uint32_t val)
     SerialState *s = opaque;
 
     addr &= 7;
-#ifdef DEBUG_SERIAL
-    printf("serial: write addr=0x%02x val=0x%02x\n", addr, val);
-#endif
+    DPRINTF("write addr=0x%02x val=0x%02x\n", addr, val);
     switch(addr) {
     default:
     case 0:
@@ -583,9 +588,7 @@ static uint32_t serial_ioport_read(void *opaque, uint32_t addr)
         ret = s->scr;
         break;
     }
-#ifdef DEBUG_SERIAL
-    printf("serial: read addr=0x%02x val=0x%02x\n", addr, ret);
-#endif
+    DPRINTF("read addr=0x%02x val=0x%02x\n", addr, ret);
     return ret;
 }
 
@@ -651,9 +654,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size)
 static void serial_event(void *opaque, int event)
 {
     SerialState *s = opaque;
-#ifdef DEBUG_SERIAL
-    printf("serial: event %x\n", event);
-#endif
+    DPRINTF("event %x\n", event);
     if (event == CHR_EVENT_BREAK)
         serial_receive_break(s);
 }
Signature · 2 lines
Michal Novotny<[email protected]>, RHCE
Virtualization Team (xen userspace), Red Hat
#2 lore raw
In reply to Michal Novotny
Quoted 5 lines · Michal Novotny

Hi,
this is the patch to introduce DPRINTF() macro as used in the rest of the qemu source files for printing debug messages when the debugging macro is set (i.e. the debugging is enabled) - e.g. as used in LSI SCSI controller implementation.

Hi,

This patch seems to be corrupt, can you please resubmit with git send-email?

Thanks,
Edgar

Quoted 77 lines

---

hw/serial.c +11 -6
index b66d13a..49431b2 100644
@@ -99,6 +99,14 @@
  #define RECV_FIFO           1
  #define MAX_XMIT_RETRY      4
 
+#ifdef DEBUG_SERIAL
+#define DPRINTF(fmt, ...) \
+do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0);
+#else
+#define DPRINTF(fmt, ...) \
+do {} while(0);
+#endif
+
  typedef struct SerialFIFO {
      uint8_t data[UART_FIFO_LENGTH];
      uint8_t count;
@@ -267,10 +275,9 @@ static void serial_update_parameters(SerialState *s)
      ssp.stop_bits = stop_bits;
      s->char_transmit_time =  (get_ticks_per_sec() / speed) * frame_size;
      qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
-#if 0
-    printf("speed=%d parity=%c data=%d stop=%d\n",
+
+    DPRINTF("speed=%d parity=%c data=%d stop=%d\n",
             speed, parity, data_bits, stop_bits);
-#endif
  }
 
  static void serial_update_msl(SerialState *s)
@@ -360,9 +367,7 @@ static void serial_ioport_write(void *opaque, 
 uint32_t addr, uint32_t val)
      SerialState *s = opaque;
 
      addr &= 7;
-#ifdef DEBUG_SERIAL
-    printf("serial: write addr=0x%02x val=0x%02x\n", addr, val);
-#endif
+    DPRINTF("write addr=0x%02x val=0x%02x\n", addr, val);
      switch(addr) {
      default:
      case 0:
hw/serial.c +2 -6
@@ -583,9 +588,7 @@ static uint32_t serial_ioport_read(void *opaque, 
 uint32_t addr)
          ret = s->scr;
          break;
      }
-#ifdef DEBUG_SERIAL
-    printf("serial: read addr=0x%02x val=0x%02x\n", addr, ret);
-#endif
+    DPRINTF("read addr=0x%02x val=0x%02x\n", addr, ret);
      return ret;
  }
@@ -651,9 +654,7 @@ static void serial_receive1(void *opaque, const 
 uint8_t *buf, int size)
  static void serial_event(void *opaque, int event)
  {
      SerialState *s = opaque;
-#ifdef DEBUG_SERIAL
-    printf("serial: event %x\n", event);
-#endif
+    DPRINTF("event %x\n", event);
      if (event == CHR_EVENT_BREAK)
          serial_receive_break(s);
  }
Signature · 2 lines
Michal Novotny<[email protected]>, RHCE
Virtualization Team (xen userspace), Red Hat
#3 lore raw
Quoted 8 lines · Edgar E. Iglesias
Quoted 6 lines · Michal Novotny

Hi,
this is the patch to introduce DPRINTF() macro as used in the rest of the qemu source files for printing debug messages when the debugging macro is set (i.e. the debugging is enabled) - e.g. as used in LSI SCSI controller implementation.

Quoted 9 lines

Hi,

This patch seems to be corrupt, can you please resubmit with git send-email?

Thanks,
Edgar

Well, I'd love to but I'm having git 1.7.0.1 and it's saying that send-email it doesn't know send-email [1] so I did append it myself. Nevertheless when I did copy & paste of this e-mails body to one file and applied using cat patchfile | patch -p1 in the current git tree (pulled from upstream repository before issuing the command) it applied fine so I don't know what's wrong. The patch file applicable to latest qemu codebase is attached.

Michal

[1] This is what I'm having:

$ git send-email 0001-dprintf-implementation.patch --to [email protected]
git: 'send-email' is not a git command. See 'git --help'.
$
Quoted 77 lines
Quoted 77 lines

---

hw/serial.c +11 -6
index b66d13a..49431b2 100644
@@ -99,6 +99,14 @@
   #define RECV_FIFO           1
   #define MAX_XMIT_RETRY      4
 
+#ifdef DEBUG_SERIAL
+#define DPRINTF(fmt, ...) \
+do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0);
+#else
+#define DPRINTF(fmt, ...) \
+do {} while(0);
+#endif
+
   typedef struct SerialFIFO {
       uint8_t data[UART_FIFO_LENGTH];
       uint8_t count;
@@ -267,10 +275,9 @@ static void serial_update_parameters(SerialState *s)
       ssp.stop_bits = stop_bits;
       s->char_transmit_time =  (get_ticks_per_sec() / speed) * frame_size;
       qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS,&ssp);
-#if 0
-    printf("speed=%d parity=%c data=%d stop=%d\n",
+
+    DPRINTF("speed=%d parity=%c data=%d stop=%d\n",
              speed, parity, data_bits, stop_bits);
-#endif
   }
 
   static void serial_update_msl(SerialState *s)
@@ -360,9 +367,7 @@ static void serial_ioport_write(void *opaque,
 uint32_t addr, uint32_t val)
       SerialState *s = opaque;
 
       addr&= 7;
-#ifdef DEBUG_SERIAL
-    printf("serial: write addr=0x%02x val=0x%02x\n", addr, val);
-#endif
+    DPRINTF("write addr=0x%02x val=0x%02x\n", addr, val);
       switch(addr) {
       default:
       case 0:
hw/serial.c +2 -6
@@ -583,9 +588,7 @@ static uint32_t serial_ioport_read(void *opaque,
 uint32_t addr)
           ret = s->scr;
           break;
       }
-#ifdef DEBUG_SERIAL
-    printf("serial: read addr=0x%02x val=0x%02x\n", addr, ret);
-#endif
+    DPRINTF("read addr=0x%02x val=0x%02x\n", addr, ret);
       return ret;
   }
@@ -651,9 +654,7 @@ static void serial_receive1(void *opaque, const
 uint8_t *buf, int size)
   static void serial_event(void *opaque, int event)
   {
       SerialState *s = opaque;
-#ifdef DEBUG_SERIAL
-    printf("serial: event %x\n", event);
-#endif
+    DPRINTF("event %x\n", event);
       if (event == CHR_EVENT_BREAK)
           serial_receive_break(s);
   }
Signature · 2 lines
Michal Novotny<[email protected]>, RHCE
Virtualization Team (xen userspace), Red Hat
Signature · 2 lines
Michal Novotny<[email protected]>, RHCE
Virtualization Team (xen userspace), Red Hat

commit 03615a2319e7ef85fc54661493f33c172883cecf

Author: Michal Novotny <[email protected]>
Date:   Mon Sep 13 13:36:29 2010 +0200

DPRINTF() impl.

hw/serial.c +13 -12
index b66d13a..49431b2 100644
@@ -99,6 +99,14 @@
 #define RECV_FIFO           1
 #define MAX_XMIT_RETRY      4
 
+#ifdef DEBUG_SERIAL
+#define DPRINTF(fmt, ...) \
+do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0);
+#else
+#define DPRINTF(fmt, ...) \
+do {} while(0);
+#endif
+
 typedef struct SerialFIFO {
     uint8_t data[UART_FIFO_LENGTH];
     uint8_t count;
@@ -267,10 +275,9 @@ static void serial_update_parameters(SerialState *s)
     ssp.stop_bits = stop_bits;
     s->char_transmit_time =  (get_ticks_per_sec() / speed) * frame_size;
     qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
-#if 0
-    printf("speed=%d parity=%c data=%d stop=%d\n",
+
+    DPRINTF("speed=%d parity=%c data=%d stop=%d\n",
            speed, parity, data_bits, stop_bits);
-#endif
 }
 
 static void serial_update_msl(SerialState *s)
@@ -360,9 +367,7 @@ static void serial_ioport_write(void *opaque, uint32_t addr, uint32_t val)
     SerialState *s = opaque;
 
     addr &= 7;
-#ifdef DEBUG_SERIAL
-    printf("serial: write addr=0x%02x val=0x%02x\n", addr, val);
-#endif
+    DPRINTF("write addr=0x%02x val=0x%02x\n", addr, val);
     switch(addr) {
     default:
     case 0:
@@ -583,9 +588,7 @@ static uint32_t serial_ioport_read(void *opaque, uint32_t addr)
         ret = s->scr;
         break;
     }
-#ifdef DEBUG_SERIAL
-    printf("serial: read addr=0x%02x val=0x%02x\n", addr, ret);
-#endif
+    DPRINTF("read addr=0x%02x val=0x%02x\n", addr, ret);
     return ret;
 }
 
@@ -651,9 +654,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size)
 static void serial_event(void *opaque, int event)
 {
     SerialState *s = opaque;
-#ifdef DEBUG_SERIAL
-    printf("serial: event %x\n", event);
-#endif
+    DPRINTF("event %x\n", event);
     if (event == CHR_EVENT_BREAK)
         serial_receive_break(s);
 }
#4 lore raw
Quoted 19 lines · Michal Novotny
Quoted 8 lines · Edgar E. Iglesias
Quoted 6 lines · Michal Novotny

Hi,
this is the patch to introduce DPRINTF() macro as used in the rest of the qemu source files for printing debug messages when the debugging macro is set (i.e. the debugging is enabled) - e.g. as used in LSI SCSI controller implementation.

Quoted 9 lines

Hi,

This patch seems to be corrupt, can you please resubmit with git send-email?

Thanks,
Edgar

Quoted 7 lines

Well, I'd love to but I'm having git 1.7.0.1 and it's saying that send-email it doesn't know send-email [1] so I did append it myself. Nevertheless when I did copy & paste of this e-mails body to one file and applied using cat patchfile | patch -p1 in the current git tree (pulled from upstream repository before issuing the command) it applied fine so I don't know what's wrong. The patch file applicable to latest qemu codebase is attached.

Thanks, the attached one works. Applied.

Cheers

#5 lore raw
In reply to Michal Novotny

Am 13.09.2010 um 14:37 schrieb Michal Novotny:

Quoted 5 lines

I'm having git 1.7.0.1 and it's saying that send-email it doesn't know send-email [1]

[1] This is what I'm having:

$ git send-email 0001-dprintf-implementation.patch --to [email protected]
git: 'send-email' is not a git command. See 'git --help'.

I believe on Fedora it's in an extra package. Don't have the name at hand.

Andreas

#6 lore raw
Quoted 11 lines · Andreas Färber

Am 13.09.2010 um 14:37 schrieb Michal Novotny:

Quoted 5 lines

I'm having git 1.7.0.1 and it's saying that send-email it doesn't know send-email [1]

[1] This is what I'm having:

$ git send-email 0001-dprintf-implementation.patch --to [email protected]
git: 'send-email' is not a git command. See 'git --help'.

I believe on Fedora it's in an extra package. Don't have the name at hand.

Andreas

Paolo already helped me (thanks a lot!) with this one, it's in the git-email package for Fedora - it can be useful to send this information to the list so I'm CCing list now.

Michal

Signature · 2 lines
Michal Novotny<[email protected]>, RHCE
Virtualization Team (xen userspace), Red Hat