1. 25 1月, 2017 1 次提交
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170124' into staging · a9e40460
      Peter Maydell 提交于
      Two s390x fixes: One for the kvm.c build failure, and one for a bug
      that might cause random guest crashes with zeroed out pages on host
      kernels with working cmma (< 4.6 and likely >= 4.10).
      
      # gpg: Signature made Tue 24 Jan 2017 15:00:50 GMT
      # gpg:                using RSA key 0xDECF6B93C6F02FAF
      # gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
      # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF
      
      * remotes/cohuck/tags/s390x-20170124:
        s390x/kvm: fix cmma reset for KVM
        s390x/kvm: include hw_accel.h instead of kvm.h
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a9e40460
  2. 24 1月, 2017 38 次提交
  3. 23 1月, 2017 1 次提交
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' into staging · 3879284d
      Peter Maydell 提交于
      Merge io/ 2017-01-23
      
      # gpg: Signature made Mon 23 Jan 2017 15:56:14 GMT
      # gpg:                using RSA key 0xBE86EBB415104FDF
      # 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/pull-qio-2017-01-23-2:
        io: introduce a DNS resolver API
        io: remove Error parameter from QIOTask thread worker
        io: change the QIOTask callback signature
        io: add ability to associate an error with a task
        io: add ability to associate an opaque "result" with with a task
        io: fix typo in docs for QIOTask
        io: stop incrementing reference in qio_task_get_source
        sockets: add ability to disable DNS resolution for InetSocketAddress
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3879284d