[Spice-devel] [spice-protocol PATCH 05/46] qxl: add qxlhw reference to qxl_screen_t, initialized in qxl_pre_init

[Alon Levy]

---
 src/qxl.h        |    2 ++
 src/qxl_driver.c |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/qxl.h b/src/qxl.h
index 9b3459c..f3f1446 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -69,6 +69,7 @@
 #define PCI_CHIP_QXL_01FF	0x01ff
 
 struct qxl_ring;
+struct qxlhw;
 
 typedef struct surface_cache_t surface_cache_t;
 
@@ -123,6 +124,7 @@ enum {
 
 struct _qxl_screen_t
 {
+    struct qxlhw *              hw;
     /* These are the names QXL uses */
     void *			ram;	/* Command RAM */
     void *			ram_physical;
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 99c5c6f..0791821 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -43,6 +43,7 @@
 #include "qxl_ring.h"
 #include "qxl_mem.h"
 #include "assert.h"
+#include "qxlhw.h"
 #include "qxl_option_helpers.h"
 
 #ifdef XSPICE
@@ -1435,6 +1436,7 @@ qxl_pre_init(ScrnInfoPtr pScrn, int flags)
     if (!pScrn->driverPrivate)
 	pScrn->driverPrivate = xnfcalloc(sizeof(qxl_screen_t), 1);
     qxl = pScrn->driverPrivate;
+    qxl->hw = qxlhw_create(qxl, pScrn);
 
     qxl->entity = xf86GetEntityInfo(pScrn->entityList[0]);
     
-- 
1.7.9.3