xserver: Branch 'master'

[Adam Jackson]

 hw/kdrive/ephyr/ephyrvideo.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 14d2fe74f4e51c5b37eab4b7475c804a0340b530
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Apr 7 10:24:54 2017 -0400

    xephyr: Check for host XVideo support before trying to use it
    
    Otherwise xcb will treat our attempt to send xv requests as a connection
    error (quite reasonably: we're asking it to emit a request for which
    there is no defined major opcode), and we'll die quietly the first time
    we hit KdBlockhandler.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c
index 9c9c78d11..671a0ddce 100644
--- a/hw/kdrive/ephyr/ephyrvideo.c
+++ b/hw/kdrive/ephyr/ephyrvideo.c
@@ -226,6 +226,11 @@ ephyrInitVideo(ScreenPtr pScreen)
         return FALSE;
     }
 
+    if (!hostx_has_extension(&xcb_xv_id)) {
+        EPHYR_LOG_ERROR("Host has no XVideo extension\n");
+        return FALSE;
+    }
+
     if (!xv_priv) {
         xv_priv = ephyrXVPrivNew();
     }