1. 17 4月, 2018 8 次提交
  2. 16 4月, 2018 8 次提交
  3. 15 4月, 2018 1 次提交
  4. 13 4月, 2018 1 次提交
  5. 12 4月, 2018 2 次提交
  6. 11 4月, 2018 7 次提交
    • P
      Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180411' into staging · 6523eaca
      Peter Maydell 提交于
      Handle read-modify-write i/o with icount
      
      # gpg: Signature made Wed 11 Apr 2018 00:07:23 BST
      # gpg:                using RSA key 64DF38E8AF7E215F
      # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
      # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F
      
      * remotes/rth/tags/pull-tcg-20180411:
        icount: fix cpu_restore_state_from_tb for non-tb-exit cases
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6523eaca
    • P
      Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.12-pull-request' into staging · 675608cb
      Peter Maydell 提交于
      # gpg: Signature made Tue 10 Apr 2018 17:00:19 BST
      # gpg:                using RSA key F30C38BD3F2FBE3C
      # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
      # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
      # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
      # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
      
      * remotes/vivier2/tags/linux-user-for-2.12-pull-request:
        linux-user: implement HWCAP bits on MIPS
        linux-user: add microblaze/microblazeel magic numbers in qemu-binfmt-conf.sh
        linux-user: fix microblaze get_sp_from_cpustate()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      675608cb
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · 9d2a0906
      Peter Maydell 提交于
      Block layer patches
      
      # gpg: Signature made Tue 10 Apr 2018 15:53:08 BST
      # gpg:                using RSA key 7F09B272C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      
      * remotes/kevin/tags/for-upstream:
        qemu-iotests: update 185 output
        commit/stream: Reset delay_ns
        qemu-iotests: Remove _supported_fmt dmg
        iotests: blacklist bochs and cloop for 205 and 208
        iotests.py: improve verify_image_format helper
        hw/block/pflash_cfi: fix off-by-one error
        iotests.py: support unsupported_fmts in main()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9d2a0906
    • P
      icount: fix cpu_restore_state_from_tb for non-tb-exit cases · afd46fca
      Pavel Dovgalyuk 提交于
      In icount mode, instructions that access io memory spaces in the middle
      of the translation block invoke TB recompilation.  After recompilation,
      such instructions become last in the TB and are allowed to access io
      memory spaces.
      
      When the code includes instruction like i386 'xchg eax, 0xffffd080'
      which accesses APIC, QEMU goes into an infinite loop of the recompilation.
      
      This instruction includes two memory accesses - one read and one write.
      After the first access, APIC calls cpu_report_tpr_access, which restores
      the CPU state to get the current eip.  But cpu_restore_state_from_tb
      resets the cpu->can_do_io flag which makes the second memory access invalid.
      Therefore the second memory access causes a recompilation of the block.
      Then these operations repeat again and again.
      
      This patch moves resetting cpu->can_do_io flag from
      cpu_restore_state_from_tb to cpu_loop_exit* functions.
      
      It also adds a parameter for cpu_restore_state which controls restoring
      icount.  There is no need to restore icount when we only query CPU state
      without breaking the TB.  Restoring it in such cases leads to the
      incorrect flow of the virtual time.
      
      In most cases new parameter is true (icount should be recalculated).
      But there are two cases in i386 and openrisc when the CPU state is only
      queried without the need to break the TB.  This patch fixes both of
      these cases.
      Signed-off-by: NPavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
      Message-Id: <20180409091320.12504.35329.stgit@pasha-VirtualBox>
      [rth: Make can_do_io setting unconditional; move from cpu_exec;
      make cpu_loop_exit_{noexc,restore} call cpu_loop_exit.]
      Signed-off-by: NRichard Henderson <richard.henderson@linaro.org>
      afd46fca
    • P
      Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180410a' into staging · ac4ba87a
      Peter Maydell 提交于
      Migration reversion pull for 2.12
      
      One to revert after we decided it needs some more thinking.
      
      # gpg: Signature made Tue 10 Apr 2018 16:02:17 BST
      # gpg:                using RSA key 0516331EBC5BFDE7
      # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
      # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7
      
      * remotes/dgilbert/tags/pull-migration-20180410a:
        Revert "migration: Don't activate block devices if using -S"
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ac4ba87a
    • P
      Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-04-10' into staging · 26d6a7c8
      Peter Maydell 提交于
      qapi patches for 2018-04-10
      
      - Peter Xu: iotests: fix wait_until_completed()
      - Peter Xu: iothread: workaround glib bug which hangs qmp-test
      - Peter Xu: monitor: bind dispatch bh to iohandler context
      
      # gpg: Signature made Tue 10 Apr 2018 14:15:09 BST
      # gpg:                using RSA key A7A16B4A2527436A
      # gpg: Good signature from "Eric Blake <eblake@redhat.com>"
      # gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
      # gpg:                 aka "[jpeg image of size 6874]"
      # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A
      
      * remotes/ericb/tags/pull-qapi-2018-04-10:
        monitor: bind dispatch bh to iohandler context
        iothread: workaround glib bug which hangs qmp-test
        iotests: fix wait_until_completed()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      26d6a7c8
    • J
      linux-user: implement HWCAP bits on MIPS · 46a1ee4f
      James Cowgill 提交于
      Add support for the two currently defined HWCAP bits on MIPS - R6 and
      MSA.
      
      Buglink: https://bugs.launchpad.net/qemu/+bug/1754372Signed-off-by: NJames Cowgill <james.cowgill@mips.com>
      Reviewed-by: NLaurent Vivier <laurent@vivier.eu>
      Message-Id: <20180315151348.6451-1-james.cowgill@mips.com>
      Signed-off-by: NLaurent Vivier <laurent@vivier.eu>
      46a1ee4f
  7. 10 4月, 2018 13 次提交
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180410' into staging · 69550301
      Peter Maydell 提交于
      ppc patch queue 2018-04-10
      
      Here's a rather late pull request with a handful of fixes for 2.12.
      These have been blocked for some time, because I wasn't able to
      complete my usual test set due to the SCSI problem fixed in 37c51741
      "scsi-disk: Don't enlarge min_io_size to max_io_size".
      
      Since we're in hard freeze, these are all bugfixes.  Most are also
      regressions, although in one case it's only a "regression" because a
      longstanding bug has been exposed by a new machine type (sam460ex) in
      the testcases.  There are also a couple of sam460ex fixes that aren't
      regressions since the board didn't exist before.  On the flipside
      though, they're low risk because they only touch board specific code
      for a board that doesn't exist in any released version.
      
      # gpg: Signature made Tue 10 Apr 2018 08:13:52 BST
      # gpg:                using RSA key 6C38CACA20D9B392
      # 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:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-2.12-20180410:
        roms/u-boot-sam460ex: Change to qemu git mirror and update
        sam460ex: Fix timer frequency and clock multipliers
        tests/boot-serial: Test the sam460ex board
        spapr: Initialize reserved areas list in FDT in H_CAS handler
        target/ppc: Fix backwards migration of msr_mask
        hw/misc/macio: Fix crash when listing device properties of macio device
        target/ppc: Initialize lazy_tlb_flush correctly
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      69550301
    • L
      linux-user: add microblaze/microblazeel magic numbers in qemu-binfmt-conf.sh · 947aeab3
      Laurent Vivier 提交于
      Signed-off-by: NLaurent Vivier <laurent@vivier.eu>
      Message-Id: <20180409115212.875-2-laurent@vivier.eu>
      947aeab3
    • L
      linux-user: fix microblaze get_sp_from_cpustate() · a31e7605
      Laurent Vivier 提交于
      get_sigframe() uses regs[1] and this is actual SP.
      Signed-off-by: NLaurent Vivier <laurent@vivier.eu>
      Message-Id: <20180409115212.875-1-laurent@vivier.eu>
      a31e7605
    • S
      qemu-iotests: update 185 output · c1de5696
      Stefan Hajnoczi 提交于
      Commit 4486e89c ("vl: introduce
      vm_shutdown()") added a bdrv_drain_all() call.  As a side-effect of the
      drain operation the block job iterates one more time than before.  The
      185 output no longer matches and the test is failing now.
      
      It may be possible to avoid the superfluous block job iteration, but
      that type of patch is not suitable late in the QEMU 2.12 release cycle.
      
      This patch simply updates the 185 output file.  The new behavior is
      correct, just not optimal, so make the test pass again.
      
      Fixes: 4486e89c ("vl: introduce vm_shutdown()")
      Cc: Kevin Wolf <kwolf@redhat.com>
      Cc: QingFeng Hao <haoqf@linux.vnet.ibm.com>
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      Reviewed-by: NQingFeng Hao <haoqf@linux.vnet.ibm.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c1de5696
    • K
      commit/stream: Reset delay_ns · 2fe4bba1
      Kevin Wolf 提交于
      Streaming and the commit block job only want to apply throttling when
      they actually copied data instead of skipping it, so they made the
      calculation of delay_ns conditional. However, delay_ns isn't reset when
      skipping some sectors, so instead of not waiting, the old delay is
      applied again.
      
      Properly reset delay_ns where needed.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      2fe4bba1
    • K
      qemu-iotests: Remove _supported_fmt dmg · ad53ea42
      Kevin Wolf 提交于
      qemu-iotests doesn't support dmg, and the dmg block driver doesn't
      support image creation. Two test cases declare dmg as supported, but
      that's obviously wrong for both reasons. Remove the declaration.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      ad53ea42
    • V
      iotests: blacklist bochs and cloop for 205 and 208 · e819edd0
      Vladimir Sementsov-Ogievskiy 提交于
      Blacklist these formats, as they don't support image creation, as they
      say:
          > ./qemu-img create -f bochs x 1m
          qemu-img: x: Format driver 'bochs' does not support image creation
      
          > ./qemu-img create -f cloop x 1m
          qemu-img: x: Format driver 'cloop' does not support image creation
      Signed-off-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      e819edd0
    • V
      iotests.py: improve verify_image_format helper · f48351d2
      Vladimir Sementsov-Ogievskiy 提交于
      Support "generic" formats like in bash tests with their
         _supported_fmt generic
      The test, supporting "generic" formats will run if IMGFMT_GENERIC =
      true, which is default, except for bochs and cloop. However, you can
      use verify_image_format(['generic', 'bochs']), which will run for all
      except cloop (for this moment).
      
      Also, add an assert (we don't want set both arguments) and remove
      duplication.
      Signed-off-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      f48351d2
    • P
      hw/block/pflash_cfi: fix off-by-one error · 07c13a71
      Philippe Mathieu-Daudé 提交于
      ASAN reported:
      
          hw/block/pflash_cfi02.c:245:33: runtime error: index 82 out of bounds for type 'uint8_t [82]'
      
      Since the 'cfi_len' member is not used, remove it to keep the code safer.
      
      Cc: qemu-stable@nongnu.org
      Reported-by: AddressSanitizer
      Signed-off-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      07c13a71
    • V
    • D
      Revert "migration: Don't activate block devices if using -S" · a18a73d7
      Dr. David Alan Gilbert 提交于
      This reverts commit 0746a926.
      Discussion with kwolf suggests this is actually an API change that
      we need to gate on a capability.  Push to 2.13.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      a18a73d7
    • P
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180410' into staging · f41ee66d
      Peter Maydell 提交于
      target-arm queue:
       * fpu: Fix rounding mode for floatN_to_uintM_round_to_zero
       * tcg: Fix guest state corruption when running 64-bit Arm
         guests on a 32-bit host (especially when using icount)
       * linux-user/signal.c: Ensure AArch64 signal frame isn't too small
       * cpus.c: ensure running CPU recalculates icount deadlines on timer expiry
       * target/arm: Report unsupported MPU region sizes more clearly
       * hw/arm/fsl-imx: Fix introspection problem with fsl-imx6 and fsl-imx7
       * hw/arm/allwinner-a10: Do not use nd_table in instance_init function
       * hw/sd/bcm2835_sdhost: Don't raise spurious interrupts
       * hw/sd/bcm2835_sdhost: Add tracepoints
       * target-arm: Check undefined opcodes for SWP in A32 decoder
       * hw/arm/integratorcp: Don't do things that could be fatal in the instance_init
       * hw/arm: Allow manually specified /psci node
      
      # gpg: Signature made Tue 10 Apr 2018 13:16:12 BST
      # gpg:                using RSA key 3C2525ED14360CDE
      # 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-20180410:
        fpu: Fix rounding mode for floatN_to_uintM_round_to_zero
        tcg: Introduce tcg_set_insn_start_param
        linux-user/signal.c: Ensure AArch64 signal frame isn't too small
        cpus.c: ensure running CPU recalculates icount deadlines on timer expiry
        target/arm: Report unsupported MPU region sizes more clearly
        hw/arm/fsl-imx: Fix introspection problem with fsl-imx6 and fsl-imx7
        hw/arm/allwinner-a10: Do not use nd_table in instance_init function
        hw/sd/bcm2835_sdhost: Don't raise spurious interrupts
        hw/sd/bcm2835_sdhost: Add tracepoints
        target-arm: Check undefined opcodes for SWP in A32 decoder
        hw/arm/integratorcp: Don't do things that could be fatal in the instance_init
        hw/arm: Allow manually specified /psci node
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f41ee66d
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into staging · df6378eb
      Peter Maydell 提交于
      configure: don't warn on old sdl/gtk versions if disabled.
      keymap + gtk fixes.
      
      # gpg: Signature made Tue 10 Apr 2018 10:23:37 BST
      # gpg:                using RSA key 4CB6D8EED3E87138
      # 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/ui-20180410-pull-request:
        configure: don't warn SDL abi if disabled
        configure: don't warn GTK if disabled
        gtk: drop pointless code from gd_window_close
        ui: fix keymap detection under Xwayland
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      df6378eb