1. 30 3月, 2016 4 次提交
    • K
      block: Remove bdrv_make_anon() · 63eaaae0
      Kevin Wolf 提交于
      The call in hmp_drive_del() is dead code because blk_remove_bs() is
      called a few lines above. The only other remaining user is
      bdrv_delete(), which only abuses bdrv_make_anon() to remove it from the
      named nodes list. This path inlines the list entry removal into
      bdrv_delete() and removes bdrv_make_anon().
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      63eaaae0
    • P
      Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging · 553934db
      Peter Maydell 提交于
      # gpg: Signature made Tue 29 Mar 2016 01:48:09 BST using RSA key ID C0DE3057
      # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
      # gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
      # gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
      
      * remotes/cody/tags/block-pull-request:
        qemu-iotests: add no-op streaming test
        qemu-iotests: fix test_stream_partial()
        block: never cancel a streaming job without running stream_complete()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      553934db
    • P
      Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging · 5b8e6b4c
      Peter Maydell 提交于
      slirp updates
      
      # gpg: Signature made Tue 29 Mar 2016 00:16:05 BST using RSA key ID FB6B2F1D
      # gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>"
      # gpg:                 aka "Samuel Thibault <sthibault@debian.org>"
      # gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>"
      # gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>"
      # gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.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: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
      #      Subkey fingerprint: F632 74CD C630 0873 CB3D  29D9 E3E5 1CE8 FB6B 2F1D
      
      * remotes/thibault/tags/samuel-thibault:
        Rework ipv6 options
        Use C99 flexible array instead of 1-byte trailing array
        Avoid embedding struct mbuf in other structures
        slirp: send icmp6 errors when UDP send failed
        slirp: Fix memory leak on small incoming ipv4 packet
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5b8e6b4c
    • P
      Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160328.0' into staging · 7cd592bc
      Peter Maydell 提交于
      VFIO updates 2016-03-28
      
       - Use 128bit math to avoid asserts with IOMMU regions (Bandan Das)
      
      # gpg: Signature made Mon 28 Mar 2016 23:16:52 BST using RSA key ID 3BB08B22
      # gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
      # gpg:                 aka "Alex Williamson <alex@shazbot.org>"
      # gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
      # gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"
      
      * remotes/awilliam/tags/vfio-update-20160328.0:
        vfio: convert to 128 bit arithmetic calculations when adding mem regions
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7cd592bc
  2. 29 3月, 2016 6 次提交
  3. 25 3月, 2016 3 次提交
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 84a5a801
      Peter Maydell 提交于
      * Log filtering from Alex and Peter
      * Chardev fix from Marc-André
      * config.status tweak from David
      * Header file tweaks from Markus, myself and Veronia (Outreachy candidate)
      * get_ticks_per_sec() removal from Rutuja (Outreachy candidate)
      * Coverity fix from myself
      * PKE implementation from myself, based on rth's XSAVE support
      
      # gpg: Signature made Thu 24 Mar 2016 20:15:11 GMT using RSA key ID 78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      
      * remotes/bonzini/tags/for-upstream: (28 commits)
        target-i386: implement PKE for TCG
        config.status: Pass extra parameters
        char: translate from QIOChannel error to errno
        exec: fix error handling in file_ram_alloc
        cputlb: modernise the debug support
        qemu-log: support simple pid substitution for logs
        target-arm: dfilter support for in_asm
        qemu-log: dfilter-ise exec, out_asm, op and opt_op
        qemu-log: new option -dfilter to limit output
        qemu-log: Improve the "exec" TB execution logging
        qemu-log: Avoid function call for disabled qemu_log_mask logging
        qemu-log: correct help text for -d cpu
        tcg: pass down TranslationBlock to tcg_code_gen
        util: move declarations out of qemu-common.h
        Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND
        hw: explicitly include qemu-common.h and cpu.h
        include/crypto: Include qapi-types.h or qemu/bswap.h instead of qemu-common.h
        isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h
        Move ParallelIOArg from qemu-common.h to sysemu/char.h
        Move QEMU_ALIGN_*() from qemu-common.h to qemu/osdep.h
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      
      Conflicts:
      	scripts/clean-includes
      84a5a801
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging · b68a8013
      Peter Maydell 提交于
      Support for booting from virtio-scsi devices in the s390-ccw bios.
      
      # gpg: Signature made Thu 24 Mar 2016 08:14:21 GMT using RSA key ID C6F02FAF
      # gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
      
      * remotes/cohuck/tags/s390x-20160324:
        s390-ccw.img: rebuild image
        pc-bios/s390-ccw: disambiguation of "No zIPL magic" message
        pc-bios/s390-ccw: enhance bootmap detection
        pc-bios/s390-ccw: enable virtio-scsi
        pc-bios/s390-ccw: add virtio-scsi implementation
        pc-bios/s390-ccw: add scsi definitions
        pc-bios/s390-ccw: add simplified virtio call
        pc-bios/s390-ccw: make provisions for different backends
        pc-bios/s390-ccw: add vdev object to store all device details
        pc-bios/s390-ccw: update virtio implementation to allow up to 3 vrings
        pc-bios/s390-ccw: qemuize types
        pc-bios/s390-ccw: add utility functions and "export" some others
        pc-bios/s390-ccw: virtio_panic -> panic
        pc-bios/s390-ccw: add more disk layout checks
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b68a8013
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160324-1' into staging · f18f2e7c
      Peter Maydell 提交于
      input-linux + spice fixes
      
      # gpg: Signature made Thu 24 Mar 2016 07:54:45 GMT using RSA key ID D3E87138
      # 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>"
      
      * remotes/kraxel/tags/pull-ui-20160324-1:
        spice: Disallow use of gl + TCP port
        input-linux: fix Coverity warning
        input-linux: switch over to -object
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f18f2e7c
  4. 24 3月, 2016 25 次提交
  5. 23 3月, 2016 2 次提交