1. 22 2月, 2014 1 次提交
  2. 21 2月, 2014 5 次提交
    • P
      Merge remote-tracking branch... · 3e890c77
      Peter Maydell 提交于
      Merge remote-tracking branch 'remotes/stefanha/tags/qtest-monitor-process-pull-request' into staging
      
      qtest resource cleanup pull request
      
      # gpg: Signature made Wed 19 Feb 2014 14:46:34 GMT using RSA key ID 81AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@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: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/qtest-monitor-process-pull-request:
        qtest: kill QEMU process on g_assert() failure
        qtest: make QEMU our direct child process
        qtest: drop unused child_pid field
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3e890c77
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · 7a87a7b3
      Peter Maydell 提交于
      Tracing pull request
      
      # gpg: Signature made Wed 19 Feb 2014 15:42:20 GMT using RSA key ID 81AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@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: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/tracing-pull-request:
        trace-events: Fix typo in "offset"
        Add ust generated files to .gitignore
        Update documentation for LTTng ust tracing
        Adapt Makefiles to the new LTTng ust interface
        Modified the tracetool framework for LTTng 2.x
        Fix configure script for LTTng 2.x
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7a87a7b3
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · e607784f
      Peter Maydell 提交于
      This fixes a target-i386 emulation regression
      
      # gpg: Signature made Wed 19 Feb 2014 15:42:12 GMT using RSA key ID C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      
      * remotes/kevin/tags/for-upstream:
        target-i386: Fix I/O bitmap checks for in/out
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e607784f
    • P
      Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging · 9bd9d5e3
      Peter Maydell 提交于
      * remotes/riku/linux-user-for-upstream:
        linux-user: Fix error handling in target_to_host_semarray()
        linux-user: Implement BLKPG ioctl
        linux-user: Fix error handling in lock_iovec()
        linux-user/signal.c: Don't pass sigaction uninitialised sa_flags
        linux-user/elfload.c: Avoid calling g_free() on uninitialized data
        linux-user: sync syscall numbers upto 3.13
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9bd9d5e3
    • P
      tcg/i386: Fix build for systems without working cpuid.h (MacOSX, Win32) · 774d566c
      Peter Maydell 提交于
      Win32 doesn't have a cpuid.h, and MacOSX may have one but without
      the __cpuid() function we use, which means that commit 9d2eec20
      broke the build for those platforms. Fix this by tightening up
      our configure cpuid.h check to test that the functions we need
      are present, and adding some missing #ifdef guards in
      tcg/i386/tcg-target.c.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: NRichard Henderson <rth@twiddle.net>
      774d566c
  3. 20 2月, 2014 4 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-3' into staging · 2ca92bb9
      Peter Maydell 提交于
      - xhci improvements and fixes.
      - uhci bugfix.
      - cleanups.
      
      # gpg: Signature made Tue 18 Feb 2014 15:48:10 GMT 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-usb-3:
        xhci: use DPRINTF() instead of fprintf(stderr, ...)
        xhci: switch debug printf to tracepoint
        xhci iso: allow for some latency
        xhci iso: fix time calculation
        uhci: invalidate queue on device address changes
        xhci: fix overflow in usb_xhci_post_load
        usb: Remove magic constants from device bmAttributes
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2ca92bb9
    • P
      Merge remote-tracking branch 'remotes/rth/tcg-next' into staging · 3d2bb5cc
      Peter Maydell 提交于
      * remotes/rth/tcg-next:
        tcg/i386: Use SHLX/SHRX/SARX instructions
        tcg/i386: Use ANDN instruction
        tcg/i386: Add tcg_out_vex_modrm
        tcg/i386: Move TCG_CT_CONST_* to tcg-target.c
        disas/i386: Disassemble ANDN/SHLX/SHRX/SHAX
        tcg/optimize: Add more identity simplifications
        tcg/optimize: Optmize ANDC X,Y,Y to MOV X,0
        tcg/optimize: Simply some logical ops to NOT
        tcg/optimize: Handle known-zeros masks for ANDC
        tcg/optimize: add known-zero bits compute for load ops
        tcg/optimize: improve known-zero bits for 32-bit ops
        tcg/optimize: fix known-zero bits optimization
        tcg/optimize: fix known-zero bits for right shift ops
        tcg-arm: The shift count of op_rotl_i32 is in args[2] not args[1].
        TCG: Fix 32-bit host allocation typo
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3d2bb5cc
    • P
      Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging · 61e8a923
      Peter Maydell 提交于
      QOM infrastructure fixes and device conversions
      
      * QTest cleanups and test cases for PCI NICs
      * NAND fix for "info qtree"
      * Cleanup and extension of QOM machine tests
      * IndustryPack test cases and conversion to QOM realize
      * I2C cleanups
      * Cleanups of legacy qdev properties
      
      # gpg: Signature made Mon 17 Feb 2014 22:15:37 GMT using RSA key ID 3E7E013F
      # gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
      # gpg:                 aka "Andreas Färber <afaerber@suse.com>"
      
      * remotes/afaerber/tags/qom-devices-for-peter: (49 commits)
        qtest: Include system headers before user headers
        qapi: Refine human printing of sizes
        qdev: Use QAPI type names for properties
        qdev: Add enum property types to QAPI schema
        block: Handle "rechs" and "large" translation options
        qdev: Remove hex8/32/64 property types
        qdev: Remove most legacy printers
        qdev: Use human mode in "info qtree"
        qapi: Add human mode to StringOutputVisitor
        qdev: Inline qdev_prop_parse()
        qdev: Legacy properties are just strings
        qdev: Legacy properties are now read-only
        qdev: Remove legacy parsers for hex8/32/64
        qdev: Sizes are now parsed by StringInputVisitor
        qapi: Add size parser to StringInputVisitor
        qtest: Don't segfault with invalid -qtest option
        ipack: Move IndustryPack out of hw/char/
        ipoctal232: QOM parent field cleanup
        ipack: QOM parent field cleanup for IPackDevice
        ipack: QOM parent field cleanup for IPackBus
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      61e8a923
    • P
      Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging · 4c0c9bbe
      Peter Maydell 提交于
      * remotes/qmp-unstable/queue/qmp:
        monitor: Add object_add class argument completion.
        monitor: Add object_del id argument completion.
        monitor: Add device_add device argument completion.
        monitor: Add device_del id argument completion.
        qmp: expose list of supported character device backends
        Use error_is_set() only when necessary
        QMP: allow JSON dict arguments in qmp-shell
        hmp: migrate command (without -d) now blocks correctly
      
      Conflicts:
      	blockdev.c
      
      [PMM: resolved trivial conflict in blockdev.c]
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4c0c9bbe
  4. 19 2月, 2014 12 次提交
  5. 18 2月, 2014 18 次提交