From patchwork Fri Jun 24 16:56:38 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [02/13] Align dummy display to fixed-size active console
Date: Fri, 24 Jun 2011 06:56:38 -0000
From: Stefan Hajnoczi <stefanha@gmail.com>
X-Patchwork-Id: 101833
Message-Id: <1308934609-20824-3-git-send-email-stefanha@linux.vnet.ibm.com>
To: <qemu-devel@nongnu.org>
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
 Anthony Liguori <aliguori@us.ibm.com>, 
 Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

This fixes e.g. '-vga none -monitor vc:120Cx50C'.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

---
console.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/console.c b/console.c
index 9c6addf..acd8ca1 100644
--- a/console.c
+++ b/console.c
@@ -1349,8 +1349,15 @@ static struct DisplayAllocator default_allocator = {
 static void dumb_display_init(void)
 {
     DisplayState *ds = qemu_mallocz(sizeof(DisplayState));
+    int width = 640;
+    int height = 480;
+
     ds->allocator = &default_allocator;
-    ds->surface = qemu_create_displaysurface(ds, 640, 480);
+    if (is_fixedsize_console()) {
+        width = active_console->g_width;
+        height = active_console->g_height;
+    }
+    ds->surface = qemu_create_displaysurface(ds, width, height);
     register_displaystate(ds);
 }