Marcelo Tosatti writes:
> Allow RAM size to be configurable for cirrus, to allow migration
> compatibility from qemu-kvm.
>
> Signed-off-by: Marcelo Tosatti
Reviewed-by: Anthony Liguori
Regards,
Anthony Liguori
>
> Index: qemu-compat-kvm/hw/cirrus_vga.c
> ===
> --- qemu-compat-kvm.orig/hw/cirrus_vga.c
> +++ qemu-compat-kvm/hw/cirrus_vga.c
> @@ -43,8 +43,6 @@
> //#define DEBUG_CIRRUS
> //#define DEBUG_BITBLT
>
> -#define VGA_RAM_SIZE (8192 * 1024)
> -
> /***
> *
> * definitions
> @@ -2853,7 +2851,8 @@ static void cirrus_init_common(CirrusVGA
>
> /* I/O handler for LFB */
> memory_region_init_io(&s->cirrus_linear_io, &cirrus_linear_io_ops, s,
> - "cirrus-linear-io", VGA_RAM_SIZE);
> + "cirrus-linear-io", s->vga.vram_size_mb
> + * 1024 * 1024);
>
> /* I/O handler for LFB */
> memory_region_init_io(&s->cirrus_linear_bitblt_io,
> @@ -2893,7 +2892,6 @@ static int vga_initfn(ISADevice *dev)
> ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev);
> VGACommonState *s = &d->cirrus_vga.vga;
>
> -s->vram_size_mb = VGA_RAM_SIZE >> 20;
> vga_common_init(s);
> cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0,
> isa_address_space(dev));
> @@ -2906,6 +2904,12 @@ static int vga_initfn(ISADevice *dev)
> return 0;
> }
>
> +static Property isa_vga_cirrus_properties[] = {
> +DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,
> + cirrus_vga.vga.vram_size_mb, 8),
> +DEFINE_PROP_END_OF_LIST(),
> +};
> +
> static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
> {
> ISADeviceClass *k = ISA_DEVICE_CLASS(klass);
> @@ -2913,6 +2917,7 @@ static void isa_cirrus_vga_class_init(Ob
>
> dc->vmsd = &vmstate_cirrus_vga;
> k->init = vga_initfn;
> +dc->props = isa_vga_cirrus_properties;
> }
>
> static TypeInfo isa_cirrus_vga_info = {
> @@ -2936,7 +2941,6 @@ static int pci_cirrus_vga_initfn(PCIDevi
> int16_t device_id = pc->device_id;
>
> /* setup VGA */
> - s->vga.vram_size_mb = VGA_RAM_SIZE >> 20;
> vga_common_init(&s->vga);
> cirrus_init_common(s, device_id, 1, pci_address_space(dev));
> s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
> @@ -2968,6 +2972,12 @@ DeviceState *pci_cirrus_vga_init(PCIBus
> return &pci_create_simple(bus, -1, "cirrus-vga")->qdev;
> }
>
> +static Property pci_vga_cirrus_properties[] = {
> +DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,
> + cirrus_vga.vga.vram_size_mb, 8),
> +DEFINE_PROP_END_OF_LIST(),
> +};
> +
> static void cirrus_vga_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -2981,6 +2991,7 @@ static void cirrus_vga_class_init(Object
> k->class_id = PCI_CLASS_DISPLAY_VGA;
> dc->desc = "Cirrus CLGD 54xx VGA";
> dc->vmsd = &vmstate_pci_cirrus_vga;
> +dc->props = pci_vga_cirrus_properties;
> }
>
> static TypeInfo cirrus_vga_info = {
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
