summary refs log tree commit diff stats
path: root/qga/commands-posix.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-07-07 15:48:49 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-07 15:48:49 +0100
commitf2562fbb7ac54d597cfe05f613d30296d1850d1b (patch)
tree56188fa8a999e5c40faf14ebe9fb82b194109f44 /qga/commands-posix.c
parentaeb72188e073d515e1f5a80f6b603692a396477b (diff)
parent849729bb796e0ecbb3f370f119682f2821dd1441 (diff)
downloadfocaccia-qemu-f2562fbb7ac54d597cfe05f613d30296d1850d1b.tar.gz
focaccia-qemu-f2562fbb7ac54d597cfe05f613d30296d1850d1b.zip
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Tue Jul  7 13:38:13 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  rocker: tests: don't need to specify master/self when setting vlans
  rocker: mark copy-to-cpu pkts as forwarding offloaded
  rocker: return -1 when dropping packet on ingress
  rocker: fix missing break statements
  rocker: fix misplaced break statement
  rocker: don't queue receive pkts when port is disabled
  vmxnet3: Fix incorrect small packet padding
  e1000: flush packets when link comes up
  rocker: fix memory leak

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qga/commands-posix.c')
0 files changed, 0 insertions, 0 deletions