1. 11 3月, 2019 26 次提交
  2. 10 3月, 2019 2 次提交
    • P
      Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-03-08' into staging · e2a18635
      Peter Maydell 提交于
      nbd patches for 2019-03-08
      
      - support TLS client authorization in NBD servers
      - iotest 223 race fix
      
      # gpg: Signature made Fri 08 Mar 2019 17:37:59 GMT
      # gpg:                using RSA key A7A16B4A2527436A
      # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
      # gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
      # gpg:                 aka "[jpeg image of size 6874]" [full]
      # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A
      
      * remotes/ericb/tags/pull-nbd-2019-03-08:
        iotests: Wait for qemu to end in 223
        nbd: fix outdated qapi docs syntax for tls-creds
        nbd: allow authorization with nbd-server-start QMP command
        qemu-nbd: add support for authorization of TLS clients
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e2a18635
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · f5b4c310
      Peter Maydell 提交于
      Pull request
      
      # gpg: Signature made Fri 08 Mar 2019 16:53:34 GMT
      # gpg:                using RSA key 9CA4ABB381AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
      # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/block-pull-request:
        iothread: document about why we need explicit aio_poll()
        iothread: push gcontext earlier in the thread_fn
        iothread: create main loop unconditionally
        iothread: create the gcontext unconditionally
        iothread: replace init_done_cond with a semaphore
        hw/block/virtio-blk: Clean req->dev repetitions
        MAINTAINERS: add missing support status fields
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f5b4c310
  3. 09 3月, 2019 3 次提交
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · 4c761374
      Peter Maydell 提交于
      Block layer patches:
      
      - qcow2: Support for external data files
      - qcow2: Default to 4KB for the qcow2 cache entry size
      - Apply block driver whitelist for -drive format=help
      - Several qemu-iotests improvements
      
      # gpg: Signature made Fri 08 Mar 2019 12:54:27 GMT
      # gpg:                using RSA key 7F09B272C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      
      * remotes/kevin/tags/for-upstream: (33 commits)
        qcow2 spec: Describe string header extensions
        qemu-iotests: Add dependency to qemu-nbd tool
        ahci-test: Add dependency to qemu-img tool
        qemu-iotests: amend with external data file
        qemu-iotests: General tests for qcow2 with external data file
        qemu-iotests: Preallocation with external data file
        qcow2: Implement data-file-raw create option
        qcow2: Store data file name in the image
        qcow2: Creating images with external data file
        qcow2: Add basic data-file infrastructure
        qcow2: Support external data file in qemu-img check
        qcow2: Return error for snapshot operation with data file
        qcow2: External file I/O
        qcow2: Prepare qcow2_co_block_status() for data file
        qcow2: Return 0/-errno in qcow2_alloc_compressed_cluster_offset()
        qcow2: Don't assume 0 is an invalid cluster offset
        qcow2: Prepare count_contiguous_clusters() for external data file
        qcow2: Prepare qcow2_get_cluster_type() for external data file
        qcow2: Pass bs to qcow2_get_cluster_type()
        qcow2: Basic definitions for external data files
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4c761374
    • P
      Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-2019-03-08' into staging · 1eb5da3b
      Peter Maydell 提交于
      Fixes mixed up operands in CADDN and CADD
      
      # gpg: Signature made Fri 08 Mar 2019 09:45:05 GMT
      # gpg:                using RSA key 6E636A7E83F2DD0CFA6E6E370AD2C6396B69CA14
      # gpg:                issuer "kbastian@mail.uni-paderborn.de"
      # gpg: Good signature from "Bastian Koppelmann <kbastian@mail.uni-paderborn.de>" [full]
      # Primary key fingerprint: 6E63 6A7E 83F2 DD0C FA6E  6E37 0AD2 C639 6B69 CA14
      
      * remotes/bkoppelmann/tags/pull-tricore-2019-03-08:
        tricore: fixed RCR_CADDN instruction
        tricore: fixed RCR_CADD instruction
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      1eb5da3b
    • P
      Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-08' into staging · 234afe78
      Peter Maydell 提交于
      - qtest fixes
      - Some generic clean-ups by Philippe
      - macOS CI testing via cirrus-ci.com
      
      # gpg: Signature made Fri 08 Mar 2019 08:58:47 GMT
      # gpg:                using RSA key 2ED9D774FE702DB5
      # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
      # gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
      # gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
      # gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
      # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5
      
      * remotes/huth-gitlab/tags/pull-request-2019-03-08:
        cirrus.yml: Add macOS continuous integration task
        tests/bios-tables: Improve portability by searching bash in the $PATH
        vhost-user-test: fix leaks
        tests: Do not use "\n" in g_test_message() strings
        hw/devices: Remove unused TC6393XB_RAM definition
        hw: Remove unused 'hw/devices.h' include
        tests: Move qdict-test-data.txt to tests/data/qobject/
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      
      # Conflicts:
      #	tests/vhost-user-test.c
      234afe78
  4. 08 3月, 2019 9 次提交
    • P
      Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20190307' into staging · 62cfabb5
      Peter Maydell 提交于
      Fix use after free on temporary.
      Optmize branch to next insn via br r0.
      
      # gpg: Signature made Fri 08 Mar 2019 01:53:16 GMT
      # gpg:                using RSA key 64DF38E8AF7E215F
      # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
      # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F
      
      * remotes/rth/tags/pull-hppa-20190307:
        target/hppa: Optimize blr r0,rn
        target/hppa: Do not return freed temporary
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      62cfabb5
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-qgraph' into staging · 06a1564f
      Peter Maydell 提交于
      qgraph project from GSoC 2018
      
      # gpg: Signature made Thu 07 Mar 2019 16:29:17 GMT
      # gpg:                using RSA key BFFBD25F78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
      # 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-qgraph: (57 commits)
        qos-test: megasas test node
        qos-test: e1000 test node
        qos-test: eepro100 test node
        qos-test: es1370 test node
        qos-test: vmxnet3 test node
        qos-test: usb-hcd-ohci test node
        qos-test: spapr-phb test node
        qos-test: pcnet test node
        qos-test: nvme test node
        qos-test: ne2k_pci test node
        qos-test: ipoctal232 test node
        qos-test: tpci200 test node
        qos-test: ac97 test node
        tests: move virtio entirely to qos-test
        tests/libqos: remove pre-qgraph QVirtioPCIDevice API
        qos-test: virtio-scsi test node
        tests/libqos: virtio-scsi driver and interface nodes
        qos-test: vhost-user test node
        vhost-user-test: always use 256 MiB of guest memory
        tests/libqos: support multiqueue for virtio-net
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      06a1564f
    • P
      Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging · 6bbbe16a
      Peter Maydell 提交于
      Slirp updates
      
      Greg Kurz (1):
        slirp: Fix build with gcc 9
      
      Marc-André Lureau (7):
        slirp: adapt a subset of QEMU vmstate code
        slirp: use libslirp migration code
        slirp: use "slirp_" prefix for inet_aton() win32 implementation
        slirp: move sources to src/ subdirectory
        slirp: add a standalone Makefile
        build-sys: link with slirp as an external project
        slirp: remove QEMU Makefile.objs
      
      Samuel Thibault (2):
        slirp: fix big/little endian conversion in ident protocol
        slirp: Mark pieces missing IPv6 support
      
      Vic Lee (1):
        slirp: check for ioctlsocket error and 0-length udp payload.
      
      William Bowling (1):
        slirp: check sscanf result when emulating ident
      
      # gpg: Signature made Thu 07 Mar 2019 11:51:20 GMT
      # gpg:                using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
      # gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
      # gpg:                 aka "Samuel Thibault <sthibault@debian.org>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
      # 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: E61D BB15 D417 2BDE C97E  92D9 DB55 0E89 F0FA 54F3
      
      * remotes/thibault/tags/samuel-thibault:
        slirp: remove QEMU Makefile.objs
        build-sys: link with slirp as an external project
        slirp: add a standalone Makefile
        slirp: move sources to src/ subdirectory
        slirp: use "slirp_" prefix for inet_aton() win32 implementation
        slirp: use libslirp migration code
        slirp: adapt a subset of QEMU vmstate code
        slirp: Mark pieces missing IPv6 support
        slirp: fix big/little endian conversion in ident protocol
        slirp: check sscanf result when emulating ident
        slirp: check for ioctlsocket error and 0-length udp payload.
        slirp: Fix build with gcc 9
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6bbbe16a
    • K
      qcow2 spec: Describe string header extensions · e88153ea
      Kevin Wolf 提交于
      Be more specific about the string representation in header extensions.
      Suggested-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      e88153ea
    • P
      qemu-iotests: Add dependency to qemu-nbd tool · 9c2b28e4
      Philippe Mathieu-Daudé 提交于
      Since a9660664, some iotests use qemu-nbd.
      Add a dependency to build it before using it.
      This fixes:
      
        $ make check-block
          GEN     qemu-img-cmds.h
          CC      qemu-img.o
          LINK    qemu-img
          CC      qemu-io.o
          LINK    qemu-io
          CC      tests/qemu-iotests/socket_scm_helper.o
          LINK    tests/qemu-iotests/socket_scm_helper
        tests/qemu-iotests-quick.sh
        check: qemu-nbd not found
        make: *** [tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      9c2b28e4
    • P
      ahci-test: Add dependency to qemu-img tool · 377213f4
      Philippe Mathieu-Daudé 提交于
      Since the ahci-test uses qemu-img, add a dependency to build it
      before using it.
      This fixes:
      
        $ gmake check-qtest V=1
        QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/ahci-test
        Failed to execute child process "/tmp/qemu-test.19tMRF/qemu-img" (No such file or directory)
        ERROR:tests/libqos/libqos.c:192:mkimg: assertion failed: (ret && !err)
      Reviewed-by: NJohn Snow <jsnow@redhat.com>
      Signed-off-by: NPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      377213f4
    • K
      qemu-iotests: amend with external data file · ac40260d
      Kevin Wolf 提交于
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      ac40260d
    • K
      76b90e23
    • K
      qemu-iotests: Preallocation with external data file · c35896c5
      Kevin Wolf 提交于
      Test that preallocating metadata results in a somewhat larger qcow2
      file, but preallocating data only affects the disk usage of the data
      file and the qcow2 file stays small.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c35896c5