1. 13 3月, 2018 3 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180312-pull-request' into staging · 1396156f
      Peter Maydell 提交于
      usbredir: reorder fields in USBRedirDevice to reduce padding
      
      # gpg: Signature made Mon 12 Mar 2018 11:05:19 GMT
      # gpg:                using RSA key 4CB6D8EED3E87138
      # 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/usb-20180312-pull-request:
        usbredir: reorder fields in USBRedirDevice to reduce padding
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      1396156f
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180312-pull-request' into staging · fb5fff15
      Peter Maydell 提交于
      7cdc61be vga: fix region calculation
      
      # gpg: Signature made Mon 12 Mar 2018 10:59:24 GMT
      # gpg:                using RSA key 4CB6D8EED3E87138
      # 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/vga-20180312-pull-request:
        vga: fix region calculation
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      fb5fff15
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180312-pull-request' into staging · 6ceb1b51
      Peter Maydell 提交于
      modules: use gmodule-export.
      audio: add driver registry, enable module builds.
      
      # gpg: Signature made Mon 12 Mar 2018 10:42:19 GMT
      # gpg:                using RSA key 4CB6D8EED3E87138
      # 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/audio-20180312-pull-request:
        audio/sdl: build as module
        audio/pulseaudio: build as module
        audio/oss: build as module
        audio/alsa: build as module
        build: enable audio modules
        audio: add module loading support
        audio: add driver registry
        modules: use gmodule-export
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6ceb1b51
  2. 12 3月, 2018 28 次提交
  3. 10 3月, 2018 9 次提交
    • P
      Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging · 20f59d12
      Peter Maydell 提交于
      # gpg: Signature made Fri 09 Mar 2018 14:54:33 GMT
      # gpg:                using RSA key F30C38BD3F2FBE3C
      # 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-for-2.12-pull-request:
        target/m68k: implement ftentox
        target/m68k: implement ftwotox
        target/m68k: implement fetox
        target/m68k: implement flog2
        target/m68k: implement flog10
        target/m68k: implement flogn
        target/m68k: implement flognp1
        target/m68k: define floatx80_move()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      20f59d12
    • D
      tests: Silence migration-test 'bad' test · f96d6651
      Dr. David Alan Gilbert 提交于
      In 2c9bb297 I added a migration test that purposely fails;
      unfortunately it prints a copy of the failure message to stderr
      which makes the output a bit messy.
      
      Hide stderr for that test.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Message-Id: <20180306173042.24572-1-dgilbert@redhat.com>
      Reviewed-by: NPeter Xu <peterx@redhat.com>
      Tested-by: NPeter Xu <peterx@redhat.com>
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      f96d6651
    • P
      migration: fix applying wrong capabilities · dd0ee30c
      Peter Xu 提交于
      When setting migration capabilities via QMP/HMP, we'll apply them even
      if the capability check failed.  Fix it.
      
      Fixes: 4a84214e ("migration: provide migrate_caps_check()", 2017-07-18)
      Signed-off-by: NPeter Xu <peterx@redhat.com>
      Message-Id: <20180305094938.31374-1-peterx@redhat.com>
      Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      dd0ee30c
    • P
      migration/block: rename MAX_INFLIGHT_IO to MAX_IO_BUFFERS · ef9c5160
      Peter Lieven 提交于
      this actually limits (as the original commit mesage suggests) the
      number of I/O buffers that can be allocated and not the number
      of parallel (inflight) I/O requests.
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Message-Id: <1520507908-16743-4-git-send-email-pl@kamp.de>
      Reviewed-by: NJuan Quintela <quintela@redhat.com>
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      ef9c5160
    • P
      migration/block: reset dirty bitmap before read in bulk phase · 86b124bc
      Peter Lieven 提交于
      Reset the dirty bitmap before reading to make sure we don't miss
      any new data.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Message-Id: <1520507908-16743-3-git-send-email-pl@kamp.de>
      Reviewed-by: NJuan Quintela <quintela@redhat.com>
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      86b124bc
    • P
      migration: do not transfer ram during bulk storage migration · b2557345
      Peter Lieven 提交于
      this patch makes the bulk phase of a block migration to take
      place before we start transferring ram. As the bulk block migration
      can take a long time its pointless to transfer ram during that phase.
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Message-Id: <1520507908-16743-2-git-send-email-pl@kamp.de>
      Reviewed-by: NJuan Quintela <quintela@redhat.com>
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      b2557345
    • M
      migration: fix minor finalize leak · ab105cc1
      Marc-André Lureau 提交于
      Spotted thanks to ASAN:
      QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 tests/migration-test -p /x86_64/migration/bad_dest
      
      ==30302==ERROR: LeakSanitizer: detected memory leaks
      
      Direct leak of 48 byte(s) in 1 object(s) allocated from:
          #0 0x7f60efba1a38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38)
          #1 0x7f60eef3cf75 in g_malloc0 ../glib/gmem.c:124
          #2 0x55ca9094702c in error_copy /home/elmarco/src/qemu/util/error.c:203
          #3 0x55ca9037a30f in migrate_set_error /home/elmarco/src/qemu/migration/migration.c:1139
          #4 0x55ca9037a462 in migrate_fd_error /home/elmarco/src/qemu/migration/migration.c:1150
          #5 0x55ca9038162b in migrate_fd_connect /home/elmarco/src/qemu/migration/migration.c:2411
          #6 0x55ca90386e41 in migration_channel_connect /home/elmarco/src/qemu/migration/channel.c:81
          #7 0x55ca9038335e in socket_outgoing_migration /home/elmarco/src/qemu/migration/socket.c:85
          #8 0x55ca9083dd3a in qio_task_complete /home/elmarco/src/qemu/io/task.c:142
          #9 0x55ca9083d6cc in gio_task_thread_result /home/elmarco/src/qemu/io/task.c:88
          #10 0x7f60eef37317 in g_idle_dispatch ../glib/gmain.c:5552
          #11 0x7f60eef3490b in g_main_dispatch ../glib/gmain.c:3182
          #12 0x7f60eef357ac in g_main_context_dispatch ../glib/gmain.c:3847
          #13 0x55ca90927231 in glib_pollfds_poll /home/elmarco/src/qemu/util/main-loop.c:214
          #14 0x55ca90927420 in os_host_main_loop_wait /home/elmarco/src/qemu/util/main-loop.c:261
          #15 0x55ca909275fa in main_loop_wait /home/elmarco/src/qemu/util/main-loop.c:515
          #16 0x55ca8fc1c2a4 in main_loop /home/elmarco/src/qemu/vl.c:1942
          #17 0x55ca8fc2eb3a in main /home/elmarco/src/qemu/vl.c:4724
          #18 0x7f60e4082009 in __libc_start_main (/lib64/libc.so.6+0x21009)
      
      Indirect leak of 45 byte(s) in 1 object(s) allocated from:
          #0 0x7f60efba1850 in malloc (/lib64/libasan.so.4+0xde850)
          #1 0x7f60eef3cf0c in g_malloc ../glib/gmem.c:94
          #2 0x7f60eef3d1cf in g_malloc_n ../glib/gmem.c:331
          #3 0x7f60eef596eb in g_strdup ../glib/gstrfuncs.c:363
          #4 0x55ca90947085 in error_copy /home/elmarco/src/qemu/util/error.c:204
          #5 0x55ca9037a30f in migrate_set_error /home/elmarco/src/qemu/migration/migration.c:1139
          #6 0x55ca9037a462 in migrate_fd_error /home/elmarco/src/qemu/migration/migration.c:1150
          #7 0x55ca9038162b in migrate_fd_connect /home/elmarco/src/qemu/migration/migration.c:2411
          #8 0x55ca90386e41 in migration_channel_connect /home/elmarco/src/qemu/migration/channel.c:81
          #9 0x55ca9038335e in socket_outgoing_migration /home/elmarco/src/qemu/migration/socket.c:85
          #10 0x55ca9083dd3a in qio_task_complete /home/elmarco/src/qemu/io/task.c:142
          #11 0x55ca9083d6cc in gio_task_thread_result /home/elmarco/src/qemu/io/task.c:88
          #12 0x7f60eef37317 in g_idle_dispatch ../glib/gmain.c:5552
          #13 0x7f60eef3490b in g_main_dispatch ../glib/gmain.c:3182
          #14 0x7f60eef357ac in g_main_context_dispatch ../glib/gmain.c:3847
          #15 0x55ca90927231 in glib_pollfds_poll /home/elmarco/src/qemu/util/main-loop.c:214
          #16 0x55ca90927420 in os_host_main_loop_wait /home/elmarco/src/qemu/util/main-loop.c:261
          #17 0x55ca909275fa in main_loop_wait /home/elmarco/src/qemu/util/main-loop.c:515
          #18 0x55ca8fc1c2a4 in main_loop /home/elmarco/src/qemu/vl.c:1942
          #19 0x55ca8fc2eb3a in main /home/elmarco/src/qemu/vl.c:4724
          #20 0x7f60e4082009 in __libc_start_main (/lib64/libc.so.6+0x21009)
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-Id: <20180306170959.3921-1-marcandre.lureau@redhat.com>
      Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Reviewed-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      ab105cc1
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · e4ae62b8
      Peter Maydell 提交于
      # gpg: Signature made Fri 09 Mar 2018 13:19:02 GMT
      # gpg:                using RSA key 9CA4ABB381AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/block-pull-request:
        vl: introduce vm_shutdown()
        virtio-scsi: fix race between .ioeventfd_stop() and vq handler
        virtio-blk: fix race between .ioeventfd_stop() and vq handler
        block: add aio_wait_bh_oneshot()
        virtio-blk: dataplane: Don't batch notifications if EVENT_IDX is present
        README: Fix typo 'git-publish'
        block: Fix qemu crash when using scsi-block
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e4ae62b8
    • P
      MAINTAINERS: Add entries for SD (SDHCI, SDBus, SDCard) · 076a0fc3
      Philippe Mathieu-Daudé 提交于
      After spending months studying all the different SD Specifications
      from the SD Association, voluntarily add myself as maintainer
      for the SD code.
      Signed-off-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-id: 20180309153654.13518-9-f4bug@amsat.org
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      076a0fc3