[Qemu-commits] [qemu/qemu] 756ae7: tap: fix vcpu long time io blocking on tap

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 756ae78b275a0625b4559a8fc448df4c6eb331a8
      
https://github.com/qemu/qemu/commit/756ae78b275a0625b4559a8fc448df4c6eb331a8
  Author: Wangkai (Kevin,C) <address@hidden>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: fix vcpu long time io blocking on tap

[Adjusted doc comment for grammar.
--Stefan]

Signed-off-by: Wangkai <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 23120b13c6e316df44aeb63420121a1cf6dc49dc
      
https://github.com/qemu/qemu/commit/23120b13c6e316df44aeb63420121a1cf6dc49dc
  Author: Jason Wang <address@hidden>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M hw/core/qdev-properties-system.c

  Log Message:
  -----------
  net: don't use set/get_pointer() in set/get_netdev()

Commit 1ceef9f27359cbe92ef124bf74de6f792e71f6fb (net: multiqueue
support) tries to use set_pointer() and get_pointer() to set and get
NICPeers which is not a pointer defined in DEFINE_PROP_NETDEV. This
trick works but result a unclean and fragile implementation (e.g
print_netdev and parse_netdev).

This patch solves this issue by not using set/get_pinter() and set and
get netdev directly in set_netdev() and get_netdev(). After this the
parse_netdev() and print_netdev() were no longer used and dropped from
the source.

[Renamed 'err' label to 'out' as suggested by Markus Armbruster.
--Stefan]

Cc: Markus Armbruster <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Cc: Peter Maydell <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 71e28e3cc24ff3b0268903758aae357592eb8b74
      
https://github.com/qemu/qemu/commit/71e28e3cc24ff3b0268903758aae357592eb8b74
  Author: Markus Armbruster <address@hidden>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M net/l2tpv3.c

  Log Message:
  -----------
  net: Fuse g_malloc(); memset() into g_new0()

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 58889fe50a7c5b8776cf3096a8fe611fb66c4e5c
      
https://github.com/qemu/qemu/commit/58889fe50a7c5b8776cf3096a8fe611fb66c4e5c
  Author: Markus Armbruster <address@hidden>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M net/l2tpv3.c
    M net/queue.c
    M net/slirp.c

  Log Message:
  -----------
  net: Use g_new() & friends where that makes obvious sense

g_new(T, n) is neater than g_malloc(sizeof(T) * n).  It's also safer,
for two reasons.  One, it catches multiplication overflowing size_t.
Two, it returns T * rather than void *, which lets the compiler catch
more type errors.

This commit only touches allocations with size arguments of the form
sizeof(T).

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 20302e71a5b654d7b4d0d61c7384e9dd8d112971
      
https://github.com/qemu/qemu/commit/20302e71a5b654d7b4d0d61c7384e9dd8d112971
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: defer packets until BM enabled

Some guests seem to set BM for e1000 after
enabling RX.
If packets arrive in the window, device is wedged.
Probably works by luck on real hardware, work around
this by making can_receive depend on BM.

Tested-by: Gabriel Somlo <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 328b3b6c44c17d94df115ed1851f54a0bd59a471
      
https://github.com/qemu/qemu/commit/328b3b6c44c17d94df115ed1851f54a0bd59a471
  Author: Peter Maydell <address@hidden>
  Date:   2014-12-20 (Sat, 20 Dec 2014)

  Changed paths:
    M hw/core/qdev-properties-system.c
    M hw/net/e1000.c
    M net/l2tpv3.c
    M net/queue.c
    M net/slirp.c
    M net/tap.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into 
staging

# gpg: Signature made Fri 19 Dec 2014 13:18:18 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/net-pull-request:
  e1000: defer packets until BM enabled
  net: Use g_new() & friends where that makes obvious sense
  net: Fuse g_malloc(); memset() into g_new0()
  net: don't use set/get_pointer() in set/get_netdev()
  tap: fix vcpu long time io blocking on tap

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/c4e7c17a8ecb...328b3b6c44c1