1. 24 3月, 2016 1 次提交
  2. 23 3月, 2016 7 次提交
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-ivshmem-2016-03-18' into staging · 2538039f
      Peter Maydell 提交于
      ivshmem: Fixes, cleanups, device model split
      
      # gpg: Signature made Mon 21 Mar 2016 20:33:54 GMT using RSA key ID EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      
      * remotes/armbru/tags/pull-ivshmem-2016-03-18: (40 commits)
        contrib/ivshmem-server: Print "not for production" warning
        ivshmem: Require master to have ID zero
        ivshmem: Drop ivshmem property x-memdev
        ivshmem: Clean up after the previous commit
        ivshmem: Split ivshmem-plain, ivshmem-doorbell off ivshmem
        ivshmem: Replace int role_val by OnOffAuto master
        qdev: New DEFINE_PROP_ON_OFF_AUTO
        ivshmem: Inline check_shm_size() into its only caller
        ivshmem: Simplify memory regions for BAR 2 (shared memory)
        ivshmem: Implement shm=... with a memory backend
        ivshmem: Tighten check of property "size"
        ivshmem: Simplify how we cope with short reads from server
        ivshmem: Drop the hackish test for UNIX domain chardev
        ivshmem: Rely on server sending the ID right after the version
        ivshmem: Propagate errors through ivshmem_recv_setup()
        ivshmem: Receive shared memory synchronously in realize()
        ivshmem: Plug leaks on unplug, fix peer disconnect
        ivshmem: Disentangle ivshmem_read()
        ivshmem: Simplify rejection of invalid peer ID from server
        ivshmem: Assert interrupts are set up once
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2538039f
    • P
      Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160322' into staging · ffa6564c
      Peter Maydell 提交于
      wxx patch queue
      
      # gpg: Signature made Tue 22 Mar 2016 18:18:36 GMT 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-20160322:
        wxx: Add support for ncurses
        Remove unneeded include statements for setjmp.h
        Include setjmp.h in qemu/osdep.h (bug fix for w64)
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ffa6564c
    • S
      wxx: Add support for ncurses · ae629634
      Stefan Weil 提交于
      We used to support only pdcurses for Windows, but recently Cygwin added
      mingw64-i686-ncurses and mingw64-x86_64-ncurses packages which are
      supported now, too.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      ae629634
    • S
      Remove unneeded include statements for setjmp.h · 8ff98f1e
      Stefan Weil 提交于
      As soon as setjmp.h is included from qemu/osdep.h, those old include
      statements are no longer needed.
      
      Add also setjmp.h to the list in scripts/clean-includes.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      8ff98f1e
    • S
      Include setjmp.h in qemu/osdep.h (bug fix for w64) · e89fdafb
      Stefan Weil 提交于
      setjmp must be declared before sysemu/os-win32.h
      because it is redefined there for 64 bit Windows.
      Reviewed-by: NRichard Henderson  <rth@twiddle.net>
      Tested-by: NAndrew Baumann <Andrew.Baumann@microsoft.com>
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      e89fdafb
    • P
      Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-03-21-tag' into staging · 459621ac
      Peter Maydell 提交于
      qemu-ga patch queue for 2.6
      
      * remove unused variable
      
      # gpg: Signature made Mon 21 Mar 2016 17:32:42 GMT using RSA key ID F108B584
      # gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
      # gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
      # gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
      
      * remotes/mdroth/tags/qga-pull-2016-03-21-tag:
        qemu-ga: drop unused local err variable
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      459621ac
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160321-1' into staging · ac0d25e8
      Peter Maydell 提交于
      usb: bugfix collection.
      
      # gpg: Signature made Mon 21 Mar 2016 11:07:39 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-20160321-1:
        usb: ehci: add capability mmio write function
        hw/usb/dev-mtp: Guard inotify usage with CONFIG_INOTIFY1
        usb: fix unbound stack warning for inotify_watchfn
        usb: fix unbound stack usage for usb_mtp_add_str
        usb: fix unbounded stack warning for xhci_dma_write_u32s
        usb: Fix compilation for Windows
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ac0d25e8
  3. 22 3月, 2016 32 次提交