[Spice-devel] [PATCH xf86-qxl 06/27] qxl_driver: move mspace_set_*_func earlier

[Marc-André Lureau]

From: Alon Levy <alevy at redhat.com>

---
 src/qxl_driver.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 90619e6..3cf3137 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -503,8 +503,7 @@ qxl_map_memory(qxl_screen_t *qxl, int scrnIndex)
 			       qxl->rom->num_pages * getpagesize() - qxl->surface0_size);
     qxl->surf_mem = qxl_mem_create ((void *)((unsigned long)qxl->vram), qxl->vram_size);
 
-    mspace_set_abort_func(qxl_mspace_abort_func);
-    mspace_set_print_func(qxl_mspace_print_func);
+    qxl_allocate_monitors_config(qxl);
 
     return TRUE;
 }
@@ -1484,6 +1483,9 @@ qxl_pre_init(ScrnInfoPtr pScrn, int flags)
     
     CHECK_POINT();
 
+    mspace_set_abort_func(qxl_mspace_abort_func);
+    mspace_set_print_func(qxl_mspace_print_func);
+
     /* zaphod mode is for suckers and i choose not to implement it */
     if (xf86IsEntityShared(pScrn->entityList[0])) {
 	xf86DrvMsg(scrnIndex, X_ERROR, "No Zaphod mode for you\n");
-- 
1.7.10.4