From eff66c7db18e9a3ef0b6ce5deb9a49b61090d809 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Fri, 17 Feb 2012 15:03:24 +0100

Subject: [PATCH 411/434] qxl: add user-friendly bar size properties

Add two properties to specify bar sizes in megabytes instead of bytes,

which is alot more user-friendly.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 hw/qxl.c |    8 ++++++++

 hw/qxl.h |    4 ++++

 2 files changed, 12 insertions(+)

diff --git a/hw/qxl.c b/hw/qxl.c

index df8efbc..c8839c3 100644

--- a/hw/qxl.c

+++ b/hw/qxl.c

@@ -1560,11 +1560,17 @@ static DisplayChangeListener display_listener = {

 static void qxl_init_ramsize(PCIQXLDevice *qxl, uint32_t ram_min_mb)

 {

     /* vga ram (bar 0) */

+    if (qxl->ram_size_mb != -1) {

+        qxl->vga.vram_size = qxl->ram_size_mb * 1024 * 1024;

+    }

     if (qxl->vga.vram_size < ram_min_mb * 1024 * 1024) {

         qxl->vga.vram_size = ram_min_mb * 1024 * 1024;

     }

     /* vram (surfaces, bar 1) */

+    if (qxl->vram_size_mb != -1) {

+        qxl->vram_size = qxl->vram_size_mb * 1024 * 1024;

+    }

     if (qxl->vram_size < 4096) {

         qxl->vram_size = 4096;

     }

@@ -1863,6 +1869,8 @@ static Property qxl_properties[] = {

         DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),

         DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),

         DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),

+        DEFINE_PROP_UINT32("ram_size_mb",  PCIQXLDevice, ram_size_mb, -1),

+        DEFINE_PROP_UINT32("vram_size_mb", PCIQXLDevice, vram_size_mb, -1),

         DEFINE_PROP_END_OF_LIST(),

 };

diff --git a/hw/qxl.h b/hw/qxl.h

index 766aa6d..d062991 100644

--- a/hw/qxl.h

+++ b/hw/qxl.h

@@ -89,6 +89,10 @@ typedef struct PCIQXLDevice {

     /* io bar */

     MemoryRegion       io_bar;

+

+    /* user-friendly properties (in megabytes) */

+    uint32_t          ram_size_mb;

+    uint32_t          vram_size_mb;

 } PCIQXLDevice;

 #define PANIC_ON(x) if ((x)) {                         \

-- 

1.7.10