xserver: Branch 'master'

[Adam Jackson]

 hw/kdrive/ephyr/hostx.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 343ee7d07565a75b90e6489c5c29f772dca79c43
Author: Alexander Volkov <a.volkov at rusbitech.ru>
Date:   Tue Feb 20 18:07:18 2018 +0300

    Xephyr: Avoid calling xcb_shm_detach() twice
    
    This call was forgotten to be removed in
    90996f5909aab4bc9aa4011a6a6d0555a7aa3adf in which
    hostx_destroy_shm_segment() was introduced, which
    itself does it.
    
    Signed-off-by: Alexander Volkov <a.volkov at rusbitech.ru>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 8a69ec1e0..c2f94ed04 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -891,7 +891,6 @@ hostx_screen_init(KdScreenInfo *screen,
          */
 
         if (HostX.have_shm) {
-            xcb_shm_detach(HostX.conn, scrpriv->shminfo.shmseg);
             xcb_image_destroy(scrpriv->ximg);
             hostx_destroy_shm_segment(&scrpriv->shminfo, scrpriv->shmsize);
         }