VirtualBox

Changeset 52885 in vbox for trunk/src/VBox/Devices/Graphics


Ignore:
Timestamp:
Sep 29, 2014 11:35:52 AM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
96311
Message:

DevVGA: Careful when dumping state.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Graphics/DevVGA.cpp

    r52504 r52885  
    21412141    uint8_t *src  = s->CTX_SUFF(vram_ptr) + offsetSource;
    21422142
    2143     for(unsigned y = yStart; y < yStart + height; y++) 
     2143    for(unsigned y = yStart; y < yStart + height; y++)
    21442144    {
    21452145        vga_draw_line(s, dest, src, width);
     
    22152215    linesize = pDrv->cbScanline;
    22162216
    2217     for(y = 0; y < height; y++) 
     2217    for(y = 0; y < height; y++)
    22182218    {
    22192219        addr = addr1 + y * bwidth;
     
    41174117        pHlp->pfnPrintf(pHlp, "cclks per frame: %d\n", r->frame_cclks);
    41184118        pHlp->pfnPrintf(pHlp, "cclk time (ns) : %d\n", r->cclk_ns);
    4119         vfreq_hz = 1000000000 / r->frame_ns;
    4120         hfreq_hz = 1000000000 / r->h_total_ns;
    4121         pHlp->pfnPrintf(pHlp, "vfreq: %d Hz, hfreq: %d.%03d kHz\n",
    4122                         vfreq_hz, hfreq_hz / 1000, hfreq_hz % 1000);
     4119        if (r->frame_ns && r->h_total_ns)   /* Careful in case state is temporarily invalid. */
     4120        {
     4121            vfreq_hz = 1000000000 / r->frame_ns;
     4122            hfreq_hz = 1000000000 / r->h_total_ns;
     4123            pHlp->pfnPrintf(pHlp, "vfreq: %d Hz, hfreq: %d.%03d kHz\n",
     4124                            vfreq_hz, hfreq_hz / 1000, hfreq_hz % 1000);
     4125        }
    41234126    }
    41244127    pHlp->pfnPrintf(pHlp, "display refresh interval: %u ms\n", pThis->cMilliesRefreshInterval);
     
    53285331    LogFlow(("vgaR3IORegionMap: iRegion=%d GCPhysAddress=%RGp cb=%#x enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
    53295332#ifdef VBOX_WITH_VMSVGA
    5330     AssertReturn((iRegion == ((pThis->fVMSVGAEnabled) ? 1 : 0)) && (enmType == ((pThis->fVMSVGAEnabled) ? PCI_ADDRESS_SPACE_MEM : PCI_ADDRESS_SPACE_MEM_PREFETCH)), VERR_INTERNAL_ERROR);   
     5333    AssertReturn((iRegion == ((pThis->fVMSVGAEnabled) ? 1 : 0)) && (enmType == ((pThis->fVMSVGAEnabled) ? PCI_ADDRESS_SPACE_MEM : PCI_ADDRESS_SPACE_MEM_PREFETCH)), VERR_INTERNAL_ERROR);
    53315334#else
    53325335    AssertReturn(iRegion == 0 && enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette