Skip to content
Snippets Groups Projects
  1. Feb 16, 2021
  2. Feb 15, 2021
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · 8ba4bca5
      Peter Maydell authored
      
      Block layer patches:
      
      - qemu-storage-daemon: Enable object-add
      - blockjob: Fix crash with IOthread when block commit after snapshot
      - monitor: Shutdown fixes
      - xen-block: fix reporting of discard feature
      - qcow2: Remove half-initialised image file after failed image creation
      - ahci: Fix DMA direction
      - iotests fixes
      
      # gpg: Signature made Mon 15 Feb 2021 14:58:47 GMT
      # gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
      # gpg:                issuer "kwolf@redhat.com"
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      
      * remotes/kevin/tags/for-upstream:
        monitor/qmp: Stop processing requests when shutdown is requested
        monitor: Fix assertion failure on shutdown
        block: qcow2: remove the created file on initialization error
        block: add bdrv_co_delete_file_noerr
        crypto: luks: Fix tiny memory leak
        tests/qemu-iotests: Remove test 259 from the "auto" group
        xen-block: fix reporting of discard feature
        hw/ide/ahci: map cmd_fis as DMA_DIRECTION_TO_DEVICE
        blockjob: Fix crash with IOthread when block commit after snapshot
        iotests: Consistent $IMGOPTS boundary matching
        qemu-storage-daemon: Enable object-add
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      8ba4bca5
    • Peter Maydell's avatar
      docs/sphinx/qapidoc.py: Handle change of QAPI's builtin module name · 35f15acb
      Peter Maydell authored
      
      In commit e2bbc4ea we changed the QAPI modules to name the built-in
      module "./builtin" rather than None, but forgot to update the Sphinx
      plugin. The effect of this was that when the plugin generated a dependency
      file it was including a bogus dependency on a non-existent file named
      "builtin", which meant that ninja would run Sphinx and rebuild all
      the documentation every time even if nothing had changed.
      
      Update the plugin to use the new name of the builtin module.
      
      Fixes: e2bbc4ea
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Tested-by: default avatarEric Blake <eblake@redhat.com>
      Message-id: 20210212161311.28915-1-peter.maydell@linaro.org
      35f15acb
    • Kevin Wolf's avatar
      monitor/qmp: Stop processing requests when shutdown is requested · b248e616
      Kevin Wolf authored
      
      Before this patch, monitor_qmp_dispatcher_co() used to check whether
      shutdown is requested only when it would have to wait for new requests.
      If there were still some queued requests, it would try to execute all of
      them before shutting down.
      
      This can be surprising when the queued QMP commands take long or hang
      because Ctrl-C may not actually exit QEMU as soon as possible.
      
      Change monitor_qmp_dispatcher_co() so that it additionally checks
      whether shutdown is request before it gets a new request from the queue.
      
      Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
      Message-Id: <20210212172028.288825-3-kwolf@redhat.com>
      Tested-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
      b248e616
Loading