1. 18 7月, 2017 14 次提交
    • K
      block/qapi: Add qdev device name to query-block · 46eade7b
      Kevin Wolf 提交于
      With -blockdev/-device, users can indirectly create anonymous
      BlockBackends, while the state of such backends is still of interest. As
      a preparation for making such BBs visible in query-block, make sure that
      they can be identified even without a name by adding the ID/QOM path of
      their qdev device to BlockInfo.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NJohn Snow <jsnow@redhat.com>
      46eade7b
    • K
      block: Make blk_get_attached_dev_id() public · 77beef83
      Kevin Wolf 提交于
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NJohn Snow <jsnow@redhat.com>
      77beef83
    • P
      block/vpc.c: Handle write failures in get_image_offset() · cfc87e00
      Peter Maydell 提交于
      Coverity (CID 1355236) points out that get_image_offset() doesn't check that
      it actually succeeded in writing the updated block bitmap to the file.
      Check the error return from bdrv_pwrite_sync() and propagate an error
      response back up to the function which calls get_image_offset() for
      a write so that it can return the error to its caller.
      
      get_sector_offset() is only used for reads, but we move it to the
      same API for consistency.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      cfc87e00
    • P
      block/vmdk: Report failures in vmdk_read_cid() · 9877860e
      Peter Maydell 提交于
      The function vmdk_read_cid() can fail if the read on the underlying
      block device fails, or if there's a format error in the VMDK file.
      However its API doesn't provide a mechanism to report these errors,
      and in some cases we were returning a CID of 0 and in some cases a
      CID of 0xffffffff, either of which might potentially be valid values.
      
      Change the function to return 0 on success or a negative errno, and
      return the CID via a uint32_t* argument. Update the callsites to
      handle and propagate the error appropriately.
      
      This fixes in passing a Coverity-spotted issue (CID 1350038) where
      we weren't checking the return value from sscanf().
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: NFam Zheng <famz@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      9877860e
    • M
      block: remove timer canceling in throttle_config() · 27e4cf13
      Manos Pitsidianakis 提交于
      throttle_config() cancels the timers of the calling BlockBackend. This
      doesn't make sense because other BlockBackends in the group remain
      untouched. There's no need to cancel the timers in the one specific
      BlockBackend so let's not do that. Throttled requests will run as
      scheduled and future requests will follow the new configuration. This
      also allows a throttle group's configuration to be changed even when it
      has no members.
      Signed-off-by: NManos Pitsidianakis <el13635@mail.ntua.gr>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      27e4cf13
    • M
      block: add clock_type field to ThrottleGroup · dbe824cc
      Manos Pitsidianakis 提交于
      Clock type in throttling is currently inferred by the ThrottleTimer's
      clock type even though it is a per-ThrottleGroup property; it doesn't
      make sense to have different clock types in the same group. Moving this
      to a field in ThrottleGroup can simplify some of the throttle functions.
      Signed-off-by: NManos Pitsidianakis <el13635@mail.ntua.gr>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      dbe824cc
    • K
      commit: Add NULL check for overlay_bs · b1e1fa0c
      Kevin Wolf 提交于
      I can't see how overlay_bs could become NULL with the current code, but
      other code in this function already checks it and we can make Coverity
      happy with this check, so let's add it.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      b1e1fa0c
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · 718d7f4f
      Peter Maydell 提交于
      # gpg: Signature made Mon 17 Jul 2017 16:40:18 BST
      # 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:
        block: fix shadowed variable in bdrv_co_pdiscard
        util/aio-win32: Only select on what we are actually waiting for
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      718d7f4f
    • P
      Merge remote-tracking branch 'remotes/aurel/tags/pull-target-mips-20170717' into staging · ed645872
      Peter Maydell 提交于
      Queued target/mips patches
      
      # gpg: Signature made Mon 17 Jul 2017 15:50:27 BST
      # gpg:                using RSA key 0xBA9C78061DDD8C9B
      # 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 a trusted signature!
      # gpg:          There is no indication that the signature belongs to the owner.
      # Primary key fingerprint: 7746 2642 A9EF 94FD 0F77  196D BA9C 7806 1DDD 8C9B
      
      * remotes/aurel/tags/pull-target-mips-20170717:
        target/mips: optimize WSBH, DSBH and DSHD
        mips: set CP0 Debug DExcCode for SDBBP instruction
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ed645872
    • P
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170717' into staging · 6c459156
      Peter Maydell 提交于
      target-arm queue:
       * new model of the ARM MPS2/MPS2+ FPGA based development board
       * clean up DISAS_* exit conditions and fix various regressions
         since commits e75449a3 8a6b28c7 (in particular including
         ones which broke OP-TEE guests)
       * make Cortex-M3 and M4 correctly default to 8 PMSA regions
      
      # gpg: Signature made Mon 17 Jul 2017 13:43:45 BST
      # gpg:                using RSA key 0x3C2525ED14360CDE
      # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
      # gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
      # gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
      # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE
      
      * remotes/pmaydell/tags/pull-target-arm-20170717:
        MAINTAINERS: Add entries for MPS2 board
        hw/arm/mps2: Add ethernet
        hw/arm/mps2: Add SCC
        hw/misc/mps2_scc: Implement MPS2 Serial Communication Controller
        hw/arm/mps2: Add timers
        hw/char/cmsdk-apb-timer: Implement CMSDK APB timer device
        hw/arm/mps2: Add UARTs
        hw/char/cmsdk-apb-uart.c: Implement CMSDK APB UART
        hw/arm/mps2: Implement skeleton mps2-an385 and mps2-an511 board models
        target/arm: use DISAS_EXIT for eret handling
        target/arm: use gen_goto_tb for ISB handling
        target/arm/translate: ensure gen_goto_tb sets exit flags
        target/arm/translate.h: expand comment on DISAS_EXIT
        target/arm/translate: make DISAS_UPDATE match declared semantics
        include/exec/exec-all: document common exit conditions
        target/arm: Make Cortex-M3 and M4 default to 8 PMSA regions
        qdev: support properties which don't set a default value
        qdev-properties.h: Explicitly set the default value for arraylen properties
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6c459156
    • P
      Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · a778cd56
      Peter Maydell 提交于
      # gpg: Signature made Mon 17 Jul 2017 13:17:17 BST
      # gpg:                using RSA key 0xEF04965B398D6211
      # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
      # gpg: WARNING: This key is not certified with a trusted signature!
      # gpg:          There is no indication that the signature belongs to the owner.
      # Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211
      
      * remotes/jasowang/tags/net-pull-request:
        virtio-net: fix offload ctrl endian
        virtion-net: Prefer is_power_of_2()
        docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header
        net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
        net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare
        net/colo.c: Add vnet packet parse feature in colo-proxy
        net/colo-compare.c: Make colo-compare support vnet_hdr_len
        net/colo-compare.c: Introduce parameter for compare_chr_send()
        net/colo.c: Make vnet_hdr_len as packet property
        net/filter-mirror.c: Add new option to enable vnet support for filter-redirector
        net/filter-mirror.c: Make filter mirror support vnet support.
        net/filter-mirror.c: Introduce parameter for filter_send()
        net/net.c: Add vnet_hdr support in SocketReadState
        net: Add vnet_hdr_len arguments in NetClientState
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a778cd56
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · 5a477a78
      Peter Maydell 提交于
      # gpg: Signature made Mon 17 Jul 2017 13:11:17 BST
      # 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/tracing-pull-request:
        trace: update old trace events in docs
        trace: [trivial] Statically enable all guest events
        trace: [tcg, trivial] Re-align generated code
        trace: [tcg] Do not generate TCG code to trace dynamically-disabled events
        exec: [tcg] Use different TBs according to the vCPU's dynamic tracing state
        trace: [tcg] Delay changes to dynamic state when translating
        trace: Allocate cpu->trace_dstate in place
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5a477a78
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20170717-pull-request' into staging · ca4e667d
      Peter Maydell 提交于
      ehci fix for 2.10
      
      # gpg: Signature made Mon 17 Jul 2017 10:40:00 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/usb-20170717-pull-request:
        ehci: add sanity check for maxframes
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ca4e667d
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/vga-20170717-pull-request' into staging · df55c7e8
      Peter Maydell 提交于
      virtio-gpu migration fix for 2.10
      
      # gpg: Signature made Mon 17 Jul 2017 10:41:49 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/vga-20170717-pull-request:
        virtio-gpu: skip update cursor in post_load if we don't have one
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      df55c7e8
  2. 17 7月, 2017 26 次提交