1. 03 3月, 2017 6 次提交
    • 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
    • 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 8 次提交
    • 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
    • P
      audio: make audio poll timer deterministic · 1ffc2665
      Pavel Dovgalyuk 提交于
      This patch changes resetting strategy of the audio polling timer.
      It does not change expiration time if the timer is already set.
      This patch is needed to make this timer deterministic and to use execution
      record/replay for audio devices.
      
      audio_reset_timer is used in the function audio_vm_change_state_handler.
      Therefore every time VM is stopped or restarted the timer will be reset
      to new timeout. Virtual clock does not proceed while VM is stopped.
      Therefore there is no need in resetting the timeout when VM restarts.
      
      v2: updated commit message
      v3: now using timer_mod_anticipate function (as suggested by Yurii Zubrytskyi)
      Signed-off-by: NPavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
      Message-id: 20170214071510.6112.76764.stgit@PASHA-ISP
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      1ffc2665
    • P
      replay: add record/replay for audio passthrough · 3d4d16f4
      Pavel Dovgalyuk 提交于
      This patch adds recording and replaying audio data. Is saves synchronization
      information for audio out and inputs from the microphone.
      
      v2: removed unneeded whitespace change
      Signed-off-by: NPavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
      Message-id: 20170202055054.4848.94901.stgit@PASHA-ISP.lan02.inno
      
      [ kraxel: add qemu/error-report.h include to fix osx build failure ]
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      3d4d16f4
    • P
      Merge remote-tracking branch 'remotes/gkurz/tags/cve-2016-9602-for-upstream' into staging · 7287e355
      Peter Maydell 提交于
      This pull request have all the fixes for CVE-2016-9602, so that it can
      be easily picked up by downstreams, as suggested by Michel Tokarev.
      
      # gpg: Signature made Tue 28 Feb 2017 10:21:32 GMT
      # gpg:                using DSA key 0x02FC3AEB0101DBC2
      # gpg: Good signature from "Greg Kurz <groug@kaod.org>"
      # gpg:                 aka "Greg Kurz <groug@free.fr>"
      # gpg:                 aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
      # gpg:                 aka "Gregory Kurz (Groug) <groug@free.fr>"
      # gpg:                 aka "[jpeg image of size 3330]"
      # 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: 2BD4 3B44 535E C0A7 9894  DBA2 02FC 3AEB 0101 DBC2
      
      * remotes/gkurz/tags/cve-2016-9602-for-upstream: (28 commits)
        9pfs: local: drop unused code
        9pfs: local: open2: don't follow symlinks
        9pfs: local: mkdir: don't follow symlinks
        9pfs: local: mknod: don't follow symlinks
        9pfs: local: symlink: don't follow symlinks
        9pfs: local: chown: don't follow symlinks
        9pfs: local: chmod: don't follow symlinks
        9pfs: local: link: don't follow symlinks
        9pfs: local: improve error handling in link op
        9pfs: local: rename: use renameat
        9pfs: local: renameat: don't follow symlinks
        9pfs: local: lstat: don't follow symlinks
        9pfs: local: readlink: don't follow symlinks
        9pfs: local: truncate: don't follow symlinks
        9pfs: local: statfs: don't follow symlinks
        9pfs: local: utimensat: don't follow symlinks
        9pfs: local: remove: don't follow symlinks
        9pfs: local: unlinkat: don't follow symlinks
        9pfs: local: lremovexattr: don't follow symlinks
        9pfs: local: lsetxattr: don't follow symlinks
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7287e355
    • A
      mach-virt: Provide sample configuration files · 166d4346
      Andrea Bolognani 提交于
      These are very much like the sample configuration files
      for q35, and can be used both as documentation and as
      a starting point for creating your own guest.
      
      Two sample configuration files are provided:
      
        * mach-virt-graphical.cfg can be used to start a
          fully-featured (USB, graphical console, etc.)
          guest that uses VirtIO devices;
      
        * mach-virt-serial.cfg is similar but has a minimal
          set of devices and uses the serial console.
      
      All configuration files are fully commented and neatly
      organized.
      Signed-off-by: NAndrea Bolognani <abologna@redhat.com>
      Reviewed-by: NAndrew Jones <drjones@redhat.com>
      Reviewed-by: NLaszlo Ersek <lersek@redhat.com>
      Message-id: 1487326479-8664-3-git-send-email-abologna@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      166d4346
    • A
      q35: Improve sample configuration files · 9ca019c1
      Andrea Bolognani 提交于
      Instead of having a single sample configuration file,
      we now have several:
      
        * q35-emulated.cfg documents the default devices QEMU
          adds to a q35 guest and the additional devices that
          are pretty much guaranteed to be present in a
          physical q35-based machine;
      
        * q35-virtio-graphical.cfg can be used to start a
          fully-featured (USB, graphical console, audio, etc.)
          guest that uses VirtIO instead of emulated devices;
      
        * q35-virtio-serial.cfg is similar but has a minimal
          set of devices and uses the serial console.
      
      All configuration files are fully commented and neatly
      organized.
      Signed-off-by: NAndrea Bolognani <abologna@redhat.com>
      Reviewed-by: NMarcel Apfelbaum <marcel@redhat.com>
      Message-id: 1487326479-8664-2-git-send-email-abologna@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      9ca019c1
    • P
      Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging · e3280ffb
      Peter Maydell 提交于
      # gpg: Signature made Tue 28 Feb 2017 12:40:00 GMT
      # gpg:                using RSA key 0xCA35624C6A9171C6
      # gpg: Good signature from "Fam Zheng <famz@redhat.com>"
      # 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: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6
      
      * remotes/famz/tags/docker-pull-request:
        .shippable: add s390x-cross target
        new: dockerfiles/debian-s390-cross
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e3280ffb
    • M
      tests: fix virtio-blk-test leaks · 80e1eea3
      Marc-André Lureau 提交于
      Use qvirtio_pci_device_find_slot() to avoid leaking the non-hp
      device. Add assert() to avoid further leaks in the future.
      
      Use qvirtio_pci_device_free() to correctly free QVirtioPCIDevice.
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      80e1eea3