qemu-option: Drop dead assertion

[PATCH] qemu-option: Drop dead assertion

Posted by Markus Armbruster 2 years, 10 months ago

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>
---
 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)) {
-- 
2.31.1

Re: [PATCH] qemu-option: Drop dead assertion

Posted by Thomas Huth 2 years, 10 months ago

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 <armbru@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 <thuth@redhat.com>

Re: [PATCH] qemu-option: Drop dead assertion

Posted by Laurent Vivier 2 years, 9 months ago

Le 10/06/2021 à 11:29, Thomas Huth a écrit :
> 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 <armbru@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 <thuth@redhat.com>
> 
> 

Applied to my trivial-patches branch.

Thanks,
Laurent