From: Anthony PERARD <anthony.perard@citrix.com>
Date: Mon, 17 Jun 2013 16:38:26 +0000 (+0100)
Subject: qxl: Fix QXLRam initialisation.
X-Git-Tag: v1.5.3~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a678b16bb3967dcee88e30aa2e345dcaca3fb7a7;p=thirdparty%2Fqemu.git

qxl: Fix QXLRam initialisation.

The qxl driver expect NULL for QXLRam.memory_configs, but this is never
initialized.

If memory is set to 0xc2c2.., it leads to a spice-critical error when
trying to start qxl.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 329f97fc4ff4b533fcd2d8f4eab6c9c2568aed27)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index c475cb10dc2..937a402b2ef 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -387,6 +387,7 @@ static void init_qxl_ram(PCIQXLDevice *d)
     d->ram->int_pending = cpu_to_le32(0);
     d->ram->int_mask    = cpu_to_le32(0);
     d->ram->update_surface = 0;
+    d->ram->monitors_config = 0;
     SPICE_RING_INIT(&d->ram->cmd_ring);
     SPICE_RING_INIT(&d->ram->cursor_ring);
     SPICE_RING_INIT(&d->ram->release_ring);