summary refs log tree commit diff stats
path: root/hw/net/virtio-net.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2016-11-11 12:51:50 +0000
committerStefan Hajnoczi <stefanha@redhat.com>2016-11-11 12:51:50 +0000
commit83c83f9a5266ff113060f887f106a47920fa6974 (patch)
treee25f16e32d59b52f04206f2ea5037854417d06dd /hw/net/virtio-net.c
parent6bbcb76301a72dc80c8d29af13d40bb9a759c9c6 (diff)
parenta5068244b4f0c994791303b6186b6f732adab6c2 (diff)
downloadfocaccia-qemu-83c83f9a5266ff113060f887f106a47920fa6974.tar.gz
focaccia-qemu-83c83f9a5266ff113060f887f106a47920fa6974.zip
Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging
Small fixes for hard freeze.

# gpg: Signature made Thu 10 Nov 2016 03:34:24 PM GMT
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* bonzini/tags/for-upstream:
  nbd: Don't inf-loop on early EOF
  target-i386: document how x86 gdb_num_core_regs is computed.
  qdev: fix use-after-free regression from becdfa00cfa
  target-i386/machine: fix migrate faile because of Hyper-V HV_X64_MSR_VP_RUNTIME
  vl.c: move pidfile creation up the line
  target-i386: fix typo

Message-id: 1478800362-18138-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions