@@ -24,16 +24,21 @@
//#define DEBUG_LSI_REG
#ifdef DEBUG_LSI
-#define DPRINTF(fmt, ...) \
-do { printf("lsi_scsi: " fmt , ## __VA_ARGS__); } while (0)
-#define BADF(fmt, ...) \
-do { fprintf(stderr, "lsi_scsi: error: " fmt , ## __VA_ARGS__); exit(1);} while (0)
+#define DEBUG_LSI_ENABLED 1
#else
-#define DPRINTF(fmt, ...) do {} while(0)
-#define BADF(fmt, ...) \
-do { fprintf(stderr, "lsi_scsi: error: " fmt , ## __VA_ARGS__);} while (0)
+#define DEBUG_LSI_ENABLED 0
#endif
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(DEBUG_LSI_ENABLED, "lsi_scsi", fmt, ## __VA_ARGS__)
+#define BADF(fmt, ...) \
+ do { \
+ QEMU_DPRINTF(1, "lsi_scsi error", fmt, ## __VA_ARGS__); \
+ if(DEBUG_LSI_ENABLED) { \
+ exit(1); \
+ } \
+ } while (0)
+
#define LSI_MAX_DEVS 7
#define LSI_SCNTL0_TRG 0x01
@@ -1261,12 +1266,11 @@ again:
uint8_t data8;
int reg;
int operator;
-#ifdef DEBUG_LSI
+
static const char *opcode_names[3] =
{"Write", "Read", "Read-Modify-Write"};
static const char *operator_names[8] =
{"MOV", "SHL", "OR", "XOR", "AND", "SHR", "ADD", "ADC"};
-#endif
reg = ((insn >> 16) & 0x7f) | (insn & 0x80);
data8 = (insn >> 8) & 0xff;
@@ -21,14 +21,15 @@
//#define DEBUG_SCSI
#ifdef DEBUG_SCSI
-#define DPRINTF(fmt, ...) \
-do { printf("scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
+#define DEBUG_SCSI_ENABLED 1
#else
-#define DPRINTF(fmt, ...) do {} while(0)
+#define DEBUG_SCSI_ENABLED 0
#endif
-#define BADF(fmt, ...) \
-do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(DEBUG_SCSI_ENABLED, "scsi-generic", fmt, ## __VA_ARGS__)
+#define BADF(fmt, ...) \
+ QEMU_DPRINTF(1, "scsi-generic", fmt, ## __VA_ARGS__)
#include <stdio.h>
#include <sys/types.h>
@@ -303,8 +304,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd)
SCSIDevice *s = r->req.dev;
int ret;
- DPRINTF("Command: lun=%d tag=0x%x len %zd data=0x%02x", lun, tag,
- r->req.cmd.xfer, cmd[0]);
+ DPRINTF("Command: len %zd data=0x%02x", r->req.cmd.xfer, cmd[0]);
#ifdef DEBUG_SCSI
{
@@ -45,13 +45,14 @@
/*#define DEBUG_VSCSI*/
#ifdef DEBUG_VSCSI
-#define DPRINTF(fmt, ...) \
- do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_VSCSI_ENABLED 1
#else
-#define DPRINTF(fmt, ...) \
- do { } while (0)
+#define DEBUG_VSCSI_ENABLED 0
#endif
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(DEBUG_VSCSI_ENABLED, "spapr_vscsi", fmt, ## __VA_ARGS__)
+
/*
* Virtual SCSI device
*/
Modify debug macros to have the same format through the codebase and use regular ifs instead of ifdef. As the debug printf is always put in code, some warnings appeared because of non-existing (old) variables, which were removed. Signed-off-by: Marc MarĂ <marc.mari.barcelo@gmail.com> --- hw/scsi/lsi53c895a.c | 22 +++++++++++++--------- hw/scsi/scsi-generic.c | 14 +++++++------- hw/scsi/spapr_vscsi.c | 9 +++++---- 3 files changed, 25 insertions(+), 20 deletions(-)