[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 14/31] block: remove dead check
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 14/31] block: remove dead check |
Date: |
Tue, 24 Jan 2017 12:39:18 +0300 |
From: Paolo Bonzini <address@hidden>
options must be non-NULL here, because a NULL value is replaced with
qdict_new earlier in the function. Reported by Coverity.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
block.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 39ddea3..a0346c8 100644
--- a/block.c
+++ b/block.c
@@ -1851,7 +1851,7 @@ static BlockDriverState *bdrv_open_inherit(const char
*filename,
bdrv_refresh_filename(bs);
/* Check if any unknown options were used */
- if (options && (qdict_size(options) != 0)) {
+ if (qdict_size(options) != 0) {
const QDictEntry *entry = qdict_first(options);
if (flags & BDRV_O_PROTOCOL) {
error_setg(errp, "Block protocol '%s' doesn't support the option "
--
2.1.4
- [Qemu-trivial] [PULL 07/31] qemu-options: cleanup duplicated help message for kernel_irqchip, (continued)
- [Qemu-trivial] [PULL 07/31] qemu-options: cleanup duplicated help message for kernel_irqchip, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 29/31] gdbstub.c: update old error report statements, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 27/31] scsi-disk: add 'fall through' comment to switch VERIFY cases, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 18/31] lm32: milkymist-tmu2: fix another integer overflow, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 08/31] usb: Fix typo in documentation, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 23/31] util/mmap-alloc: refactor a little bit for readability, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 04/31] Fix documentation and some comments (article, grammar), Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 20/31] docs: sync pci-ids.txt, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 26/31] Drop duplicate display option documentation, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 24/31] win32: use glib gpoll if glib >= 2.50, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 14/31] block: remove dead check,
Michael Tokarev <=
- [Qemu-trivial] [PULL 10/31] object: make some funcs static, Michael Tokarev, 2017/01/24
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24, no-reply, 2017/01/24
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24, Peter Maydell, 2017/01/24
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24, Peter Maydell, 2017/01/24
- [Qemu-trivial] [PULL 00/31] Trivial patches for 2017-01-24, Michael Tokarev, 2017/01/24