1. 20 12月, 2017 3 次提交
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · f1faf2d5
      Peter Maydell 提交于
      Pull request
      
      v2:
       * Fixed incorrect virtio_blk_data_plane_create() local_err refactoring in
         "hw/block: Use errp directly rather than local_err" that broke virtio-blk
         over virtio-mmio [Peter]
      
      # gpg: Signature made Tue 19 Dec 2017 15:08:14 GMT
      # gpg:                using RSA key 0x9CA4ABB381AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/block-pull-request: (23 commits)
        qemu-iotests: add 203 savevm with IOThreads test
        iothread: fix iothread_stop() race condition
        iotests: add VM.add_object()
        blockdev: add x-blockdev-set-iothread force boolean
        docs: mark nested AioContext locking as a legacy API
        block: avoid recursive AioContext acquire in bdrv_inactivate_all()
        virtio-blk: reject configs with logical block size > physical block size
        virtio-blk: make queue size configurable
        qemu-iotests: add 202 external snapshots IOThread test
        blockdev: add x-blockdev-set-iothread testing command
        iothread: add iothread_by_id() API
        block: drop unused BlockDirtyBitmapState->aio_context field
        block: don't keep AioContext acquired after internal_snapshot_prepare()
        block: don't keep AioContext acquired after blockdev_backup_prepare()
        block: don't keep AioContext acquired after drive_backup_prepare()
        block: don't keep AioContext acquired after external_snapshot_prepare()
        blockdev: hold AioContext for bdrv_unref() in external_snapshot_clean()
        qdev: drop unused #include "sysemu/iothread.h"
        dev-storage: Fix the unusual function name
        hw/block: Use errp directly rather than local_err
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      
      # Conflicts:
      #	hw/core/qdev-properties-system.c
      f1faf2d5
    • P
      Merge remote-tracking branch 'remotes/aurel/tags/pull-target-sh4-20171218' into staging · af352675
      Peter Maydell 提交于
      Queued target/sh4 patches
      
      # gpg: Signature made Mon 18 Dec 2017 22:36:42 GMT
      # gpg:                using RSA key 0x1388C0F899E8336B
      # gpg: Good signature from "Aurelien Jarno <aurelien@aurel32.net>"
      # gpg:                 aka "Aurelien Jarno <aurelien@jarno.fr>"
      # gpg:                 aka "Aurelien Jarno <aurel32@debian.org>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 7746 2642 A9EF 94FD 0F77  196D BA9C 7806 1DDD 8C9B
      #      Subkey fingerprint: 52BC 8695 BE34 F90A D7D4  0CB8 1388 C0F8 99E8 336B
      
      * remotes/aurel/tags/pull-target-sh4-20171218:
        target/sh4: Convert to DisasContextBase
        target/sh4: Do not singlestep after exceptions
        target/sh4: Convert to DisasJumpType
        target/sh4: Use cmpxchg for movco when parallel_cpus
        target/sh4: fix TCG leak during gusa sequence
        target/sh4: add missing tcg_temp_free() in _decode_opc()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      af352675
    • P
      Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging · 03c1c09d
      Peter Maydell 提交于
      # gpg: Signature made Mon 18 Dec 2017 21:05:53 GMT
      # gpg:                using RSA key 0xBDBE7B27C0DE3057
      # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
      # gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
      # gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
      # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057
      
      * remotes/cody/tags/block-pull-request:
        block/curl: fix minor memory leaks
        block/curl: check error return of curl_global_init()
        block/sheepdog: code beautification
        block/sheepdog: remove spurious NULL check
        blockjob: kick jobs on set-speed
        backup: use copy_bitmap in incremental backup
        backup: simplify non-dirty bits progress processing
        backup: init copy_bitmap from sync_bitmap for incremental
        backup: move from done_bitmap to copy_bitmap
        hbitmap: add next_zero function
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      03c1c09d
  2. 19 12月, 2017 36 次提交
  3. 18 12月, 2017 1 次提交