1. 18 7月, 2017 5 次提交
    • P
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170717' into staging · 6c459156
      Peter Maydell 提交于
      target-arm queue:
       * new model of the ARM MPS2/MPS2+ FPGA based development board
       * clean up DISAS_* exit conditions and fix various regressions
         since commits e75449a3 8a6b28c7 (in particular including
         ones which broke OP-TEE guests)
       * make Cortex-M3 and M4 correctly default to 8 PMSA regions
      
      # gpg: Signature made Mon 17 Jul 2017 13:43:45 BST
      # gpg:                using RSA key 0x3C2525ED14360CDE
      # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
      # gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
      # gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
      # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE
      
      * remotes/pmaydell/tags/pull-target-arm-20170717:
        MAINTAINERS: Add entries for MPS2 board
        hw/arm/mps2: Add ethernet
        hw/arm/mps2: Add SCC
        hw/misc/mps2_scc: Implement MPS2 Serial Communication Controller
        hw/arm/mps2: Add timers
        hw/char/cmsdk-apb-timer: Implement CMSDK APB timer device
        hw/arm/mps2: Add UARTs
        hw/char/cmsdk-apb-uart.c: Implement CMSDK APB UART
        hw/arm/mps2: Implement skeleton mps2-an385 and mps2-an511 board models
        target/arm: use DISAS_EXIT for eret handling
        target/arm: use gen_goto_tb for ISB handling
        target/arm/translate: ensure gen_goto_tb sets exit flags
        target/arm/translate.h: expand comment on DISAS_EXIT
        target/arm/translate: make DISAS_UPDATE match declared semantics
        include/exec/exec-all: document common exit conditions
        target/arm: Make Cortex-M3 and M4 default to 8 PMSA regions
        qdev: support properties which don't set a default value
        qdev-properties.h: Explicitly set the default value for arraylen properties
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6c459156
    • P
      Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · a778cd56
      Peter Maydell 提交于
      # gpg: Signature made Mon 17 Jul 2017 13:17:17 BST
      # gpg:                using RSA key 0xEF04965B398D6211
      # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.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: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211
      
      * remotes/jasowang/tags/net-pull-request:
        virtio-net: fix offload ctrl endian
        virtion-net: Prefer is_power_of_2()
        docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header
        net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
        net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare
        net/colo.c: Add vnet packet parse feature in colo-proxy
        net/colo-compare.c: Make colo-compare support vnet_hdr_len
        net/colo-compare.c: Introduce parameter for compare_chr_send()
        net/colo.c: Make vnet_hdr_len as packet property
        net/filter-mirror.c: Add new option to enable vnet support for filter-redirector
        net/filter-mirror.c: Make filter mirror support vnet support.
        net/filter-mirror.c: Introduce parameter for filter_send()
        net/net.c: Add vnet_hdr support in SocketReadState
        net: Add vnet_hdr_len arguments in NetClientState
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a778cd56
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · 5a477a78
      Peter Maydell 提交于
      # gpg: Signature made Mon 17 Jul 2017 13:11:17 BST
      # gpg:                using RSA key 0x9CA4ABB381AB73C8
      # 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: update old trace events in docs
        trace: [trivial] Statically enable all guest events
        trace: [tcg, trivial] Re-align generated code
        trace: [tcg] Do not generate TCG code to trace dynamically-disabled events
        exec: [tcg] Use different TBs according to the vCPU's dynamic tracing state
        trace: [tcg] Delay changes to dynamic state when translating
        trace: Allocate cpu->trace_dstate in place
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5a477a78
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20170717-pull-request' into staging · ca4e667d
      Peter Maydell 提交于
      ehci fix for 2.10
      
      # gpg: Signature made Mon 17 Jul 2017 10:40: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-20170717-pull-request:
        ehci: add sanity check for maxframes
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ca4e667d
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/vga-20170717-pull-request' into staging · df55c7e8
      Peter Maydell 提交于
      virtio-gpu migration fix for 2.10
      
      # gpg: Signature made Mon 17 Jul 2017 10:41:49 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/vga-20170717-pull-request:
        virtio-gpu: skip update cursor in post_load if we don't have one
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      df55c7e8
  2. 17 7月, 2017 35 次提交