[Spice-devel] [PATCH xf86-video-qxl v2 02/11] qxl_driver: fix build for Xspice

Alon Levy alevy at redhat.com
Sun Sep 8 05:11:44 PDT 2013


Signed-off-by: Alon Levy <alevy at redhat.com>
---
 src/qxl_driver.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index ac5408e..731a71a 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -1214,10 +1214,14 @@ qxl_init_scrn (ScrnInfoPtr pScrn, Bool kms)
     pScrn->name             = driver_name;
 
     if (kms) {
+#ifndef XSPICE
 	pScrn->PreInit          = qxl_pre_init_kms;
 	pScrn->ScreenInit       = qxl_screen_init_kms;
 	pScrn->EnterVT          = qxl_enter_vt_kms;
 	pScrn->LeaveVT          = qxl_leave_vt_kms;
+#else
+        abort();
+#endif
     } else {
 	pScrn->PreInit          = qxl_pre_init;
 	pScrn->ScreenInit       = qxl_screen_init;
@@ -1228,7 +1232,7 @@ qxl_init_scrn (ScrnInfoPtr pScrn, Bool kms)
     pScrn->ValidMode        = NULL;
 }
 
-#ifdef XF86DRM_MODE
+#if defined(XF86DRM_MODE) && !defined(XSPICE)
 static char *
 CreatePCIBusID(const struct pci_device *dev)
 {
-- 
1.8.3.1



More information about the Spice-devel mailing list