From b006591136695fcf2ed055e0545d58e8b38c99f3 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 5 Jul 2016 13:00:42 -0400
Subject: [PATCH xserver] xephyr: Don't crash if the server advertises zero xv
 adaptors

Useless as an XVideo implementation with zero adaptors might be, it's
apparently a thing in the wild. Catch this case and bail out of xv init
if it happens.

[ajax: This probably isn't the exact commit that's going upstream, as the
bug is really "no XVideo at all" not "no adaptors", but that's just about
the commit message not the code.]

Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 hw/kdrive/ephyr/ephyrvideo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c
index 56a5ff1..31b1eee 100644
--- a/hw/kdrive/ephyr/ephyrvideo.c
+++ b/hw/kdrive/ephyr/ephyrvideo.c
@@ -462,7 +462,7 @@ ephyrXVPrivQueryHostAdaptors(EphyrXVPriv * a_this)
 
     if (a_this->host_adaptors)
         a_this->num_adaptors = a_this->host_adaptors->num_adaptors;
-    if (a_this->num_adaptors < 0) {
+    if (a_this->num_adaptors <= 0) {
         EPHYR_LOG_ERROR("failed to get number of host adaptors\n");
         goto out;
     }
-- 
2.7.4