diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-20 16:16:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-20 16:16:55 +0100 |
| commit | fa59dd95829bc33d591274e98db5bb762ba1a2a0 (patch) | |
| tree | 14bbbd1d70172c7134942c01d20162bff8f14350 | |
| parent | 4113b0532da6c448f8e458b413ebde035234d0ea (diff) | |
| parent | 4df26e88ee2f23c01418630368e87b719ed06b75 (diff) | |
| download | qemu-fa59dd95829bc33d591274e98db5bb762ba1a2a0.zip qemu-fa59dd95829bc33d591274e98db5bb762ba1a2a0.tar.gz qemu-fa59dd95829bc33d591274e98db5bb762ba1a2a0.tar.bz2 | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2016-04-20' into staging
Xen 2016/04/20
# gpg: Signature made Wed 20 Apr 2016 12:08:56 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-2016-04-20:
xenfb: use the correct condition to avoid excessive looping
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/xenfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 40b096a..9866dfd 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -775,7 +775,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 */ |