Commit 9e56edcf authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

vga: raise default vgamem size 



Old size: 8 MB (traditional upstream qemu value).
New size: 16 MB (traditional qemu-kvm value).

Also adds compat properties so old machine types
keep the old default values.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f1dacf1c

hw/pc_piix.c

+24 −0
Original line number Diff line number Diff line
@@ -358,14 +358,38 @@ static QEMUMachine pc_machine_v1_2 = { 
    .is_default = 1,

};



#define PC_COMPAT_1_1 \

        {\

            .driver   = "VGA",\

            .property = "vgamem_mb",\

            .value    = stringify(8),\

        },{\

            .driver   = "vmware-svga",\

            .property = "vgamem_mb",\

            .value    = stringify(8),\

        },{\

            .driver   = "qxl-vga",\

            .property = "vgamem_mb",\

            .value    = stringify(8),\

        },{\

            .driver   = "qxl",\

            .property = "vgamem_mb",\

            .value    = stringify(8),\

        }



static QEMUMachine pc_machine_v1_1 = {

    .name = "pc-1.1",

    .desc = "Standard PC",

    .init = pc_init_pci,

    .max_cpus = 255,

    .compat_props = (GlobalProperty[]) {

        PC_COMPAT_1_1,

        { /* end of list */ }

    },

};



#define PC_COMPAT_1_0 \

        PC_COMPAT_1_1,\

        {\

            .driver   = "pc-sysfw",\

            .property = "rom_only",\

hw/qxl.c

+1 −1
Original line number Diff line number Diff line
@@ -2067,7 +2067,7 @@ static Property qxl_properties[] = { 
        DEFINE_PROP_UINT32("ram_size_mb",  PCIQXLDevice, ram_size_mb, -1),

        DEFINE_PROP_UINT32("vram_size_mb", PCIQXLDevice, vram32_size_mb, -1),

        DEFINE_PROP_UINT32("vram64_size_mb", PCIQXLDevice, vram_size_mb, -1),

        DEFINE_PROP_UINT32("vgamem_mb", PCIQXLDevice, vgamem_size_mb, 8),

        DEFINE_PROP_UINT32("vgamem_mb", PCIQXLDevice, vgamem_size_mb, 16),

        DEFINE_PROP_END_OF_LIST(),

};

hw/vga-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ DeviceState *pci_vga_init(PCIBus *bus) 
}



static Property vga_pci_properties[] = {

    DEFINE_PROP_UINT32("vgamem_mb", PCIVGAState, vga.vram_size_mb, 8),

    DEFINE_PROP_UINT32("vgamem_mb", PCIVGAState, vga.vram_size_mb, 16),

    DEFINE_PROP_END_OF_LIST(),

};

hw/vmware_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ static int pci_vmsvga_initfn(PCIDevice *dev) 


static Property vga_vmware_properties[] = {

    DEFINE_PROP_UINT32("vgamem_mb", struct pci_vmsvga_state_s,

                       chip.vga.vram_size_mb, 8),

                       chip.vga.vram_size_mb, 16),

    DEFINE_PROP_END_OF_LIST(),

};