[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] qemu-option: Drop dead assertion
From: |
Laurent Vivier |
Subject: |
[PULL 1/9] qemu-option: Drop dead assertion |
Date: |
Fri, 9 Jul 2021 22:28:16 +0200 |
From: Markus Armbruster <armbru@redhat.com>
Commit c6ecec43b2 "qemu-option: Check return value instead of @err
where convenient" simplified
opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1,
&local_err);
if (local_err) {
error_propagate(errp, local_err);
return NULL;
}
to
opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, errp);
if (!opts) {
return NULL;
}
but neglected to delete
assert(opts != NULL);
Do that now.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210610085026.436081-1-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
util/qemu-option.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index ee78e42216cc..61cb4a97bdb6 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -997,8 +997,6 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const
QDict *qdict,
return NULL;
}
- assert(opts != NULL);
-
for (entry = qdict_first(qdict);
entry;
entry = qdict_next(qdict, entry)) {
--
2.31.1
- [PULL 0/9] Trivial branch for 6.1 patches, Laurent Vivier, 2021/07/09
- [PULL 1/9] qemu-option: Drop dead assertion,
Laurent Vivier <=
- [PULL 6/9] hw/virtio: Document *_should_notify() are called within rcu_read_lock(), Laurent Vivier, 2021/07/09
- [PULL 2/9] memory: Display MemoryRegion name in read/write ops trace events, Laurent Vivier, 2021/07/09
- [PULL 8/9] migration: fix typo in mig_throttle_guest_down comment, Laurent Vivier, 2021/07/09
- [PULL 4/9] virtiofsd: Add missing newline in error message, Laurent Vivier, 2021/07/09
- [PULL 5/9] misc: Remove redundant new line in perror(), Laurent Vivier, 2021/07/09
- [PULL 9/9] util/guest-random: Fix size arg to tail memcpy, Laurent Vivier, 2021/07/09
- [PULL 7/9] target/xtensa/xtensa-semi: Fix compilation problem on Haiku, Laurent Vivier, 2021/07/09
- [PULL 3/9] misc: Fix "havn't" typo, Laurent Vivier, 2021/07/09
- Re: [PULL 0/9] Trivial branch for 6.1 patches, Peter Maydell, 2021/07/11