1. 03 3月, 2017 13 次提交
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging · 5b10b94b
      Peter Maydell 提交于
      NUMA documentation update
      
      # gpg: Signature made Fri 03 Mar 2017 13:11:25 GMT
      # gpg:                using RSA key 0x2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/numa-pull-request:
        qemu-options: Rewrite -numa documentation
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5b10b94b
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/submodule-update-20170303' into staging · 9a17d327
      Peter Maydell 提交于
      submodule updates (SLOF & dtc) 2017-03-03
      
      This set of patches updates the SLOF and dtc submodules for qemu-2.9.
      
      The SLOF update could have gone in my ppc pull request earlier today,
      but I forgot it.  It should be safe to apply in either order with that
      set though.
      
      The dtc (and libfdt) update brings us up to dtc 1.4.3 which includes
      some things that will be useful in future.
      
      # gpg: Signature made Fri 03 Mar 2017 06:29:31 GMT
      # gpg:                using RSA key 0x6C38CACA20D9B392
      # 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/submodule-update-20170303:
        Update dtc submodule to v1.4.3
        pseries: Update SLOF firmware image
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9a17d327
    • E
      qemu-options: Rewrite -numa documentation · 4b9a5dd7
      Eduardo Habkost 提交于
      Rewrite the -numa documentation to clarify what exactly it does.
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Message-Id: <20170123180632.28942-3-ehabkost@redhat.com>
      Reviewed-by: NIgor Mammedov <imammedo@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      4b9a5dd7
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-02-27-2' into staging · 1ec2dca6
      Peter Maydell 提交于
      Merge qio 2017/02/27 v2
      
      # gpg: Signature made Thu 02 Mar 2017 16:09:27 GMT
      # gpg:                using RSA key 0xBE86EBB415104FDF
      # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
      # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
      # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF
      
      * remotes/berrange/tags/pull-qio-2017-02-27-2:
        io: fully parse & validate HTTP headers for websocket protocol handshake
        tests: fix leaks in test-io-channel-command
        io: fix decoding when multiple websockets frames arrive at once
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      1ec2dca6
    • P
      dtc: Revert unintentional submodule downgrade from commit 077dd742 · 508e038a
      Peter Maydell 提交于
      Commit 077dd742 inadvertently downgraded the 'dtc' submodule,
      undoing the increment added in commit 6e85fce0. Revert this,
      returning the submodule state to where we should be.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      508e038a
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 9a81b792
      Peter Maydell 提交于
      virtio, pc: fixes, features
      
      virtio support for region caches broke a bunch of stuff - fixing most of
      it though it's not ideal.  Still pondering the right way to fix it.
      New: VM gen ID and hotplug for PXB.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Thu 02 Mar 2017 06:19:17 GMT
      # gpg:                using RSA key 0x281F0DB8D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
      #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
      
      * remotes/mst/tags/for_upstream:
        hw/pxb-pcie: fix PCI Express hotplug support
        tests/acpi: update DSDT after last patch
        acpi: simplify _OSC
        virtio: unbreak virtio-pci with IOMMU after caching ring translations
        virtio: add missing region cache init in virtio_load()
        virtio: invalidate memory in vring_set_avail_event()
        virtio: guard vring access when setting notification
        virtio: check for vring setup in virtio_queue_empty
        MAINTAINERS: Add VM Generation ID entries
        tests: Move reusable ACPI code into a utility file
        qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands
        ACPI: Add Virtual Machine Generation ID support
        ACPI: Add vmgenid blob storage to the build tables
        docs: VM Generation ID device description
        linker-loader: Add new 'write pointer' command
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9a81b792
    • D
      Update dtc submodule to v1.4.3 · 125a9cb8
      David Gibson 提交于
      Since the last submodule update (which was v1.4.2) dtc and libfdt have
      gained some features which would be useful in qemu.  There's now a v1.4.3
      upstream release, so update our submodule to point to it.
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      125a9cb8
    • A
      pseries: Update SLOF firmware image · a438fa12
      Alexey Kardashevskiy 提交于
      Various fixes in this update, the full list is:
      
        > qemu-bootlist: Take the "-boot strict=off" setting properly into account
        > virtio-scsi: initialize vring avail queue buffers
        > virtio: Remove global variables in block and 9p driver
        > Remove superfluous checkpoints in tree.fs
        > Provide "write" function in the disk-label package
        > virtio: Implement block write support
        > scsi: Add SCSI block write support
        > deblocker: Add a 'write' function
        > virtio-scsi: Fix descriptor order for SCSI WRITE commands
        > board-qemu: Add a possibility to use hvterm input instead of USB keyboard
        > Do not try to use virtio-gpu in VGA mode
        > virtio: Fix stack comment of virtio-blk-read
        > envvar: Do not read default values for /options from the NVRAM anymore
        > envvar: Set properties in /options during "(set-defaults)"
      Signed-off-by: NAlexey Kardashevskiy <aik@ozlabs.ru>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      a438fa12
    • P
      Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging · 54639aed
      Peter Maydell 提交于
      # gpg: Signature made Thu 02 Mar 2017 03:42:59 GMT
      # gpg:                using RSA key 0xBDBE7B27C0DE3057
      # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
      # gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
      # gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
      # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057
      
      * remotes/cody/tags/block-pull-request:
        block/rbd: add support for 'mon_host', 'auth_supported' via QAPI
        block/rbd: add blockdev-add support
        block/rbd: parse all options via bdrv_parse_filename
        block/rbd: add all the currently supported runtime_opts
        block/rbd: don't copy strings in qemu_rbd_next_tok()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      54639aed
    • P
      Merge remote-tracking branch 'remotes/rth/tags/pull-tgt-20170302' into staging · ecb24d33
      Peter Maydell 提交于
      Queued sparc patch
      
      # gpg: Signature made Wed 01 Mar 2017 19:53:21 GMT
      # gpg:                using RSA key 0xAD1270CC4DD0279B
      # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
      # gpg:                 aka "Richard Henderson <rth@redhat.com>"
      # gpg:                 aka "Richard Henderson <rth@twiddle.net>"
      # Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B
      
      * remotes/rth/tags/pull-tgt-20170302:
        target/sparc: Restore ldstub of odd asis
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ecb24d33
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20170301-1' into staging · 68355048
      Peter Maydell 提交于
      audio: replay support, sdl2 fix.
      
      # gpg: Signature made Wed 01 Mar 2017 15:38:09 GMT
      # 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-audio-20170301-1:
        audio/sdlaudio: Allow audio playback with SDL2
        audio: make audio poll timer deterministic
        replay: add record/replay for audio passthrough
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      68355048
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-docs-20170301-1' into staging · b49d31a0
      Peter Maydell 提交于
      docs: update sample configuration files
      
      # gpg: Signature made Wed 01 Mar 2017 13:43:34 GMT
      # 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-docs-20170301-1:
        mach-virt: Provide sample configuration files
        q35: Improve sample configuration files
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b49d31a0
    • P
      Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170228a' into staging · 251501a3
      Peter Maydell 提交于
      Migration pull
      
      Note: The 'postcopy: Update userfaultfd.h header' is part of
      Paolo's header update and will disappear if applied after it.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      
      # gpg: Signature made Tue 28 Feb 2017 12:38:34 GMT
      # gpg:                using RSA key 0x0516331EBC5BFDE7
      # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@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: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7
      
      * remotes/dgilbert/tags/pull-migration-20170228a: (27 commits)
        postcopy: Add extra check for COPY function
        postcopy: Add doc about hugepages and postcopy
        postcopy: Check for userfault+hugepage feature
        postcopy: Update userfaultfd.h header
        postcopy: Allow hugepages
        postcopy: Send whole huge pages
        postcopy: Mask fault addresses to huge page boundary
        postcopy: Load huge pages in one go
        postcopy: Use temporary for placing zero huge pages
        postcopy: Plumb pagesize down into place helpers
        postcopy: Record largest page size
        postcopy: enhance ram_block_discard_range for hugepages
        exec: ram_block_discard_range
        postcopy: Chunk discards for hugepages
        postcopy: Transmit and compare individual page sizes
        postcopy: Transmit ram size summary word
        migration: fix use-after-free of to_dst_file
        migration: Update docs to discourage version bumps
        migration: fix id leak regression
        migrate: Introduce a 'dc->vmsd' check to avoid segfault for --only-migratable
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      251501a3
  2. 02 3月, 2017 26 次提交
  3. 01 3月, 2017 1 次提交
    • T
      audio/sdlaudio: Allow audio playback with SDL2 · bcf19777
      Thomas Huth 提交于
      When compiling with SDL2, the semaphore trick used in sdlaudio.c
      does not work - QEMU locks up completely in this case. To avoid
      the hang and get at least some audio playback up and running (it's
      a little bit crackling, but better than nothing), we can use the
      SDL locking functions SDL_LockAudio() and SDL_UnlockAudio() to sync
      with the sound playback thread instead.
      Signed-off-by: NThomas Huth <thuth@redhat.com>
      Message-id: 1485852398-2327-1-git-send-email-thuth@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      bcf19777