[Qemu-devel] [PULL for-2.6 0/1] tags/xen-2016-04-20

[Qemu-devel] [PULL for-2.6 0/1] tags/xen-2016-04-20

[Stefano Stabellini]

The following changes since commit 42bb626f7ebc9197d2943b897a99e127315275ab:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2016-04-12 09:34:52 +0100)

are available in the git repository at:


  git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-2016-04-20

for you to fetch changes up to 4df26e88ee2f23c01418630368e87b719ed06b75:

  xenfb: use the correct condition to avoid excessive looping (2016-04-12 10:16:08 -0700)

----------------------------------------------------------------
Xen 2016/04/20

----------------------------------------------------------------
Wei Liu (1):
      xenfb: use the correct condition to avoid excessive looping

 hw/display/xenfb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL for-2.6 1/1] xenfb: use the correct condition to avoid excessive looping

[Stefano Stabellini]

From: Wei Liu <wei.liu2@citrix.com>

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 ">".

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 */
-- 
1.9.1

Re: [Qemu-devel] [PULL for-2.6 0/1] tags/xen-2016-04-20

[Peter Maydell]

On 20 April 2016 at 12:14, Stefano Stabellini <sstabellini@kernel.org> wrote:
> The following changes since commit 42bb626f7ebc9197d2943b897a99e127315275ab:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2016-04-12 09:34:52 +0100)
>
> are available in the git repository at:
>
>
>   git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-2016-04-20
>
> for you to fetch changes up to 4df26e88ee2f23c01418630368e87b719ed06b75:
>
>   xenfb: use the correct condition to avoid excessive looping (2016-04-12 10:16:08 -0700)
>
> ----------------------------------------------------------------
> Xen 2016/04/20
>
> ----------------------------------------------------------------
> Wei Liu (1):
>       xenfb: use the correct condition to avoid excessive looping
>
>  hw/display/xenfb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- PMM