1. 25 Oct, 2017 1 commit
  2. 24 Oct, 2017 4 commits
    • Philippe Mathieu-Daudé's avatar
      tpm: add missing include · 6b287efe
      Philippe Mathieu-Daudé authored
      else file including "sysemu/tpm.h" fails to compile:
      
        In file included from qemu/stubs/tpm.c:2:0:
        qemu/include/sysemu/tpm.h:36:19: error: implicit declaration of function ‘object_resolve_path_type’ [-Werror=implicit-function-declaration]
             Object *obj = object_resolve_path_type("", TYPE_TPM_TIS, NULL);
                           ^~~~~~~~~~~~~~~~~~~~~~~~
      Signed-off-by: 's avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Tested-by: 's avatarRichard W.M. Jones <rjones@redhat.com>
      Signed-off-by: 's avatarStefan Berger <stefanb@linux.vnet.ibm.com>
      6b287efe
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20171023-pull-request' into staging · 3d7196d4
      Peter Maydell authored
      usb: ccid fix.
      
      # gpg: Signature made Mon 23 Oct 2017 09:45:00 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/usb-20171023-pull-request:
        usb-ccid: remove needless migration state code
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
      3d7196d4
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20171023-pull-request' into staging · 9293fcfe
      Peter Maydell authored
      fixes for the fallout of the recent ui and keymap merges.
      
      # gpg: Signature made Mon 23 Oct 2017 09:02:24 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/fixes-20171023-pull-request:
        scripts: don't throw away stderr when checking out git submodules
        ui: add qemu-keymap and shader to .gitignore
        configure: disable qemu-keymap for linux-user qemu
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
      9293fcfe
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/shorne/tags/openrisc-20171021-smp-pr' into staging · a61837da
      Peter Maydell authored
      OpenRISC SMP patchset 20171021
      
      # gpg: Signature made Fri 20 Oct 2017 22:51:16 BST
      # gpg:                using RSA key 0xC3B31C2D5E6627E4
      # gpg: Good signature from "Stafford Horne <shorne@gmail.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: D9C4 7354 AEF8 6C10 3A25  EFF1 C3B3 1C2D 5E66 27E4
      
      * remotes/shorne/tags/openrisc-20171021-smp-pr:
        openrisc: Only kick cpu on timeout, not on update
        openrisc: Initial SMP support
        openrisc/cputimer: Perparation for Multicore
        target/openrisc: Make coreid and numcores variable
        openrisc/ompic: Add OpenRISC Multicore PIC (OMPIC)
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
      a61837da
  3. 23 Oct, 2017 4 commits
  4. 20 Oct, 2017 31 commits