From patchwork Fri Oct 5 17:13:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 189538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 16AA32C0098 for ; Sat, 6 Oct 2012 03:23:26 +1000 (EST) Received: from localhost ([::1]:54997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBVU-00060p-7k for incoming@patchwork.ozlabs.org; Fri, 05 Oct 2012 13:16:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBV2-0005Am-Cm for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKBUy-0001D3-Tu for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBUy-0001CX-Le for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:40 -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 q95HFeHh030638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Oct 2012 13:15:40 -0400 Received: from amt.cnet (vpn1-7-183.gru2.redhat.com [10.97.7.183]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q95HFdtP005989; Fri, 5 Oct 2012 13:15:39 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 27FC268A30F; Fri, 5 Oct 2012 14:15:24 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q95HFNh6010803; Fri, 5 Oct 2012 14:15:23 -0300 Message-Id: <20121005171442.197414973@amt.cnet> User-Agent: quilt/0.48-1 Date: Fri, 05 Oct 2012 14:13:39 -0300 From: Marcelo Tosatti To: qemu-devel@nongnu.org References: <20121005171338.092840368@amt.cnet> Content-Disposition: inline; filename=01_cirrus-add-configurable-memsize X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Marcelo Tosatti , Jan Kiszka , Gerd Hoffmann Subject: [Qemu-devel] [patch 1/7] cirrus_vga: allow configurable vram size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allow RAM size to be configurable for cirrus, to allow migration compatibility from qemu-kvm. Signed-off-by: Marcelo Tosatti 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 = {