• P
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · cbe81c63
    Peter Maydell 提交于
    pc, pci, virtio: cleanups, fixes
    
    a bunch of bugfixes and a couple of cleanups
    making these easier and/or making debugging easier
    Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Fri 29 Jul 2016 04:11:01 BST
    # gpg:                using RSA key 0x281F0DB8D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
    # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
    #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
    
    * remotes/mst/tags/for_upstream: (41 commits)
      mptsas: Fix a migration compatible issue
      vhost: do not update last avail idx on get_vring_base() failure
      vhost: add vhost_net_set_backend()
      vhost-user: add error report in vhost_user_write()
      tests: fix vhost-user-test leak
      tests: plug some leaks in virtio-net-test
      vhost-user: wait until backend init is completed
      char: add and use tcp_chr_wait_connected
      char: add chr_wait_connected callback
      vhost: add assert() to check runtime behaviour
      vhost-net: vhost_migration_done is vhost-user specific
      Revert "vhost-net: do not crash if backend is not present"
      vhost-user: add get_vhost_net() assertions
      vhost-user: keep vhost_net after a disconnection
      vhost-user: check vhost_user_{read,write}() return value
      vhost-user: check qemu_chr_fe_set_msgfds() return value
      vhost-user: call set_msgfds unconditionally
      qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected
      vhost: use error_report() instead of fprintf(stderr,...)
      vhost: add missing VHOST_OPS_DEBUG
      ...
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    cbe81c63
virtio.c 53.4 KB