mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
IDE: replace DEBUG_IDE with tracing system
Remove the DEBUG_IDE preprocessor definition with something more appropriately flexible, using the trace-events subsystem. This will be less prone to bitrot and will more effectively allow us to target just the functions we care about. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 20170901001502.29915-2-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
4c93950659
commit
3eee2611dd
8 changed files with 80 additions and 70 deletions
17
hw/ide/pci.c
17
hw/ide/pci.c
|
@ -31,6 +31,7 @@
|
|||
#include "sysemu/dma.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/ide/pci.h"
|
||||
#include "trace.h"
|
||||
|
||||
#define BMDMA_PAGE_SIZE 4096
|
||||
|
||||
|
@ -196,9 +197,7 @@ static void bmdma_reset(IDEDMA *dma)
|
|||
{
|
||||
BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma);
|
||||
|
||||
#ifdef DEBUG_IDE
|
||||
printf("ide: dma_reset\n");
|
||||
#endif
|
||||
trace_bmdma_reset();
|
||||
bmdma_cancel(bm);
|
||||
bm->cmd = 0;
|
||||
bm->status = 0;
|
||||
|
@ -227,9 +226,7 @@ static void bmdma_irq(void *opaque, int n, int level)
|
|||
|
||||
void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val)
|
||||
{
|
||||
#ifdef DEBUG_IDE
|
||||
printf("%s: 0x%08x\n", __func__, val);
|
||||
#endif
|
||||
trace_bmdma_cmd_writeb(val);
|
||||
|
||||
/* Ignore writes to SSBM if it keeps the old value */
|
||||
if ((val & BM_CMD_START) != (bm->cmd & BM_CMD_START)) {
|
||||
|
@ -258,9 +255,7 @@ static uint64_t bmdma_addr_read(void *opaque, hwaddr addr,
|
|||
uint64_t data;
|
||||
|
||||
data = (bm->addr >> (addr * 8)) & mask;
|
||||
#ifdef DEBUG_IDE
|
||||
printf("%s: 0x%08x\n", __func__, (unsigned)data);
|
||||
#endif
|
||||
trace_bmdma_addr_read(data);
|
||||
return data;
|
||||
}
|
||||
|
||||
|
@ -271,9 +266,7 @@ static void bmdma_addr_write(void *opaque, hwaddr addr,
|
|||
int shift = addr * 8;
|
||||
uint32_t mask = (1ULL << (width * 8)) - 1;
|
||||
|
||||
#ifdef DEBUG_IDE
|
||||
printf("%s: 0x%08x\n", __func__, (unsigned)data);
|
||||
#endif
|
||||
trace_bmdma_addr_write(data);
|
||||
bm->addr &= ~(mask << shift);
|
||||
bm->addr |= ((data & mask) << shift) & ~3;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue