1. 10 1月, 2017 32 次提交
  2. 09 1月, 2017 8 次提交
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 77424a45
      Peter Maydell 提交于
      virtio, vhost, pc: fixes
      
      Here are some bugfixes that didn't make 2.8.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Fri 16 Dec 2016 21:13:43 GMT
      # 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:
        virtio: avoid using guest_notifier_mask in vhost-user mode
        pci: fix error message for express slots
        i386: amd_iommu: fix MMIO register count and access
        tests/vhost-user-bridge: use contrib/libvhost-user
        contrib: add libvhost-user
        tests/vhost-user-bridge: do not accept more than one connection
        tests/vhost-user-bridge: indicate peer disconnected
        tests/vhost-user-bridge: remove unnecessary dispatcher_remove
        tests/vhost-user-bridge: remove false comment
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      77424a45
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · dba5c337
      Peter Maydell 提交于
      Block layer patches
      
      # gpg: Signature made Mon 09 Jan 2017 13:43:44 GMT
      # gpg:                using RSA key 0x7F09B272C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      
      * remotes/kevin/tags/for-upstream:
        block: Rename raw-{posix,win32} to file-*.c
        block: Rename raw_bsd to raw-format.c
        blkverify: Implement bdrv_co_preadv/pwritev/flush
        blkdebug: Implement bdrv_co_preadv/pwritev/flush
        quorum: Clean up quorum_aio_get()
        quorum: Inline quorum_fifo_aio_cb()
        quorum: Implement .bdrv_co_preadv/pwritev()
        quorum: Avoid bdrv_aio_writev() for rewrites
        quorum: Inline quorum_aio_cb()
        quorum: Do cleanup in caller coroutine
        quorum: Implement .bdrv_co_readv/writev
        quorum: Remove s from quorum_aio_get() arguments
        coroutine: Introduce qemu_coroutine_enter_if_inactive()
        qemu-img: fix in-flight count for qemu-img bench
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      dba5c337
    • E
      block: Rename raw-{posix,win32} to file-*.c · c1bb86cd
      Eric Blake 提交于
      These files deal with the file protocol, not the raw format (the
      file protocol is often used with other formats, and the raw
      format is not forced to use the file protocol).  Rename things
      to make it a bit easier to follow.
      Suggested-by: NDaniel P. Berrange <berrange@redhat.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NJohn Snow <jsnow@redhat.com>
      Reviewed-by: NLaszlo Ersek <lersek@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c1bb86cd
    • E
      block: Rename raw_bsd to raw-format.c · 2e6fc7eb
      Eric Blake 提交于
      Given that we have raw-win32.c and raw-posix.c, my initial guess at
      raw_bsd.c was that it was for dealing with raw files using code
      specific to the BSD operating system (beyond what raw-posix could
      do).  Not so - this name was chosen back in commit e1c66c6d to
      distinguish that it was a BSD licensed file, in contrast to the
      then-existing raw.c with an unclear and potentially unusable
      license.  But since it has been more than three years since the
      rewrite, it's time to pick a more useful name for this file to
      avoid this type of confusion to future contributors that don't know
      the backstory, as none of our other files are named solely by the
      license they use.
      
      In reality, this file deals with the raw format, which is useful
      with any number of protocols, while raw-{win32,posix} deal with
      the file protocol (and in turn, that protocol is not limited to
      use with the raw format).  So rename raw_bsd to raw-format.c.  We
      could have also used the shorter name raw.c, except that collides
      with the earlier use of that filename for a different license,
      and it's better to be safe than risk license pollution.
      
      The next patch will also rename raw-win32.c and raw-posix.c to
      further distinguish the difference in roles.
      
      It doesn't hurt that this gets rid of an underscore in the filename,
      thereby making tab-completion on 'ra<TAB>' easier (now I don't have
      to type the shift key, which slows things down :)
      Suggested-by: NDaniel P. Berrange <berrange@redhat.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NLaszlo Ersek <lersek@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      2e6fc7eb
    • K
      blkverify: Implement bdrv_co_preadv/pwritev/flush · 44b67892
      Kevin Wolf 提交于
      This enables byte granularity requests for blkverify, and at the same
      time gets us rid of another user of the BDS-level AIO emulation.
      
      The reference output of a test case must be changed because the
      verification failure message reports byte offsets instead of sectors
      now.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      44b67892
    • K
      blkdebug: Implement bdrv_co_preadv/pwritev/flush · 7c3a9985
      Kevin Wolf 提交于
      This enables byte granularity requests for blkdebug, and at the same
      time gets us rid of another user of the BDS-level AIO emulation.
      
      Note that unless align=512 is specified, this can behave subtly
      different from the old behaviour because bdrv_co_preadv/pwritev don't
      have to perform alignment adjustments any more.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      7c3a9985
    • K
      quorum: Clean up quorum_aio_get() · 7c37f941
      Kevin Wolf 提交于
      Make sure that all fields of the new QuorumAIOCB are zeroed when the
      function returns even without explicitly setting them. This will protect
      us when new fields are added, removes some explicit zero assignment and
      makes the code a little nicer to read.
      Suggested-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      7c37f941
    • K
      quorum: Inline quorum_fifo_aio_cb() · a7e15902
      Kevin Wolf 提交于
      Inlining the function removes some boilerplace code and replaces
      recursion by a simple loop, so the code becomes somewhat easier to
      understand.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      a7e15902