| Message ID | 1304934742-5193-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, May 9, 2011 at 10:52 AM, Kevin Wolf <kwolf@redhat.com> wrote: > These printfs aren't really debug messages, but clearly indicate a bug if they > ever become effective. Noone uses DEBUG_IDE, let's re-enable the check > unconditionally and make it an assertion instead of printfs in the device > emulation. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > hw/ide/pci.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
diff --git a/hw/ide/pci.c b/hw/ide/pci.c index f5ac932..a4726ad 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -296,12 +296,8 @@ void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val) */ if (bm->bus->dma->aiocb) { qemu_aio_flush(); -#ifdef DEBUG_IDE - if (bm->bus->dma->aiocb) - printf("ide_dma_cancel: aiocb still pending\n"); - if (bm->status & BM_STATUS_DMAING) - printf("ide_dma_cancel: BM_STATUS_DMAING still pending\n"); -#endif + assert(bm->bus->dma->aiocb == NULL); + assert((bm->status & BM_STATUS_DMAING) == 0); } } else { bm->cur_addr = bm->addr;
These printfs aren't really debug messages, but clearly indicate a bug if they ever become effective. Noone uses DEBUG_IDE, let's re-enable the check unconditionally and make it an assertion instead of printfs in the device emulation. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- hw/ide/pci.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)