1. 14 12月, 2018 3 次提交
    • J
      block: adding lzfse decompressing support as a module. · c13e80d7
      Julio Faracco 提交于
      QEMU dmg support includes zlib and bzip2, but it does not contains lzfse
      support. This commit adds the source file to extend compression support
      for new DMGs.
      Signed-off-by: NJulio Faracco <jcfaracco@gmail.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c13e80d7
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging · d8d5fefd
      Peter Maydell 提交于
      Merge crypto patches 2018/12/12
      
       - Fix documentation about default LUKS algorithms
       - Support for multi-threaded block crypto
      
      # gpg: Signature made Wed 12 Dec 2018 11:21:52 GMT
      # gpg:                using RSA key BE86EBB415104FDF
      # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
      # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
      # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF
      
      * remotes/berrange/tags/qcrypto-next-pull-request:
        crypto: support multiple threads accessing one QCryptoBlock
        crypto/block: introduce qcrypto_block_*crypt_helper functions
        crypto/block: rename qcrypto_block_*crypt_helper
        crypto/block: refactor qcrypto_block_*crypt_helper functions
        crypto/block-luks: fix memory leak in qcrypto_block_luks_create
        crypto: Fix defaults in QCryptoBlockCreateOptionsLUKS
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d8d5fefd
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · 2d894e48
      Peter Maydell 提交于
      Pull request
      
      Minor tracing improvements.
      
      # gpg: Signature made Wed 12 Dec 2018 10:15:30 GMT
      # gpg:                using RSA key 9CA4ABB381AB73C8
      # 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: simple style changes
        tracetool: Include thread id information in log backend
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2d894e48
  2. 13 12月, 2018 5 次提交
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-12-12' into staging · c3ec0fa1
      Peter Maydell 提交于
      Monitor patches for 2018-12-12
      
      # gpg: Signature made Wed 12 Dec 2018 10:08:15 GMT
      # gpg:                using RSA key 3870B400EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653
      
      * remotes/armbru/tags/pull-monitor-2018-12-12:
        tests: add oob functional test for test-qmp-cmds
        Revert "tests: Add parameter to qtest_init_without_qmp_handshake"
        monitor: Remove "x-oob", offer capability "oob" unconditionally
        monitor: Suspend monitor instead dropping commands
        monitor: avoid potential dead-lock when cleaning up
        monitor: prevent inserting new monitors after cleanup
        colo: check chardev can switch context
        monitor: check if chardev can switch gcontext for OOB
        char: add a QEMU_CHAR_FEATURE_GCONTEXT flag
        monitor: accept chardev input from iothread
        monitor: inline ambiguous helper functions
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c3ec0fa1
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181212' into staging · 6145a6d8
      Peter Maydell 提交于
      s390x patches for 4.0:
      - add 4.0 machine type
      - various fixes and small changes
      
      # gpg: Signature made Wed 12 Dec 2018 09:52:04 GMT
      # 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-20181212:
        hw/s390x/virtio-ccw.c: Don't take address of fields in packed structs
        vfio-ap: flag as compatible with balloon
        s390x/tod: Properly stop the KVM TOD while the guest is not running
        s390/MAINTAINERS: Add Halil as kvm and machine maintainer
        s390x: introduce 4.0 compat machine
        s390x/zpci: drop msix.available
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6145a6d8
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · b39c027d
      Peter Maydell 提交于
      Pull request
      
      Minor virtio-blk fixes.
      
      # gpg: Signature made Wed 12 Dec 2018 09:50:17 GMT
      # gpg:                using RSA key 9CA4ABB381AB73C8
      # 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:
        virtio-blk: fix comment for virtio_blk_rw_complete as nalloc is initially -1
        virtio-blk: rename iov to out_iov in virtio_blk_handle_request()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b39c027d
    • P
      Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-12-04-1' into staging · 41d8452d
      Peter Maydell 提交于
      Merge tpm 2018/12/04 v1
      
      # gpg: Signature made Tue 04 Dec 2018 15:25:52 GMT
      # gpg:                using RSA key 75AD65802A0B4211
      # gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.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: B818 B9CA DF90 89C2 D5CE  C66B 75AD 6580 2A0B 4211
      
      * remotes/stefanberger/tags/pull-tpm-2018-12-04-1:
        tpm: Make sure the locality received from backend is valid
        tpm: Make sure new locality passed to tpm_tis_prep_abort() is valid
        tpm: Remove unused locty parameter from tpm_tis_abort()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      41d8452d
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging · 8be76cf1
      Peter Maydell 提交于
      x86 queue, 2018-12-11
      
      * New CPU features: MOVDIRI, MOVDIR64B (Liu Jingqi);
        STIBP (Eduardo Habkost)
      * Fix clang build warning (Peter Maydell)
      
      # gpg: Signature made Tue 11 Dec 2018 20:52:56 GMT
      # gpg:                using RSA key 2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/x86-next-pull-request:
        i386: Add "stibp" flag name
        target/i386/kvm.c: Don't mark cpuid_data as QEMU_PACKED
        x86/cpu: Enable MOVDIR64B cpu feature
        x86/cpu: Enable MOVDIRI cpu feature
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      8be76cf1
  3. 12 12月, 2018 32 次提交