[Qemu-commits] [qemu/qemu] eb3f45: qemu-bridge-helper: Fix fd leak in main()

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: eb3f45c5af26f5284b5f8dd7319714ca70676e50
      
https://github.com/qemu/qemu/commit/eb3f45c5af26f5284b5f8dd7319714ca70676e50
  Author: Gonglei <address@hidden>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M qemu-bridge-helper.c

  Log Message:
  -----------
  qemu-bridge-helper: Fix fd leak in main()

initialize fd and ctlfd, and close them at the end

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


  Commit: 3fb69aa1d127585fe9626c3d777a8ce2fc01a36d
      
https://github.com/qemu/qemu/commit/3fb69aa1d127585fe9626c3d777a8ce2fc01a36d
  Author: Anton Ivanov <address@hidden>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M net/Makefile.objs
    M net/clients.h
    A net/l2tpv3.c
    M net/net.c
    M qapi-schema.json
    M qemu-options.hx

  Log Message:
  -----------
  net: L2TPv3 transport

This transport allows to connect a QEMU nic to a static Ethernet
over L2TPv3 tunnel. The transport supports all options present
in the Linux kernel implementation. It allows QEMU to connect
to any Linux host running kernel 3.3+, most routers and network
devices as well as other QEMU instances.

[Fixed up net_client_init1() switch statement to support -netdev
--Stefan]

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


  Commit: 575a1c0e42287f8342a7e93e03c53edeb152399d
      
https://github.com/qemu/qemu/commit/575a1c0e42287f8342a7e93e03c53edeb152399d
  Author: Jiri Pirko <address@hidden>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M hw/core/qdev-properties-system.c
    M hw/net/virtio-net.c
    M include/net/net.h
    M net/net.c

  Log Message:
  -----------
  net: move queue number into NICPeers

It indicates the number of elements in ncs field and makes sense to have
int inside NICPeers. Also in parse_netdev we do not need to access
container and work with NICPeers only.

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


  Commit: 5e80dd223ded254b1802bdd6417ef118456eadce
      
https://github.com/qemu/qemu/commit/5e80dd223ded254b1802bdd6417ef118456eadce
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M hw/net/eepro100.c

  Log Message:
  -----------
  hw/net/eepro100: Implement read-only bits in MDI registers

Although we defined an eepro100_mdi_mask[] array indicating which bits
in the registers are read-only, we weren't actually doing anything with
it. Make the MDI register-write code use it rather than manually making
register 1 read-only and leaving the rest as reads-as-written. (The
special-case handling of register 0 remains as before since its mask is
all-zeros and the special casing happens before we apply the masking.)

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 76fbbec9315f8712d921411fbb4dad1fbcf1b151
      
https://github.com/qemu/qemu/commit/76fbbec9315f8712d921411fbb4dad1fbcf1b151
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-29 (Sun, 29 Jun 2014)

  Changed paths:
    M hw/core/qdev-properties-system.c
    M hw/net/eepro100.c
    M hw/net/virtio-net.c
    M include/net/net.h
    M net/Makefile.objs
    M net/clients.h
    A net/l2tpv3.c
    M net/net.c
    M qapi-schema.json
    M qemu-bridge-helper.c
    M qemu-options.hx

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

Net patches

# gpg: Signature made Fri 27 Jun 2014 14:10:57 BST 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:
  hw/net/eepro100: Implement read-only bits in MDI registers
  net: move queue number into NICPeers
  net: L2TPv3 transport
  qemu-bridge-helper: Fix fd leak in main()

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


Compare: https://github.com/qemu/qemu/compare/2d80e0ab4b43...76fbbec9315f