* [PATCH] qemu-option: Drop dead assertion
@ 2021-06-10 8:50 Markus Armbruster
2021-06-10 9:29 ` Thomas Huth
0 siblings, 1 reply; 3+ messages in thread
From: Markus Armbruster @ 2021-06-10 8:50 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] qemu-option: Drop dead assertion
2021-06-10 8:50 [PATCH] qemu-option: Drop dead assertion Markus Armbruster
@ 2021-06-10 9:29 ` Thomas Huth
2021-07-09 9:00 ` Laurent Vivier
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Huth @ 2021-06-10 9:29 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: QEMU Trivial, pbonzini
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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] qemu-option: Drop dead assertion
2021-06-10 9:29 ` Thomas Huth
@ 2021-07-09 9:00 ` Laurent Vivier
0 siblings, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-07-09 9:00 UTC (permalink / raw)
To: Thomas Huth, Markus Armbruster, qemu-devel; +Cc: QEMU Trivial, pbonzini
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-09 9:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-10 8:50 [PATCH] qemu-option: Drop dead assertion Markus Armbruster
2021-06-10 9:29 ` Thomas Huth
2021-07-09 9:00 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).