From: Li Zhang <lizhang@suse.de>
To: Claudio Fontana <cfontana@suse.de>,
quintela@redhat.com, dgilbert@redhat.com, qemu-devel@nongnu.org
Subject: Re: [PATCH 1/1] multifd: Remove some redundant code
Date: Fri, 17 Dec 2021 10:53:57 +0100 [thread overview]
Message-ID: <e108a7f6-8b1f-e003-0dfb-9cf364b2e5ad@suse.de> (raw)
In-Reply-To: <5ff179bb-cea8-35d9-f062-9cbfd3f7cb9e@suse.de>
On 12/17/21 10:39 AM, Claudio Fontana wrote:
> Hi Li,
>
> the full function for context:
>
> static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
> {
> MultiFDSendParams *p = opaque;
> QIOChannel *sioc = QIO_CHANNEL(qio_task_get_source(task));
> Error *local_err = NULL;
>
> trace_multifd_new_send_channel_async(p->id);
> if (qio_task_propagate_error(task, &local_err)) {
> goto cleanup;
> } else {
> p->c = QIO_CHANNEL(sioc);
> qio_channel_set_delay(p->c, false);
> p->running = true;
> if (!multifd_channel_connect(p, sioc, local_err)) {
> goto cleanup;
> }
> return;
> }
>
> cleanup:
> multifd_new_send_channel_cleanup(p, sioc, local_err);
> }
>
>
>
> On 12/17/21 10:33 AM, Li Zhang wrote:
>> Clean up some unnecessary code
>>
>> Signed-off-by: Li Zhang <lizhang@suse.de>
>> ---
>> migration/multifd.c | 9 ++-------
>> 1 file changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/migration/multifd.c b/migration/multifd.c
>> index 3242f688e5..1405cf95b8 100644
>> --- a/migration/multifd.c
>> +++ b/migration/multifd.c
>> @@ -854,9 +854,7 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
>> Error *local_err = NULL;
>>
>> trace_multifd_new_send_channel_async(p->id);
>> - if (qio_task_propagate_error(task, &local_err)) {
>> - goto cleanup;
>
> I see you are removing this goto, but keeping there the other one.. is this a bit inconsistent?
Ah, you are right. The other one is not necessary anymore.
>
> Should the second check be inverted too, to remove the other goto as well?
I would like to remove the goto and call the function directly.
>
> Ciao,
>
> Claudio
>
>> - } else {
>> + if (!qio_task_propagate_error(task, &local_err)) {
>> p->c = QIO_CHANNEL(sioc);
>> qio_channel_set_delay(p->c, false);
>> p->running = true;
>> @@ -1078,10 +1076,7 @@ static void *multifd_recv_thread(void *opaque)
>>
>> ret = qio_channel_read_all_eof(p->c, (void *)p->packet,
>> p->packet_len, &local_err);
>> - if (ret == 0) { /* EOF */
>> - break;
>> - }
>> - if (ret == -1) { /* Error */
>> + if (ret == 0 || ret == -1) { /* 0: EOF -1: Error */
>> break;
>> }
>>
>>
>
prev parent reply other threads:[~2021-12-17 9:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 9:33 [PATCH 1/1] multifd: Remove some redundant code Li Zhang
2021-12-17 9:39 ` Claudio Fontana
2021-12-17 9:53 ` Li Zhang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e108a7f6-8b1f-e003-0dfb-9cf364b2e5ad@suse.de \
--to=lizhang@suse.de \
--cc=cfontana@suse.de \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).