1. 21 12月, 2017 34 次提交
  2. 20 12月, 2017 6 次提交
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-cmdline-2017-12-18-v2' into staging · 200780a3
      Peter Maydell 提交于
      Command line patches for 2017-12-18
      
      # gpg: Signature made Wed 20 Dec 2017 08:11:57 GMT
      # gpg:                using RSA key 0x3870B400EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653
      
      * remotes/armbru/tags/pull-cmdline-2017-12-18-v2:
        option: Drop unused get_param_value(), get_next_param_value()
        option: Remove shadowing opt decl from qemu_opt_print()
        qemu-options: Belatedly document --watchdog-action inject-nmi
        qemu-options: Polish section "Character device options"
        qemu-options: Polish section "TPM device options"
        qemu-options: Add missing -iscsi Texinfo documentation
        qemu-options: Move -iscsi under "Block device options"
        qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc
        qemu-options: Fix markup of -netdev l2tpv3
        qemu-options: Remove stray colons from output of --help
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      200780a3
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · f1faf2d5
      Peter Maydell 提交于
      Pull request
      
      v2:
       * Fixed incorrect virtio_blk_data_plane_create() local_err refactoring in
         "hw/block: Use errp directly rather than local_err" that broke virtio-blk
         over virtio-mmio [Peter]
      
      # gpg: Signature made Tue 19 Dec 2017 15:08:14 GMT
      # gpg:                using RSA key 0x9CA4ABB381AB73C8
      # 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: (23 commits)
        qemu-iotests: add 203 savevm with IOThreads test
        iothread: fix iothread_stop() race condition
        iotests: add VM.add_object()
        blockdev: add x-blockdev-set-iothread force boolean
        docs: mark nested AioContext locking as a legacy API
        block: avoid recursive AioContext acquire in bdrv_inactivate_all()
        virtio-blk: reject configs with logical block size > physical block size
        virtio-blk: make queue size configurable
        qemu-iotests: add 202 external snapshots IOThread test
        blockdev: add x-blockdev-set-iothread testing command
        iothread: add iothread_by_id() API
        block: drop unused BlockDirtyBitmapState->aio_context field
        block: don't keep AioContext acquired after internal_snapshot_prepare()
        block: don't keep AioContext acquired after blockdev_backup_prepare()
        block: don't keep AioContext acquired after drive_backup_prepare()
        block: don't keep AioContext acquired after external_snapshot_prepare()
        blockdev: hold AioContext for bdrv_unref() in external_snapshot_clean()
        qdev: drop unused #include "sysemu/iothread.h"
        dev-storage: Fix the unusual function name
        hw/block: Use errp directly rather than local_err
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      
      # Conflicts:
      #	hw/core/qdev-properties-system.c
      f1faf2d5
    • M
      option: Drop unused get_param_value(), get_next_param_value() · 3e05349d
      Markus Armbruster 提交于
      Their last user went away in commit f51074cd, "pci-hotplug-old: Has
      been dead for five major releases, bury", v2.3.0.  Remove them, as new
      code should use QemuOpts or maybe keyval_parse() instead.
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      Message-Id: <20171006131645.17729-1-armbru@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      3e05349d
    • D
      option: Remove shadowing opt decl from qemu_opt_print() · da78e382
      Dr. David Alan Gilbert 提交于
      opt was declared as a separate local inside the last loop,
      shadowing the local at the top of the function.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Message-Id: <20171005190725.18712-1-dgilbert@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      da78e382
    • M
      qemu-options: Belatedly document --watchdog-action inject-nmi · 7ad9270e
      Markus Armbruster 提交于
      Missed in commit 795dc6e4, v2.4.0.
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      Message-Id: <20171002140307.5292-9-armbru@redhat.com>
      Reviewed-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      7ad9270e
    • M
      qemu-options: Polish section "Character device options" · dddba068
      Markus Armbruster 提交于
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      CC: Marc-André Lureau <marcandre.lureau@redhat.com>
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      Message-Id: <20171002140307.5292-8-armbru@redhat.com>
      Reviewed-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      dddba068