diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-15 17:13:56 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-15 17:13:57 +0000 |
| commit | 8ba4bca570ace1e60614a0808631a517cf5df67a (patch) | |
| tree | de890352542f697bffbdb12bbe7ff638f47f0bf5 /monitor/qmp.c | |
| parent | 35f15acbc15d5abaa76ea2df6c068c28a2b456c2 (diff) | |
| parent | b248e61652e20c3353af4b0ccb90f17d76f4db21 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor/qmp.c')
| -rw-r--r-- | monitor/qmp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/monitor/qmp.c b/monitor/qmp.c index 43880fa623..2326bd7f9b 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -227,6 +227,11 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) */ qatomic_mb_set(&qmp_dispatcher_co_busy, false); + /* On shutdown, don't take any more requests from the queue */ + if (qmp_dispatcher_co_shutdown) { + return; + } + while (!(req_obj = monitor_qmp_requests_pop_any_with_lock())) { /* * No more requests to process. Wait to be reentered from |