Commit 73c14813 authored Mar 14, 2017 by Gerd Hoffmann

cirrus: switch to 4 MB video memory by default



Quoting cirrus source code:
   Follow real hardware, cirrus card emulated has 4 MB video memory.
   Also accept 8 MB/16 MB for backward compatibility.

So just use 4MB by default.  We decided to leave that at 8MB by default
a while ago, for live migration compatibility reasons.  But we have
compat properties to handle that, so that isn't a compeling reason.

This also removes some sanity check inconsistencies in the cirrus code.
Some places check against the allocated video memory, some places check
against the 4MB physical hardware has.  Guest code can trigger asserts
because of that.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1489494514-15606-1-git-send-email-kraxel@redhat.com

parent 50628d34

hw/display/cirrus_vga.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3023,7 +3023,7 @@ static void isa_cirrus_vga_realizefn(DeviceState dev, Error *errp)

		static Property isa_cirrus_vga_properties[] = {
		DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,
		cirrus_vga.vga.vram_size_mb, 8),
		cirrus_vga.vga.vram_size_mb, 4),
		DEFINE_PROP_END_OF_LIST(),
		};

		@@ -3092,7 +3092,7 @@ static void pci_cirrus_vga_realize(PCIDevice dev, Error *errp)

		static Property pci_vga_cirrus_properties[] = {
		DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,
		cirrus_vga.vga.vram_size_mb, 8),
		cirrus_vga.vga.vram_size_mb, 4),
		DEFINE_PROP_END_OF_LIST(),
		};

include/hw/compat.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,14 @@
		.driver = "pci-bridge",\
		.property = "shpc",\
		.value = "on",\
		},{\
		.driver = "cirrus-vga",\
		.property = "vgamem_mb",\
		.value = "8",\
		},{\
		.driver = "isa-cirrus-vga",\
		.property = "vgamem_mb",\
		.value = "8",\
		},

		#define HW_COMPAT_2_7 \