Index: /trunk/src/VBox/Devices/Storage/DevATA.cpp =================================================================== --- /trunk/src/VBox/Devices/Storage/DevATA.cpp (revision 65996) +++ /trunk/src/VBox/Devices/Storage/DevATA.cpp (revision 65997) @@ -896,5 +896,8 @@ { case ATA_AIO_NEW: - LogRel(("new transfer request, iIf=%d iBeginTransfer=%d iSourceSink=%d cbTotalTransfer=%d uTxDir=%d\n", pCtl->aAsyncIORequests[curr].u.t.iIf, pCtl->aAsyncIORequests[curr].u.t.iBeginTransfer, pCtl->aAsyncIORequests[curr].u.t.iSourceSink, pCtl->aAsyncIORequests[curr].u.t.cbTotalTransfer, pCtl->aAsyncIORequests[curr].u.t.uTxDir)); + LogRel(("new transfer request, iIf=%d iBeginTransfer=%d iSourceSink=%d cbTotalTransfer=%d uTxDir=%d\n", + pCtl->aAsyncIORequests[curr].u.t.iIf, pCtl->aAsyncIORequests[curr].u.t.iBeginTransfer, + pCtl->aAsyncIORequests[curr].u.t.iSourceSink, pCtl->aAsyncIORequests[curr].u.t.cbTotalTransfer, + pCtl->aAsyncIORequests[curr].u.t.uTxDir)); break; case ATA_AIO_DMA: @@ -911,5 +914,6 @@ break; case ATA_AIO_ABORT: - LogRel(("abort request, iIf=%d fResetDrive=%d\n", pCtl->aAsyncIORequests[curr].u.a.iIf, pCtl->aAsyncIORequests[curr].u.a.fResetDrive)); + LogRel(("abort request, iIf=%d fResetDrive=%d\n", pCtl->aAsyncIORequests[curr].u.a.iIf, + pCtl->aAsyncIORequests[curr].u.a.fResetDrive)); break; default: @@ -978,5 +982,6 @@ if (!fChainedTransfer && !ataR3AsyncIOIsIdle(pCtl, true /*fStrict*/)) { - Log(("%s: Ctl#%d: ignored command %#04x, controller state %d\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), s->uATARegCommand, pCtl->uAsyncIOState)); + Log(("%s: Ctl#%d: ignored command %#04x, controller state %d\n", + __FUNCTION__, ATACONTROLLER_IDX(pCtl), s->uATARegCommand, pCtl->uAsyncIOState)); LogRel(("PIIX3 IDE: guest issued command %#04x while controller busy\n", s->uATARegCommand)); return; @@ -2917,5 +2922,7 @@ fMSF = (s->aATAPICmd[1] >> 1) & 1; /* multi session: only a single session defined */ -/** @todo double-check this stuff against what a real drive says for a CD-ROM (not a CD-R) with only a single data session. Maybe solve the problem with "cdrdao read-toc" not being able to figure out whether numbers are in BCD or hex. */ + /** @todo double-check this stuff against what a real drive says for a CD-ROM (not a CD-R) + * with only a single data session. Maybe solve the problem with "cdrdao read-toc" not being + * able to figure out whether numbers are in BCD or hex. */ memset(pbBuf, 0, 12); pbBuf[1] = 0x0a; @@ -4416,5 +4423,6 @@ { # ifdef IN_RING3 - LogRel(("PIIX3 ATA: LUN#%d: %s data in the middle of a PIO transfer - VERY SLOW\n", s->iLUN, s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE ? "loading" : "storing")); + LogRel(("PIIX3 ATA: LUN#%d: %s data in the middle of a PIO transfer - VERY SLOW\n", + s->iLUN, s->uTxDir == PDMMEDIATXDIR_FROM_DEVICE ? "loading" : "storing")); /* Any guest OS that triggers this case has a pathetic ATA driver. * In a real system it would block the CPU via IORDY, here we do it @@ -5212,5 +5220,9 @@ ataR3AsyncIODumpRequests(pCtl); } - AssertReleaseMsg(ReqType == ATA_AIO_RESET_ASSERTED || ReqType == ATA_AIO_RESET_CLEARED || ReqType == ATA_AIO_ABORT || pCtl->uAsyncIOState == ReqType, ("I/O state inconsistent: state=%d request=%d\n", pCtl->uAsyncIOState, ReqType)); + AssertReleaseMsg( ReqType == ATA_AIO_RESET_ASSERTED + || ReqType == ATA_AIO_RESET_CLEARED + || ReqType == ATA_AIO_ABORT + || pCtl->uAsyncIOState == ReqType, + ("I/O state inconsistent: state=%d request=%d\n", pCtl->uAsyncIOState, ReqType)); } @@ -5321,5 +5333,6 @@ if (pCtl->BmDma.u8Cmd & BM_CMD_START) { - Log2(("%s: Ctl#%d: message to async I/O thread, continuing DMA transfer immediately\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl))); + Log2(("%s: Ctl#%d: message to async I/O thread, continuing DMA transfer immediately\n", + __FUNCTION__, ATACONTROLLER_IDX(pCtl))); ataHCAsyncIOPutRequest(pCtl, &g_ataDMARequest); } @@ -5571,5 +5584,6 @@ u64TS = RTTimeNanoTS() - u64TS; uWait = u64TS / 1000; - Log(("%s: Ctl#%d: LUN#%d finished I/O transaction in %d microseconds\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), pCtl->aIfs[pCtl->iAIOIf].iLUN, (uint32_t)(uWait))); + Log(("%s: Ctl#%d: LUN#%d finished I/O transaction in %d microseconds\n", + __FUNCTION__, ATACONTROLLER_IDX(pCtl), pCtl->aIfs[pCtl->iAIOIf].iLUN, (uint32_t)(uWait))); /* Mark command as finished. */ pCtl->aIfs[pCtl->iAIOIf].u64CmdTS = 0; @@ -5590,5 +5604,6 @@ * timing errors (which are often caused by the host). */ - LogRel(("PIIX3 ATA: execution time for ATA command %#04x was %d seconds\n", pCtl->aIfs[pCtl->iAIOIf].uATARegCommand, uWait / (1000 * 1000))); + LogRel(("PIIX3 ATA: execution time for ATA command %#04x was %d seconds\n", + pCtl->aIfs[pCtl->iAIOIf].uATARegCommand, uWait / (1000 * 1000))); } } @@ -5603,5 +5618,6 @@ * timing errors (which are often caused by the host). */ - LogRel(("PIIX3 ATA: execution time for ATAPI command %#04x was %d seconds\n", pCtl->aIfs[pCtl->iAIOIf].aATAPICmd[0], uWait / (1000 * 1000))); + LogRel(("PIIX3 ATA: execution time for ATAPI command %#04x was %d seconds\n", + pCtl->aIfs[pCtl->iAIOIf].aATAPICmd[0], uWait / (1000 * 1000))); } } @@ -6202,5 +6218,6 @@ pIf->PCHSGeometry.cHeads = 0; /* dummy */ pIf->PCHSGeometry.cSectors = 0; /* dummy */ - LogRel(("PIIX3 ATA: LUN#%d: CD/DVD, total number of sectors %Ld, passthrough %s\n", pIf->iLUN, pIf->cTotalSectors, (pIf->fATAPIPassthrough ? "enabled" : "disabled"))); + LogRel(("PIIX3 ATA: LUN#%d: CD/DVD, total number of sectors %Ld, passthrough %s\n", + pIf->iLUN, pIf->cTotalSectors, (pIf->fATAPIPassthrough ? "enabled" : "disabled"))); } else @@ -6234,5 +6251,7 @@ rc = VINF_SUCCESS; } - LogRel(("PIIX3 ATA: LUN#%d: disk, PCHS=%u/%u/%u, total number of sectors %Ld\n", pIf->iLUN, pIf->PCHSGeometry.cCylinders, pIf->PCHSGeometry.cHeads, pIf->PCHSGeometry.cSectors, pIf->cTotalSectors)); + LogRel(("PIIX3 ATA: LUN#%d: disk, PCHS=%u/%u/%u, total number of sectors %Ld\n", + pIf->iLUN, pIf->PCHSGeometry.cCylinders, pIf->PCHSGeometry.cHeads, pIf->PCHSGeometry.cSectors, + pIf->cTotalSectors)); if (pIf->pDrvMedia->pfnDiscard)