1. 18 4月, 2016 6 次提交
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160418' into staging · ba389950
      Peter Maydell 提交于
      ppc patch queue for 2-16-04-18
      
      Three bugfixe patches for 2.6 here.
      * Two for bad implementation of some of the strong load/store
        instructions
      
      * One for bad migration of the XER register.  This is a regression
        from 2.5, cause by a change in the way we represent at XER during
        runtime.
      
      # gpg: Signature made Mon 18 Apr 2016 06:17:03 BST using RSA key ID 20D9B392
      # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
      # gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
      # gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-2.6-20160418:
        ppc: Fix migration of the XER register
        ppc: Fix the bad exception NIP value and the range check in LSWX
        ppc: Fix the range check in the LSWI instruction
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ba389950
    • P
      Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20160416' into staging · adde0204
      Peter Maydell 提交于
      seccomp branch queue
      
      # gpg: Signature made Sat 16 Apr 2016 19:58:46 BST using RSA key ID 12F8BD2F
      # gpg: Good signature from "Eduardo Otubo (Software Engineer @ ProfitBricks) <eduardo.otubo@profitbricks.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: 1C96 46B6 E1D1 C38A F2EC  3FDE FD0C FF5B 12F8 BD2F
      
      * remotes/otubo/tags/pull-seccomp-20160416:
        seccomp: adding sysinfo system call to whitelist
        seccomp: Whitelist cacheflush since 2.2.0 not 2.2.3
        configure: Enable seccomp sandbox for MIPS
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      adde0204
    • P
      Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160415' into staging · c6c598ca
      Peter Maydell 提交于
      wxx patch queue
      
      # gpg: Signature made Fri 15 Apr 2016 18:36:41 BST using RSA key ID 677450AD
      # gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
      # gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
      # gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD
      
      * remotes/weil/tags/pull-wxx-20160415:
        wxx: Fix broken TCP networking (regression)
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c6c598ca
    • T
      ppc: Fix migration of the XER register · aa378598
      Thomas Huth 提交于
      env->xer only holds the lower bits of the XER register nowadays, the
      SO, OV and CA bits are stored in separate variables (see the function
      cpu_write_xer() for details). Since the migration code currently only
      reads the "xer" variable, the upper bits are lost during migration.
      Fix it by using cpu_read_xer() instead.
      Signed-off-by: NThomas Huth <thuth@redhat.com>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      aa378598
    • T
      ppc: Fix the bad exception NIP value and the range check in LSWX · 537d3e8e
      Thomas Huth 提交于
      The range checks in the LSWX instruction are completely insufficient:
      They do not take the wrap-around case into account, and the check
      "reg < rx" should be "reg <= rx" instead. Fix it by using the new
      lsw_reg_in_range() helper function that is already used for LSWI, too.
      
      Then there is a second problem: In case the INVAL exception is generated,
      the NIP value is wrong, it currently points to the instruction before
      the LSWX instruction. This is because gen_lswx() already decreases the
      NIP value by 4 (to be prepared for page fault exceptions), and
      powerpc_excp() later decreases it again by 4 while handling the program
      exception. So to get this right, we've got to undo the "- 4" from
      gen_lswx() here before calling helper_raise_exception_err().
      Signed-off-by: NThomas Huth <thuth@redhat.com>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      537d3e8e
    • T
      ppc: Fix the range check in the LSWI instruction · afbee712
      Thomas Huth 提交于
      There are two issues: First, the number of registers that are used has
      to be calculated with "(nb + 3) / 4" (i.e. round always up, not down).
      Second, the "start <= ra && (start + nr - 32) > ra" condition for the
      wrap-around case is wrong: It has to be tested with "||" instead of "&&".
      Since we can reuse this check later for the LSWX instruction, let's
      place the fixed code into a helper function, too.
      Signed-off-by: NThomas Huth <thuth@redhat.com>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      afbee712
  2. 17 4月, 2016 3 次提交
  3. 16 4月, 2016 3 次提交
  4. 15 4月, 2016 25 次提交
  5. 14 4月, 2016 3 次提交
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 3e7cac31
      Peter Maydell 提交于
      tpm, vhost, virtio: fixes for 2.6
      
      Minor fixes all over the place.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Thu 14 Apr 2016 14:45:55 BST using RSA key ID D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      
      * remotes/mst/tags/for_upstream:
        hw/virtio/balloon: Replace TARGET_PAGE_SIZE with BALLOON_PAGE_SIZE
        tpm: Fix write to file descriptor function
        tpm: acpi: remove IRQ from TPM's CRS to make Windows not see conflict
        pc: acpi: tpm: add missing MMIO resource to PCI0._CRS
        specs/vhost-user: spelling fix
        specs/vhost-user: improve VHOST_SET_VRING_NUM documentation
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3e7cac31
    • T
      hw/virtio/balloon: Replace TARGET_PAGE_SIZE with BALLOON_PAGE_SIZE · 01310e2a
      Thomas Huth 提交于
      The balloon code currently calls madvise() with TARGET_PAGE_SIZE as
      length parameter. Since the virtio-balloon protocol is always based
      on 4k pages, no matter what the host and guest are using as page size,
      this could cause problems: If TARGET_PAGE_SIZE is bigger than 4k, the
      madvise call also destroys the 4k areas after the current one - which
      might be wrong since the guest did not want free that area yet (in
      case the guest used as smaller MMU page size than the hard-coded
      TARGET_PAGE_SIZE). So to fix this issue, introduce a proper define
      called BALLOON_PAGE_SIZE (which is 4096) to use this as the size
      parameter for the madvise() call instead.
      Signed-off-by: NThomas Huth <thuth@redhat.com>
      Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      01310e2a
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160413-1' into staging · 33e57028
      Peter Maydell 提交于
      virtio-input; live migration support, various bugfixes.
      
      # gpg: Signature made Wed 13 Apr 2016 16:41:27 BST using RSA key ID D3E87138
      # 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>"
      
      * remotes/kraxel/tags/pull-input-20160413-1:
        virtio-input: support absolute axis config in pass-through
        input-linux: refine mouse detection
        virtio-input: fix emulated tablet axis ranges
        virtio-input: add live migration support
        virtio-input: implement pass-through evdev writes
        virtio-input: retrieve EV_LED host config bits
        virtio-input: add missing key mappings
        move const_le{16, 23} to qemu/bswap.h, add comment
        virtio-input: add parenthesis to const_le{16, 32}
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      33e57028