diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 10:24:22 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 10:24:22 +0100 |
| commit | 8212ff86f4405b6128d89dd1d97ff2d6cfcf9842 (patch) | |
| tree | 50f293d984cbe311cd984cb41989d85eb0fa5076 /blockdev.c | |
| parent | 507e4ddc3abf67391bcbc9624fd60b969c159b78 (diff) | |
| parent | 083d012a388e7e2a8bfd9144c2c9bcceb29a78fc (diff) | |
| download | qemu-8212ff86f4405b6128d89dd1d97ff2d6cfcf9842.tar.gz qemu-8212ff86f4405b6128d89dd1d97ff2d6cfcf9842.tar.bz2 qemu-8212ff86f4405b6128d89dd1d97ff2d6cfcf9842.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* minor patches here and there
* MTTCG: lock-free TB lookup
* SCSI: bugfixes for MPTSAS, MegaSAS, LSI53c, vmw_pvscsi
* buffer_is_zero rewrite (except for one patch)
* chardev: qemu_chr_fe_write checks
* checkpatch improvement for markdown preformatted text
* default-configs cleanups
* atomics cleanups
# gpg: Signature made Tue 13 Sep 2016 18:14:30 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream: (58 commits)
cutils: Add generic prefetch
cutils: Add SSE4 version
cutils: Add test for buffer_is_zero
cutils: Remove ppc buffer zero checking
cutils: Remove aarch64 buffer zero checking
cutils: Rearrange buffer_is_zero acceleration
cutils: Export only buffer_is_zero
cutils: Remove SPLAT macro
cutils: Move buffer_is_zero and subroutines to a new file
ppc: do not redefine CPUPPCState
x86/lapic: Load LAPIC state at post_load
optionrom: do not rely on compiler's bswap optimization
checkpatch: Fix whitespace checks for documentation code blocks
atomics: Use __atomic_*_n() variant primitives
atomics: Remove redundant barrier()'s
kvm-all: drop kvm_setup_guest_memory
i8257: Make device "i8257" unavailable with -device
Revert "megasas: remove useless check for cmd->frame"
char: convert qemu_chr_fe_write to qemu_chr_fe_write_all
hw: replace most use of qemu_chr_fe_write with qemu_chr_fe_write_all
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Conflicts:
cpus.c
tests/Makefile.include
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index 1399fbd931..301039392c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3907,7 +3907,7 @@ void qmp_x_blockdev_del(bool has_id, const char *id, goto out; } - if (!blk && !bs->monitor_list.tqe_prev) { + if (!blk && !QTAILQ_IN_USE(bs, monitor_list)) { error_setg(errp, "Node %s is not owned by the monitor", bs->node_name); goto out; |