1. 14 6月, 2016 26 次提交
  2. 13 6月, 2016 14 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160613-1' into staging · 2c96c379
      Peter Maydell 提交于
      usb: misc fixes.
      
      # gpg: Signature made Mon 13 Jun 2016 14:09:15 BST
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # 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>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-usb-20160613-1:
        vl: Eliminate usb_enabled()
        pxa2xx: Unconditionally enable USB controller
        hw/usb/dev-network.c: Use ldl_le_p() and stl_le_p()
        usb-host: add special case for bus+addr
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2c96c379
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-2016-06-13-v1' into staging · 55e5c3a2
      Peter Maydell 提交于
      Merge qcrypto-next 2016/06/13 v1
      
      # gpg: Signature made Mon 13 Jun 2016 12:43:22 BST
      # 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/qcrypto-next-2016-06-13-v1:
        crypto: aes: always rename internal symbols
        crypto: assert that qcrypto_hash_digest_len is in range
        crypto: remove temp files on completion of secrets test
        TLS: provide slightly more information when TLS certificate loading fails
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      55e5c3a2
    • M
      crypto: aes: always rename internal symbols · c8d70e59
      Mike Frysinger 提交于
      OpenSSL's libcrypto always defines AES symbols with the same names as
      qemu's local aes code.  This is problematic when enabling at least curl
      as that frequently also uses libcrypto.  It might not be noticed when
      running, but if you try to statically link, everything falls down.
      
      An example snippet:
        LINK  qemu-nbd
      .../libcrypto.a(aes-x86_64.o): In function 'AES_encrypt':
      (.text+0x460): multiple definition of 'AES_encrypt'
      crypto/aes.o:aes.c:(.text+0x670): first defined here
      .../libcrypto.a(aes-x86_64.o): In function 'AES_decrypt':
      (.text+0x9f0): multiple definition of 'AES_decrypt'
      crypto/aes.o:aes.c:(.text+0xb30): first defined here
      .../libcrypto.a(aes-x86_64.o): In function 'AES_cbc_encrypt':
      (.text+0xf90): multiple definition of 'AES_cbc_encrypt'
      crypto/aes.o:aes.c:(.text+0xff0): first defined here
      collect2: error: ld returned 1 exit status
      .../qemu-2.6.0/rules.mak:105: recipe for target 'qemu-nbd' failed
      make: *** [qemu-nbd] Error 1
      
      The aes.h header has redefines already for FreeBSD, but go ahead and
      enable that for everyone since there's no real good reason to not use
      a namespace all the time.
      Signed-off-by: NMike Frysinger <vapier@chromium.org>
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      c8d70e59
    • P
      crypto: assert that qcrypto_hash_digest_len is in range · b35c1f33
      Paolo Bonzini 提交于
      Otherwise unintended results could happen.  For example,
      Coverity reports a division by zero in qcrypto_afsplit_hash.
      While this cannot really happen, it shows that the contract
      of qcrypto_hash_digest_len can be improved.
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      b35c1f33
    • D
      crypto: remove temp files on completion of secrets test · e7ed11f0
      Daniel P. Berrange 提交于
      The secret object tests left some temporary files on disk
      when completing. Ensure they are unlink, and rename them
      to make it more obvious where they come from.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      e7ed11f0
    • A
      TLS: provide slightly more information when TLS certificate loading fails · b7b68166
      Alex Bligh 提交于
      Give slightly more information when certification loading fails.
      Rather than have no information, you now get gnutls's only slightly
      less unhelpful error messages.
      Signed-off-by: NAlex Bligh <alex@alex.org.uk>
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      b7b68166
    • E
      vl: Eliminate usb_enabled() · 4bcbe0b6
      Eduardo Habkost 提交于
      This wrapper for machine_usb(current_machine) is not necessary,
      replace all usages of usb_enabled() with machine_usb().
      
      Cc: Peter Maydell <peter.maydell@linaro.org>
      Cc: "Michael S. Tsirkin" <mst@redhat.com>
      Cc: Alexander Graf <agraf@suse.de>
      Cc: qemu-arm@nongnu.org
      Cc: qemu-ppc@nongnu.org
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Reviewed-by: NMarcel Apfelbaum <marcel@redhat.com>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      Message-id: 1465419025-21519-3-git-send-email-ehabkost@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      4bcbe0b6
    • E
      pxa2xx: Unconditionally enable USB controller · c92cfba8
      Eduardo Habkost 提交于
      Simplify initialization logic by removing the usb_enabled()
      check. The USB controller is part of the SoC, so it doesn't make
      sense to create a system where it is not present.
      
      Cc: Peter Maydell <peter.maydell@linaro.org>
      Cc: Andrzej Zaborowski <balrogg@gmail.com>
      Cc: qemu-arm@nongnu.org,
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-id: 1465419025-21519-2-git-send-email-ehabkost@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      c92cfba8
    • P
      hw/usb/dev-network.c: Use ldl_le_p() and stl_le_p() · ec9125bc
      Peter Maydell 提交于
      Use stl_le_p() and ldl_le_p() to read and write data from
      buffers, rather than using pointer casts and cpu_to_le32()
      for writes and le32_to_cpup() for reads. This:
       * avoids lots of casts
       * works even if the buffer isn't as aligned as the host would like
       * avoids using the *_to_cpup() functions which we want to get rid of
      
      Note that there may still be some places where a pointer from the
      guest is cast to a pointer to a host structure; these would also
      have to be changed for the device to work on a host CPU which
      enforces alignment restrictions.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 1465573077-29221-1-git-send-email-peter.maydell@linaro.org
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      ec9125bc
    • P
      Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160613-tag' into staging · 8fdf0387
      Peter Maydell 提交于
      Xen 2016/06/13
      
      # gpg: Signature made Mon 13 Jun 2016 11:53:18 BST
      # gpg:                using RSA key 0x894F8F4870E1AE90
      # gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
      # Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90
      
      * remotes/sstabellini/tags/xen-20160613-tag:
        Introduce "xen-load-devices-state"
        exec: Fix qemu_ram_block_from_host for Xen
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      8fdf0387
    • G
      usb-host: add special case for bus+addr · e058fa2d
      Gerd Hoffmann 提交于
      This patch changes usb-host behavior in case we hostbus= and hostaddr=
      properties are used to identify the usb device in question.  Instead of
      adding the device to the hotplug watchlist we try to open directly using
      the given bus number and device address.
      
      Putting a device specified by hostaddr to the hotplug watchlist isn't
      a great idea as the address isn't a fixed property.  It changes every
      time the device is plugged in.  So considering this case as "use the
      device at bus:addr _now_" is more sane.  Also usb-host will throw errors
      in case it can't initialize the host device.
      
      Note: For devices on the hotplug watchlist (hostport or vendorid or
      productid specified) qemu continues to ignore errors and keeps
      monitoring the usb bus to see if the device eventually shows up.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Message-id: 1464945175-28939-1-git-send-email-kraxel@redhat.com
      e058fa2d
    • W
      Introduce "xen-load-devices-state" · 88c16567
      Wen Congyang 提交于
      Introduce a "xen-load-devices-state" QAPI command that can be used to
      load the state of all devices, but not the RAM or the block devices of
      the VM.
      
      We only have hmp commands savevm/loadvm, and qmp commands
      xen-save-devices-state.
      
      We use this new command for COLO:
      1. suspend both primary vm and secondary vm
      2. sync the state
      3. resume both primary vm and secondary vm
      
      In such case, we need to update all devices' state in any time.
      Signed-off-by: NWen Congyang <wency@cn.fujitsu.com>
      Signed-off-by: NChanglong Xie <xiecl.fnst@cn.fujitsu.com>
      Reviewed-by: NAnthony PERARD <anthony.perard@citrix.com>
      Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NStefano Stabellini <sstabellini@kernel.org>
      88c16567
    • A
      exec: Fix qemu_ram_block_from_host for Xen · d6b6aec4
      Anthony PERARD 提交于
      Since f615f396 (exec: remove ram_addr argument from
      qemu_ram_block_from_host), migration under Xen is likely to fail, with a
      SEGV of QEMU. But the commit only reveal a bug with the calculation of
      the offset value in qemu_ram_block_from_host().
      
      This patch calculates the offset from the ram_addr as
      qemu_ram_addr_from_host() will later calculate the ram_addr from the
      offset.
      Signed-off-by: NAnthony PERARD <anthony.perard@citrix.com>
      Acked-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NStefano Stabellini <sstabellini@kernel.org>
      d6b6aec4
    • P
      Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160611' into staging · da2fdd0b
      Peter Maydell 提交于
      TB hashing improvements
      
      # gpg: Signature made Sun 12 Jun 2016 01:12:50 BST
      # gpg:                using RSA key 0xAD1270CC4DD0279B
      # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
      # gpg:                 aka "Richard Henderson <rth@redhat.com>"
      # gpg:                 aka "Richard Henderson <rth@twiddle.net>"
      # Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B
      
      * remotes/rth/tags/pull-tcg-20160611:
        translate-all: add tb hash bucket info to 'info jit' dump
        tb hash: track translated blocks with qht
        qht: add test-qht-par to invoke qht-bench from 'check' target
        qht: add qht-bench, a performance benchmark
        qht: add test program
        qht: QEMU's fast, resizable and scalable Hash Table
        qdist: add test program
        qdist: add module to represent frequency distributions of data
        tb hash: hash phys_pc, pc, and flags with xxhash
        exec: add tb_hash_func5, derived from xxhash
        qemu-thread: add simple test-and-set spinlock
        include/processor.h: define cpu_relax()
        seqlock: rename write_lock/unlock to write_begin/end
        seqlock: remove optional mutex
        compiler.h: add QEMU_ALIGNED() to enforce struct alignment
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      da2fdd0b