Revision af92284b hw/vga.c

b/hw/vga.c
522 522
    VGACommonState *s = opaque;
523 523
    uint32_t val;
524 524

  
525
    if (s->vbe_index <= VBE_DISPI_INDEX_NB) {
525
    if (s->vbe_index < VBE_DISPI_INDEX_NB) {
526 526
        if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_GETCAPS) {
527 527
            switch(s->vbe_index) {
528 528
                /* XXX: do not hardcode ? */
......
542 542
        } else {
543 543
            val = s->vbe_regs[s->vbe_index];
544 544
        }
545
    } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) {
546
        val = s->vram_size / (64 * 1024);
545 547
    } else {
546 548
        val = 0;
547 549
    }
......
1955 1957
#ifdef CONFIG_BOCHS_VBE
1956 1958
    s->vbe_index = 0;
1957 1959
    memset(s->vbe_regs, '\0', sizeof(s->vbe_regs));
1958
    s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0;
1960
    s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID5;
1959 1961
    s->vbe_start_addr = 0;
1960 1962
    s->vbe_line_offset = 0;
1961 1963
    s->vbe_bank_mask = (s->vram_size >> 16) - 1;

Also available in: Unified diff