1. 16 8月, 2018 25 次提交
  2. 15 8月, 2018 15 次提交
    • P
      Merge remote-tracking branch 'remotes/famz/tags/block-and-testing-pull-request' into staging · 1d746ee9
      Peter Maydell 提交于
      Block and testing patches for 3.1
      
      - aio fixes by me
      - nvme fixes by Paolo and me
      - test improvements by Peter, Phil and me
      
      # gpg: Signature made Wed 15 Aug 2018 04:11:43 BST
      # gpg:                using RSA key CA35624C6A9171C6
      # gpg: Good signature from "Fam Zheng <famz@redhat.com>"
      # Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6
      
      * remotes/famz/tags/block-and-testing-pull-request:
        aio-posix: Improve comment around marking node deleted
        tests/vm: Add vm-build-all/vm-clean-all in help text
        tests/vm: Use make's --output-sync option
        tests/vm: Bump guest RAM up from 2G to 4G
        tests/vm: Propagate V=1 down into the make inside the VM
        tests/vm: Pass the jobs parallelism setting to 'make check'
        tests: vm: Add vm-clean-all
        tests: Add centos VM testing
        tests: Allow overriding archive path with SRC_ARCHIVE
        tests: Add an option for snapshot (default: off)
        docker: Install more packages in centos7
        aio: Do aio_notify_accept only during blocking aio_poll
        aio-posix: Don't count ctx->notifier as progress when polling
        nvme: simplify plug/unplug
        nvme: Fix nvme_init error handling
        tests/vm: Add flex and bison to the vm image
        tests/vm: Only use -cpu 'host' if KVM is available
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      1d746ee9
    • P
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180814' into staging · 48a539df
      Peter Maydell 提交于
      target-arm queue:
       * Implement more of ARMv6-M support
       * Support direct execution from non-RAM regions;
         use this to implmeent execution from small (<1K) MPU regions
       * GICv2: implement the virtualization extensions
       * support a virtualization-capable GICv2 in the virt and
         xlnx-zynqmp boards
       * arm: Fix return code of arm_load_elf() so we can detect
         failure to load the file correctly
       * Implement HCR_EL2.TGE ("trap general exceptions") bit
       * Implement tailchaining for M profile cores
       * Fix bugs in SVE compare, saturating add/sub, WHILE, MOVZ
      
      # gpg: Signature made Tue 14 Aug 2018 17:23:38 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-20180814: (45 commits)
        target/arm: Fix typo in helper_sve_movz_d
        target/arm: Reorganize SVE WHILE
        target/arm: Fix typo in do_sat_addsub_64
        target/arm: Fix sign of sve_cmpeq_ppzw/sve_cmpne_ppzw
        target/arm: Implement tailchaining for M profile cores
        target/arm: Restore M-profile CONTROL.SPSEL before any tailchaining
        target/arm: Initialize exc_secure correctly in do_v7m_exception_exit()
        target/arm: Improve exception-taken logging
        target/arm: Treat SCTLR_EL1.M as if it were zero when HCR_EL2.TGE is set
        target/arm: Provide accessor functions for HCR_EL2.{IMO, FMO, AMO}
        target/arm: Honour HCR_EL2.TGE when raising synchronous exceptions
        target/arm: Honour HCR_EL2.TGE and MDCR_EL2.TDE in debug register access checks
        target/arm: Mask virtual interrupts if HCR_EL2.TGE is set
        arm: Fix return code of arm_load_elf
        arm/virt: Add support for GICv2 virtualization extensions
        xlnx-zynqmp: Improve GIC wiring and MMIO mapping
        intc/arm_gic: Improve traces
        intc/arm_gic: Implement maintenance interrupt generation
        intc/arm_gic: Implement gic_update_virt() function
        intc/arm_gic: Implement the virtual interface registers
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      48a539df
    • M
      monitor: fix oob command leak · cb9ec42f
      Marc-André Lureau 提交于
      Spotted by ASAN, during make check...
      
      Direct leak of 40 byte(s) in 1 object(s) allocated from:
          #0 0x7f8e27262c48 in malloc (/lib64/libasan.so.5+0xeec48)
          #1 0x7f8e26a5f3c5 in g_malloc (/lib64/libglib-2.0.so.0+0x523c5)
          #2 0x555ab67078a8 in qstring_from_str /home/elmarco/src/qq/qobject/qstring.c:67
          #3 0x555ab67071e4 in qstring_new /home/elmarco/src/qq/qobject/qstring.c:24
          #4 0x555ab6713fbf in qstring_from_escaped_str /home/elmarco/src/qq/qobject/json-parser.c:144
          #5 0x555ab671738c in parse_literal /home/elmarco/src/qq/qobject/json-parser.c:506
          #6 0x555ab67179c3 in parse_value /home/elmarco/src/qq/qobject/json-parser.c:569
          #7 0x555ab6715123 in parse_pair /home/elmarco/src/qq/qobject/json-parser.c:306
          #8 0x555ab6715483 in parse_object /home/elmarco/src/qq/qobject/json-parser.c:357
          #9 0x555ab671798b in parse_value /home/elmarco/src/qq/qobject/json-parser.c:561
          #10 0x555ab6717a6b in json_parser_parse_err /home/elmarco/src/qq/qobject/json-parser.c:592
          #11 0x555ab4fd4dcf in handle_qmp_command /home/elmarco/src/qq/monitor.c:4257
          #12 0x555ab6712c4d in json_message_process_token /home/elmarco/src/qq/qobject/json-streamer.c:105
          #13 0x555ab67e01e2 in json_lexer_feed_char /home/elmarco/src/qq/qobject/json-lexer.c:323
          #14 0x555ab67e0af6 in json_lexer_feed /home/elmarco/src/qq/qobject/json-lexer.c:373
          #15 0x555ab6713010 in json_message_parser_feed /home/elmarco/src/qq/qobject/json-streamer.c:124
          #16 0x555ab4fd58ec in monitor_qmp_read /home/elmarco/src/qq/monitor.c:4337
          #17 0x555ab6559df2 in qemu_chr_be_write_impl /home/elmarco/src/qq/chardev/char.c:175
          #18 0x555ab6559e95 in qemu_chr_be_write /home/elmarco/src/qq/chardev/char.c:187
          #19 0x555ab6560127 in fd_chr_read /home/elmarco/src/qq/chardev/char-fd.c:66
          #20 0x555ab65d9c73 in qio_channel_fd_source_dispatch /home/elmarco/src/qq/io/channel-watch.c:84
          #21 0x7f8e26a598ac in g_main_context_dispatch (/lib64/libglib-2.0.so.0+0x4c8ac)
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-Id: <20180809114417.28718-4-marcandre.lureau@redhat.com>
      [Screwed up in commit b2731456]
      Cc: qemu-stable@nongnu.org
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      cb9ec42f
    • M
      tests: fix crumple/recursive leak · 42478dac
      Marc-André Lureau 提交于
      Spotted by ASAN:
      
      =================================================================
      ==27907==ERROR: LeakSanitizer: detected memory leaks
      
      Direct leak of 4120 byte(s) in 1 object(s) allocated from:
          #0 0x7f913458ce50 in calloc (/lib64/libasan.so.5+0xeee50)
          #1 0x7f9133fd641d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5241d)
          #2 0x5561c6643c95 in qdict_crumple_test_recursive /home/elmarco/src/qq/tests/check-block-qdict.c:438
          #3 0x7f9133ff7c49  (/lib64/libglib-2.0.so.0+0x73c49)
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-Id: <20180809114417.28718-2-marcandre.lureau@redhat.com>
      [Screwed up in commit 2860b2b2]
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      42478dac
    • M
      qapi: Fix some pycodestyle-3 complaints · b736e25a
      Markus Armbruster 提交于
      Fix the following issues:
      
          common.py:873:13: E129 visually indented line with same indent as next logical line
          common.py:1766:5: E741 ambiguous variable name 'l'
          common.py:1784:1: E305 expected 2 blank lines after class or function definition, found 1
          common.py:1833:1: E305 expected 2 blank lines after class or function definition, found 1
          common.py:1843:1: E305 expected 2 blank lines after class or function definition, found 1
          visit.py:181:18: E127 continuation line over-indented for visual indent
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Message-Id: <20180621083551.775-1-armbru@redhat.com>
      [Fixup squashed in:]
      Message-ID: <871sd0nzw9.fsf@dusky.pond.sub.org>
      Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
      b736e25a
    • M
      tests: change /0.15/* tests to /qmp/* · 214e4a5b
      Marc-André Lureau 提交于
      Presumably 0.15 was the version it was first introduced, but
      qmp keeps evolving. There is no point in having that version
      as test prefix, 'qmp' makes more sense here.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-Id: <20180326150916.9602-12-marcandre.lureau@redhat.com>
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      214e4a5b
    • M
      qmp-shell: learn to send commands with quoted arguments · fcfab754
      Marc-André Lureau 提交于
      Use shlex to split the CLI command, respecting quoted arguments, and
      also comments. This allows to call for ex:
      
      (QEMU) human-monitor-command command-line="screendump /dev/null"
      {"execute": "human-monitor-command", "arguments": {"command-line": "screendump /dev/null"}}
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-Id: <20180326150916.9602-3-marcandre.lureau@redhat.com>
      Reviewed-by: NEduardo Habkost <ehabkost@redhat.com>
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      fcfab754
    • F
      aio-posix: Improve comment around marking node deleted · 37a81812
      Fam Zheng 提交于
      The counter is for qemu_lockcnt_inc/dec sections (read side),
      qemu_lockcnt_lock/unlock is for the write side.
      Suggested-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      Message-Id: <20180803063917.30292-1-famz@redhat.com>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      37a81812
    • F
      tests/vm: Add vm-build-all/vm-clean-all in help text · af7e9168
      Fam Zheng 提交于
      Suggested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      Message-Id: <20180727083445.21436-1-famz@redhat.com>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NAlex Bennée <alex.bennee@linaro.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      af7e9168
    • P
      tests/vm: Use make's --output-sync option · f2d4becd
      Peter Maydell 提交于
      Use make's --output-sync option when running tests inside VMs,
      so that if we're building with parallelization the output doesn't
      get scrambled.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-Id: <20180803085230.30574-6-peter.maydell@linaro.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      f2d4becd
    • P
      tests/vm: Bump guest RAM up from 2G to 4G · eb2712f5
      Peter Maydell 提交于
      Currently we run the guests in a VM which is given only 2G of RAM.
      Since the guests are configured without any swap space, builds
      can fail because the system runs out of memory and kills the
      compiler, especially if the job count is set for a lot of
      parallelism. Bump the setting up from 2G to 4G to give us some
      more headroom.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-Id: <20180803085230.30574-5-peter.maydell@linaro.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      eb2712f5
    • P
      tests/vm: Propagate V=1 down into the make inside the VM · 41e3340a
      Peter Maydell 提交于
      Invoking 'make vm-build-freebsd' and friends with V=1 should
      propagate that verbosity setting down into the build run
      inside the VM. Make sure we do that. This brings it into
      line with how the container tests handle V=1.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-Id: <20180803085230.30574-4-peter.maydell@linaro.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      41e3340a
    • P
      tests/vm: Pass the jobs parallelism setting to 'make check' · ebb61f80
      Peter Maydell 提交于
      Our test suite works for parallel execution too, and this can
      noticeably speed up a test run; pass the 'jobs' setting to
      it as well as to the build proper.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-Id: <20180803085230.30574-3-peter.maydell@linaro.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      ebb61f80
    • F
      tests: vm: Add vm-clean-all · ebe95fa0
      Fam Zheng 提交于
      The images are big. Add a rule to clean up easily.
      Suggested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      Message-Id: <20180716020008.31468-1-famz@redhat.com>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Tested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      ebe95fa0
    • F
      tests: Add centos VM testing · 1bd26988
      Fam Zheng 提交于
      This one does docker testing in the VM. It is intended to replace the
      native docker testing on patchew testers.
      Signed-off-by: NFam Zheng <famz@redhat.com>
      Message-Id: <20180712012829.20231-5-famz@redhat.com>
      Tested-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Signed-off-by: NFam Zheng <famz@redhat.com>
      1bd26988