qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PULL for-2.0 0/1] Net patches
@ 2014-03-25 16:34 Stefan Hajnoczi
  2014-03-25 16:34 ` [Qemu-devel] [PULL for-2.0 1/1] net: netmap_poll must update both read/write poll state Stefan Hajnoczi
  2014-03-25 18:33 ` [Qemu-devel] [PULL for-2.0 0/1] Net patches Peter Maydell
  0 siblings, 2 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2014-03-25 16:34 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi, Anthony Liguori

The following changes since commit 839a5547574e57cce62f49bfc50fe1f04b00589a:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140324' into staging (2014-03-24 19:25:09 +0000)

are available in the git repository at:


  git://github.com/stefanha/qemu.git tags/net-pull-request

for you to fetch changes up to 131e744a15c54f0bad3d3925eeca1acf47996e06:

  net: netmap_poll must update both read/write poll state (2014-03-25 13:31:38 +0100)

----------------------------------------------------------------
Net patches

----------------------------------------------------------------
Prasad Joshi (1):
      net: netmap_poll must update both read/write poll state

 net/netmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
1.8.5.3

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Qemu-devel] [PULL for-2.0 1/1] net: netmap_poll must update both read/write poll state
  2014-03-25 16:34 [Qemu-devel] [PULL for-2.0 0/1] Net patches Stefan Hajnoczi
@ 2014-03-25 16:34 ` Stefan Hajnoczi
  2014-03-25 18:33 ` [Qemu-devel] [PULL for-2.0 0/1] Net patches Peter Maydell
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2014-03-25 16:34 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Prasad Joshi, Stefan Hajnoczi, Anthony Liguori

From: Prasad Joshi <prasadjoshi.linux@gmail.com>

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/netmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netmap.c b/net/netmap.c
index 8213304..0c1772b 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -177,8 +177,8 @@ static void netmap_poll(NetClientState *nc, bool enable)
     NetmapState *s = DO_UPCAST(NetmapState, nc, nc);
 
     if (s->read_poll != enable || s->write_poll != enable) {
-        s->read_poll = enable;
-        s->read_poll = enable;
+        s->write_poll = enable;
+        s->read_poll  = enable;
         netmap_update_fd_handler(s);
     }
 }
-- 
1.8.5.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PULL for-2.0 0/1] Net patches
  2014-03-25 16:34 [Qemu-devel] [PULL for-2.0 0/1] Net patches Stefan Hajnoczi
  2014-03-25 16:34 ` [Qemu-devel] [PULL for-2.0 1/1] net: netmap_poll must update both read/write poll state Stefan Hajnoczi
@ 2014-03-25 18:33 ` Peter Maydell
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2014-03-25 18:33 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: QEMU Developers, Anthony Liguori

On 25 March 2014 16:34, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 839a5547574e57cce62f49bfc50fe1f04b00589a:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140324' into staging (2014-03-24 19:25:09 +0000)
>
> are available in the git repository at:
>
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 131e744a15c54f0bad3d3925eeca1acf47996e06:
>
>   net: netmap_poll must update both read/write poll state (2014-03-25 13:31:38 +0100)
>
> ----------------------------------------------------------------
> Net patches
>
> ----------------------------------------------------------------
> Prasad Joshi (1):
>       net: netmap_poll must update both read/write poll state
>
>  net/netmap.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

-- PMM

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-03-25 18:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-25 16:34 [Qemu-devel] [PULL for-2.0 0/1] Net patches Stefan Hajnoczi
2014-03-25 16:34 ` [Qemu-devel] [PULL for-2.0 1/1] net: netmap_poll must update both read/write poll state Stefan Hajnoczi
2014-03-25 18:33 ` [Qemu-devel] [PULL for-2.0 0/1] Net patches Peter Maydell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).