Commit 192cf55c authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

ahci: avoid #ifdef DEBUG_AHCI bitrot 



Debug code using #ifdef is susceptible to bitrot because the compiler
never checks the debug code.

This is easy to avoid, change the DPRINTF() macro to use if (DEBUG_AHCI)
and always give it a 0 or 1 value.

This also allows us to drop an #ifdef DEBUG_AHCI in ahci_start_dma()
since the compiler can now see the local variable is used.

The motivation for this change is a recent DEBUG_AHCI build failure due
to an outdated DPRINTF() format string.  From now on the compiler will
catch these errors.

Cc: John Snow <jsnow@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 1415874281-7371-2-git-send-email-stefanha@redhat.com
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f48a33b6

hw/ide/ahci.c

+8 −10
Original line number Diff line number Diff line
@@ -34,15 +34,15 @@ 
#include <hw/ide/pci.h>

#include <hw/ide/ahci.h>



/* #define DEBUG_AHCI */

#define DEBUG_AHCI 0



#ifdef DEBUG_AHCI

#define DPRINTF(port, fmt, ...) \

do { fprintf(stderr, "ahci: %s: [%d] ", __FUNCTION__, port); \

     fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)

#else

#define DPRINTF(port, fmt, ...) do {} while(0)

#endif

do { \

    if (DEBUG_AHCI) { \

        fprintf(stderr, "ahci: %s: [%d] ", __func__, port); \

        fprintf(stderr, fmt, ## __VA_ARGS__); \

    } \

} while (0)



static void check_cmd(AHCIState *s, int port);

static int handle_cmd(AHCIState *s,int port,int slot);
@@ -551,7 +551,7 @@ static void ahci_reset_port(AHCIState *s, int port) 


static void debug_print_fis(uint8_t *fis, int cmd_len)

{

#ifdef DEBUG_AHCI

#if DEBUG_AHCI

    int i;



    fprintf(stderr, "fis:");
@@ -1154,9 +1154,7 @@ out: 
static void ahci_start_dma(IDEDMA *dma, IDEState *s,

                           BlockCompletionFunc *dma_cb)

{

#ifdef DEBUG_AHCI

    AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma);

#endif

    DPRINTF(ad->port_no, "\n");

    s->io_buffer_offset = 0;

    dma_cb(s, 0);