diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-06-11 10:42:53 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-06-22 10:49:55 +0200 |
| commit | 9e56edcf8dd1d4bc7ba2b1efb3641f36c0fad8ba (patch) | |
| tree | 3b7a66efbae10c35248a9cead7925688f4c2851c /hw | |
| parent | f1dacf1cedbf0f46c13139f3961ef8a976dc71e3 (diff) | |
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: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pc_piix.c | 24 | ||||
| -rw-r--r-- | hw/qxl.c | 2 | ||||
| -rw-r--r-- | hw/vga-pci.c | 2 | ||||
| -rw-r--r-- | hw/vmware_vga.c | 2 |
4 files changed, 27 insertions, 3 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 2ed9f1afff..0c0096fd7e 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -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",\ @@ -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(), }; diff --git a/hw/vga-pci.c b/hw/vga-pci.c index 0848126555..37dc019a61 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c @@ -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(), }; diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index f8eb46d0c1..476dc89a0c 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -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(), }; |