On 10/06/2021 10.50, Markus Armbruster wrote:
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 <arm...@redhat.com>
---
  util/qemu-option.c | 2 --
  1 file changed, 2 deletions(-)

diff --git a/util/qemu-option.c b/util/qemu-option.c
index 4944015a25..3fa0b13378 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1028,8 +1028,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)) {


Reviewed-by: Thomas Huth <th...@redhat.com>


Reply via email to