xserver: Branch 'master'

[Adam Jackson]

 hw/xwayland/xwayland.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9fcb554e9bfdf3eed2c2250d89150e3e7b907f01
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Jul 8 15:17:05 2016 -0400

    xwayland: Only force monotonic clock once
    
    Otherwise on regeneration we get:
    
    (EE) BUG: triggered 'if (clockid)'
    (EE) BUG: utils.c:440 in ForceClockId()
    (EE)
    (EE) Backtrace:
    (EE) 0: ./hw/xwayland/Xwayland (ForceClockId+0x5c) [0x47713c]
    (EE) 1: ./hw/xwayland/Xwayland (OsInit+0x25) [0x4763d5]
    (EE) 2: ./hw/xwayland/Xwayland (dix_main+0x11c) [0x43e60c]
    (EE) 3: /lib64/libc.so.6 (__libc_start_main+0xf1) [0x7f627b2f9731]
    (EE) 4: ./hw/xwayland/Xwayland (_start+0x29) [0x4238e9]
    (EE) 5: ? (?+0x29) [0x29]
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 8c49b0b..6daf385 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -53,7 +53,8 @@ AbortDDX(enum ExitCode error)
 void
 OsVendorInit(void)
 {
-    ForceClockId(CLOCK_MONOTONIC);
+    if (serverGeneration == 1)
+        ForceClockId(CLOCK_MONOTONIC);
 }
 
 void