1. 21 6月, 2018 34 次提交
  2. 20 6月, 2018 4 次提交
    • A
      docker: docker.py wrap StringIO import for python3 · 7a5d936b
      Alex Bennée 提交于
      Although the docker.py is nominally python2 we actually invoke it with
      the configured python from the configure script.
      Signed-off-by: NAlex Bennée <alex.bennee@linaro.org>
      7a5d936b
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180619' into staging · 46012db6
      Peter Maydell 提交于
      - cleanup in virtio-ccw
      - accommodate guests using vfio-ccw without specifying unlimited
        prefetch, but actually working fine
      - add cpu model for the z14 Model ZR1
      - add support for pxelinux.cfg-style network booting to the s390x
        firmware
      
      # gpg: Signature made Tue 19 Jun 2018 10:33:06 BST
      # gpg:                using RSA key DECF6B93C6F02FAF
      # gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
      # gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
      # gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
      # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF
      
      * remotes/cohuck/tags/s390x-20180619:
        pc-bios/s390-ccw: Update the s390-netboot.img binary
        pc-bios/s390-ccw: Optimize the s390-netboot.img for size
        pc-bios/s390-ccw/net: Try to load pxelinux.cfg file accoring to the UUID
        pc-bios/s390-ccw/net: Add support for pxelinux-style config files
        pc-bios/s390-ccw/net: Update code for the latest changes in SLOF
        roms: Update SLOF submodule to current status
        pc-bios/s390-ccw: define loadparm length
        s390x/cpumodels: add z14 Model ZR1
        s390x/ipl: Try to detect Linux vs non Linux for initial IPL PSW
        vfio-ccw: remove orb.c64 (64 bit data addresses) check
        vfio-ccw: add force unlimited prefetch property
        virtio-ccw: clean up notify
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      46012db6
    • P
      Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20180618' into staging · eee4baef
      Peter Maydell 提交于
      qemu-openbios queue
      
      # gpg: Signature made Mon 18 Jun 2018 19:28:08 BST
      # gpg:                using RSA key 5BC2C56FAE0F321F
      # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
      # Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F
      
      * remotes/mcayland/tags/qemu-openbios-20180618:
        Update OpenBIOS images to 8fe6f5f96f built from submodule.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      eee4baef
    • P
      Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20180618' into staging · 79449bc3
      Peter Maydell 提交于
      qemu-sparc queue
      
      # gpg: Signature made Mon 18 Jun 2018 18:43:24 BST
      # gpg:                using RSA key 5BC2C56FAE0F321F
      # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
      # Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F
      
      * remotes/mcayland/tags/qemu-sparc-20180618:
        SPARC64: add icount support
        hw/sparc/sun4m: Fix problems with device introspection
        hw/sparc64/sun4u: Fix introspection by converting prom instance_init to realize
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      79449bc3
  3. 19 6月, 2018 2 次提交
    • P
      Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20180618' into staging · 727f8d87
      Peter Maydell 提交于
      Place parallel device properly, fixing vga
      
      # gpg: Signature made Mon 18 Jun 2018 17:45:50 BST
      # gpg:                using RSA key 64DF38E8AF7E215F
      # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
      # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F
      
      * remotes/rth/tags/pull-axp-20180618:
        hw/isa/smc37c669: Change the parallel I/O base to 378H
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      727f8d87
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · 0f01b9fd
      Peter Maydell 提交于
      Block layer patches:
      
      - Active mirror (blockdev-mirror copy-mode=write-blocking)
      - bdrv_drain_*() fixes and test cases
      - Fix crash with scsi-hd and drive_del
      
      # gpg: Signature made Mon 18 Jun 2018 17:44:10 BST
      # gpg:                using RSA key 7F09B272C88F2FD6
      # 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: (35 commits)
        iotests: Add test for active mirroring
        block/mirror: Add copy mode QAPI interface
        block/mirror: Add active mirroring
        job: Add job_progress_increase_remaining()
        block/mirror: Add MirrorBDSOpaque
        block/dirty-bitmap: Add bdrv_dirty_iter_next_area
        test-hbitmap: Add non-advancing iter_next tests
        hbitmap: Add @advance param to hbitmap_iter_next()
        block: Generalize should_update_child() rule
        block/mirror: Use source as a BdrvChild
        block/mirror: Wait for in-flight op conflicts
        block/mirror: Use CoQueue to wait on in-flight ops
        block/mirror: Convert to coroutines
        block/mirror: Pull out mirror_perform()
        block: fix QEMU crash with scsi-hd and drive_del
        test-bdrv-drain: Test graph changes in drain_all section
        block: Allow graph changes in bdrv_drain_all_begin/end sections
        block: ignore_bds_parents parameter for drain functions
        block: Move bdrv_drain_all_begin() out of coroutine context
        block: Allow AIO_WAIT_WHILE with NULL ctx
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      0f01b9fd