]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
xenfb: use the correct condition to avoid excessive looping
authorWei Liu <wei.liu2@citrix.com>
Tue, 12 Apr 2016 10:43:14 +0000 (11:43 +0100)
committerAnthony PERARD <anthony.perard@citrix.com>
Mon, 25 Apr 2016 10:14:08 +0000 (11:14 +0100)
In commit ac0487e1 ("xenfb.c: avoid expensive loops when prod <=
out_cons"), ">=" was used. In fact, a full ring is a legit state.
Correct the test to use ">".

upstream-commit-id: 4df26e88ee2f23c01418630368e87b719ed06b75

Reported-by: "Hao, Xudong" <xudong.hao@intel.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Tested-by: "Hao, Xudong" <xudong.hao@intel.com>
Acked-by: Anthony Perard <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
hw/display/xenfb.c

index 56d1a365117f46baf56bd7dd58201e1147a5dda6..4cde110bfa983142a2d6c9978c6b7c479843aada 100644 (file)
@@ -784,7 +784,7 @@ static void xenfb_handle_events(struct XenFB *xenfb)
 
     prod = page->out_prod;
     out_cons = page->out_cons;
-    if (prod - out_cons >= XENFB_OUT_RING_LEN) {
+    if (prod - out_cons > XENFB_OUT_RING_LEN) {
         return;
     }
     xen_rmb();         /* ensure we see ring contents up to prod */