From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si07O-0006pK-RS for qemu-devel@nongnu.org; Fri, 22 Jun 2012 05:25:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Si07I-00072W-Je for qemu-devel@nongnu.org; Fri, 22 Jun 2012 05:25:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si07I-00071D-CG for qemu-devel@nongnu.org; Fri, 22 Jun 2012 05:25:24 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5M9PNGQ023651 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Jun 2012 05:25:23 -0400 From: Gerd Hoffmann Date: Fri, 22 Jun 2012 11:25:18 +0200 Message-Id: <1340357118-17562-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1340357118-17562-1-git-send-email-kraxel@redhat.com> References: <1340357118-17562-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/10] vga: raise default vgamem size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- hw/pc_piix.c | 24 ++++++++++++++++++++++++ hw/qxl.c | 2 +- hw/vga-pci.c | 2 +- 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 2ed9f1a..0c0096f 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",\ diff --git a/hw/qxl.c b/hw/qxl.c index 62eed05..c2dd3b4 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -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 0848126..37dc019 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 f8eb46d..476dc89 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(), }; -- 1.7.1