Revision 038c1879

b/hw/qxl.c
80 80

  
81 81
#define QXL_MODE_EX(x_res, y_res)                 \
82 82
    QXL_MODE_16_32(x_res, y_res, 0),              \
83
    QXL_MODE_16_32(y_res, x_res, 1),              \
84
    QXL_MODE_16_32(x_res, y_res, 2),              \
85
    QXL_MODE_16_32(y_res, x_res, 3)
83
    QXL_MODE_16_32(x_res, y_res, 1)
86 84

  
87 85
static QXLMode qxl_modes[] = {
88 86
    QXL_MODE_EX(640, 480),
......
306 304

  
307 305
static ram_addr_t qxl_rom_size(void)
308 306
{
309
    uint32_t rom_size = sizeof(QXLRom) + sizeof(QXLModes) + sizeof(qxl_modes);
307
    uint32_t required_rom_size = sizeof(QXLRom) + sizeof(QXLModes) +
308
                                 sizeof(qxl_modes);
309
    uint32_t rom_size = 8192; /* two pages */
310 310

  
311
    rom_size = MAX(rom_size, TARGET_PAGE_SIZE);
312
    rom_size = msb_mask(rom_size * 2 - 1);
311
    required_rom_size = MAX(required_rom_size, TARGET_PAGE_SIZE);
312
    required_rom_size = msb_mask(required_rom_size * 2 - 1);
313
    assert(required_rom_size <= rom_size);
313 314
    return rom_size;
314 315
}
315 316

  

Also available in: Unified diff