1. 21 6月, 2017 7 次提交
  2. 20 6月, 2017 7 次提交
    • P
      Merge remote-tracking branch 'remotes/famz/tags/docker-and-block-pull-request' into staging · 65a0e3e8
      Peter Maydell 提交于
      # gpg: Signature made Fri 16 Jun 2017 01:18:46 BST
      # gpg:                using RSA key 0xCA35624C6A9171C6
      # gpg: Good signature from "Fam Zheng <famz@redhat.com>"
      # 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: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6
      
      * remotes/famz/tags/docker-and-block-pull-request: (23 commits)
        block: make accounting thread-safe
        block: split BlockAcctStats creation and setup
        block: introduce block_account_one_io
        block: protect modification of dirty bitmaps with a mutex
        migration/block: reset dirty bitmap before reading
        block: introduce dirty_bitmap_mutex
        block: protect tracked_requests and flush_queue with reqs_lock
        block: access write_gen with atomics
        block: use Stat64 for wr_highest_offset
        util: add stats64 module
        throttle-groups: protect throttled requests with a CoMutex
        throttle-groups: do not use qemu_co_enter_next
        throttle-groups: only start one coroutine from drained_begin
        block: access io_plugged with atomic ops
        block: access wakeup with atomic ops
        block: access serialising_in_flight with atomic ops
        block: access io_limits_disabled with atomic ops
        block: access quiesce_counter with atomic ops
        block: access copy_on_read with atomic ops
        docker: Add flex and bison to centos6 image
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      65a0e3e8
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 7e56accd
      Peter Maydell 提交于
      * nbd and qemu-nbd fixes (Eric, Max)
      * nbd refactoring (Vladimir)
      * vhost-user-scsi, take N+1 (Felipe)
      * replace memory_region_set_fd with memory_region_init_ram_from_fd (Marc-André)
      * docs/ movement (Paolo)
      * megasas TOCTOU fixes (Paolo)
      * make async_safe_run_on_cpu work on kvm/hax accelerators (Paolo)
      * Build system and poison.h improvements (Thomas)
      * -accel thread=xxx fix (Thomas)
      * move files to accel/ (Yang Zhong)
      
      # gpg: Signature made Thu 15 Jun 2017 10:51:55 BST
      # 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
      
      * remotes/bonzini/tags/for-upstream: (41 commits)
        vhost-user-scsi: Introduce a vhost-user-scsi sample application
        vhost-user-scsi: Introduce vhost-user-scsi host device
        qemu-doc: include version number
        docs: create interop/ subdirectory
        include/exec/poison: Mark some CONFIG defines as poisoned, too
        include/exec/poison: Add missing TARGET defines
        nbd/server: refactor nbd_trip
        nbd/server: rename rc to ret
        nbd/server: get rid of fail: return rc
        nbd/server: nbd_negotiate: fix error path
        nbd/server: remove NBDClientNewData
        nbd/server: refactor nbd_co_receive_request
        nbd/server: get rid of EAGAIN dead code
        nbd/server: refactor nbd_co_send_reply
        nbd/server: get rid of ssize_t
        nbd/server: get rid of nbd_negotiate_read and friends
        nbd: make nbd_drop public
        nbd: rename read_sync and friends
        accel: move kvm related accelerator files into accel/
        tcg: move tcg backend files into accel/tcg/
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7e56accd
    • P
      Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.10-pull-request' into staging · 5135a105
      Peter Maydell 提交于
      # gpg: Signature made Thu 15 Jun 2017 09:16:31 BST
      # gpg:                using RSA key 0xF30C38BD3F2FBE3C
      # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
      # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
      # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
      # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
      
      * remotes/vivier/tags/m68k-for-2.10-pull-request:
        target-m68k: define ext_opsize
        target-m68k: move FPU helpers to fpu_helper.c
        softfloat: define 680x0 specific values
        target/m68k: fix V flag for CC_OP_SUBx
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5135a105
    • P
      Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging · 5837aaac
      Peter Maydell 提交于
      # gpg: Signature made Wed 14 Jun 2017 22:54:41 BST
      # 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/iscsi: enable filename option and parsing
        block/rbd: enable filename option and parsing
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5837aaac
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170614-1' into staging · 30ff7d1d
      Peter Maydell 提交于
      ui: prefer gtk3 and sdl2, various fixes.
      
      # gpg: Signature made Wed 14 Jun 2017 08:54:22 BST
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-ui-20170614-1:
        spice: don't enter opengl mode in case another UI provides opengl support
        sdl: prefer sdl2 over sdl1
        gtk: prefer gtk3 over gtk2
        spice: Use proper enum type for kbd led state
        Improve Cocoa modifier key handling
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      30ff7d1d
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20170614-1' into staging · cef8fd68
      Peter Maydell 提交于
      usb: bugfixes for ehci and xhci
      
      # gpg: Signature made Wed 14 Jun 2017 08:44:01 BST
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-usb-20170614-1:
        ehci: stop recursive calls to ehci_work_bh
        xhci: only update dequeue ptr on completed transfers
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      cef8fd68
    • F
      migration: Fix race of image locking between src and dst · a1fbe750
      Fam Zheng 提交于
      Previously, dst side will immediately try to lock the write byte upon
      receiving QEMU_VM_EOF, but at src side, bdrv_inactivate_all() is only
      done after sending it. If the src host is under load, dst may fail to
      acquire the lock due to racing with the src unlocking it.
      
      Fix this by hoisting the bdrv_inactivate_all() operation before
      QEMU_VM_EOF.
      
      N.B. A further improvement could possibly be done to cleanly handover
      locks between src and dst, so that there is no window where a third QEMU
      could steal the locks and prevent src and dst from running.
      
      N.B. This commit includes a minor improvement to the error handling
      by using qemu_file_set_error().
      Reported-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      Message-id: 20170616160658.32290-1-famz@redhat.com
      Reviewed-by: NDaniel P. Berrange <berrange@redhat.com>
      Reviewed-by: NJuan Quintela <quintela@redhat.com>
      [PMM: noted qemu_file_set_error() use in commit as suggested by Daniel]
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a1fbe750
  3. 16 6月, 2017 26 次提交