1. 31 10月, 2016 3 次提交
    • P
      Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging · 277d44f5
      Peter Maydell 提交于
      trivial patches for 2016-10-28
      
      # gpg: Signature made Fri 28 Oct 2016 16:17:51 BST
      # gpg:                using RSA key 0x701B4F6B1A693E59
      # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@debian.org>"
      # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
      #      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59
      
      * remotes/mjt/tags/trivial-patches-fetch: (23 commits)
        Fix build for less common build directories names
        clean-up: removed duplicate #includes
        scripts/clean-includes: added duplicate #include check
        monitor: deprecate 'default' option
        qemu-ga: Remove stray 'q' in documentation
        Makefile: Fix help text for target 'installer'
        s390: avoid always-true comparison in s390_pci_generate_fid()
        migration: Remove unneeded NULL check from migrate_fd_error()
        scripts/hxtool: fix undefined behavour of echo
        qemu-options.hx: set: fix copy-paste error
        usb: Change *_exitfn return type from int to void
        MAINTAINERS: qemu-trivial information
        colo-compare: remove unused struct CompareChardevProps and 'props' variable
        milkymist-pfpu: fix potential integer overflow
        hw/block/nvme: Simplify if-statements a little bit
        target-lm32: rewrite gen_compare()
        lm32: milkymist-tmu2: fix integer overflow
        target-lm32: disable asm logging via LOG_DIS()
        target-lm32: swap operand of wcsr in LOG_DIS()
        target-lm32: fix LOG_DIS operand order
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      277d44f5
    • P
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20161028' into staging · 4178c782
      Peter Maydell 提交于
      target-arm queue:
       * Fix reset GPIO handling for spitz, tosa boards
       * virt: add 'pmu' property for configuring whether to expose the
         vPMU to the guest
       * char: cadence: correct reset value for baud rate registers
       * versatilepb: do not run if user asks for more than 256MB RAM
       * pxa2xx: Set value default values for CCCR and CKEN on PXA255
       * arm: cubieboard: Add support for initrd
       * i.MX: Fix GPIO ISR register write
      
      # gpg: Signature made Fri 28 Oct 2016 15:56:56 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-20161028:
        hw/arm/tosa: Fix reset handling
        hw/arm/spitz: Fix reset handling
        arm: virt: add PMU property to mach-virt machine type
        arm: Add an option to turn on/off vPMU support
        char: cadence: correct reset value for baud rate registers
        versatilepb: do not run if user asks for more than 256MB RAM
        hw/arm/pxa2xx: Set value default values for CCCR and CKEN on PXA255
        arm: cubieboard: Add support for initrd
        i.MX: Fix GPIO ISR register write
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4178c782
    • P
      Merge remote-tracking branch 'remotes/famz/tags/for-upstream' into staging · 5273a45e
      Peter Maydell 提交于
      # gpg: Signature made Fri 28 Oct 2016 15:47:39 BST
      # gpg:                using RSA key 0xCA35624C6A9171C6
      # gpg: Good signature from "Fam Zheng <famz@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: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6
      
      * remotes/famz/tags/for-upstream:
        aio: convert from RFifoLock to QemuRecMutex
        qemu-thread: introduce QemuRecMutex
        iothread: release AioContext around aio_poll
        block: only call aio_poll on the current thread's AioContext
        qemu-img: call aio_context_acquire/release around block job
        qemu-io: acquire AioContext
        block: prepare bdrv_reopen_multiple to release AioContext
        replication: pass BlockDriverState to reopen_backing_file
        iothread: detach all block devices before stopping them
        aio: introduce qemu_get_current_aio_context
        sheepdog: use BDRV_POLL_WHILE
        nfs: use BDRV_POLL_WHILE
        nfs: move nfs_set_events out of the while loops
        block: introduce BDRV_POLL_WHILE
        qed: Implement .bdrv_drain
        block: change drain to look only at one child at a time
        block: add BDS field to count in-flight requests
        mirror: use bdrv_drained_begin/bdrv_drained_end
        blockjob: introduce .drain callback for jobs
        replication: interrupt failover if the main device is closed
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5273a45e
  2. 29 10月, 2016 3 次提交
    • A
      net: split colo_compare_pkt_info into two trace events · 2dfe5113
      Alex Bennée 提交于
      It seems there is a limit to the number of arguments a UST trace event
      can take and at 11 the previous trace command broke the build. Split the
      trace into a src pkt and dst pkt trace to fix this.
      Signed-off-by: NAlex Bennée <alex.bennee@linaro.org>
      Message-id: 20161028132559.8324-1-alex.bennee@linaro.org
      Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2dfe5113
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20161028-1' into staging · 5b2ecaba
      Peter Maydell 提交于
      braille fixes and improvements.
      curses fix, switch to cursesw.
      gtk bugfixes.
      
      # gpg: Signature made Fri 28 Oct 2016 13:05:12 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/pull-ui-20161028-1:
        curses: Use cursesw instead of curses
        curses: fix left/right arrow translation
        ui/gtk: Fix non-working DELETE key
        gtk: fix compilation warning with gtk 3.22.2
        Defer BrlAPI tty acquisition to when guest starts using device
        Add dots keypresses support to the baum braille device
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5b2ecaba
    • P
      Merge remote-tracking branch 'remotes/vivier/tags/m68k-part2-pull-request' into staging · eb540e2c
      Peter Maydell 提交于
      # gpg: Signature made Fri 28 Oct 2016 09:44:23 BST
      # gpg:                using RSA key 0xF30C38BD3F2FBE3C
      # 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/vivier/tags/m68k-part2-pull-request:
        MAINTAINERS: update M68K entry
        target-m68k: immediate ops manage word and byte operands
        target-m68k: cmp manages word and bytes operands
        target-m68k: add/sub manage word and byte operands
        target-m68k: add addressing modes to neg
        target-m68k: introduce byte and word cc_ops
        target-m68k: some bit ops cleanup
        target-m68k: suba/adda can manage word operand
        target-m68k: and can manage word and byte operands
        target-m68k: or can manage word and byte operands
        target-m68k: eor can manage word and byte operands
        target-m68k: add addressing modes to not
        target-m68k: Inline addx, subx, negx
        target-m68k: add dbcc
        target-m68k: add addressing modes to scc
        target-m68k: add exg ops
        target-m68k: add linkl
        target-m68k: add bkpt instruction
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      eb540e2c
  3. 28 10月, 2016 34 次提交