From: "Zhijian Li (Fujitsu)" via <qemu-devel@nongnu.org>
To: Fabiano Rosas <farosas@suse.de>,
Li Zhijian via <qemu-devel@nongnu.org>,
Peter Xu <peterx@redhat.com>
Cc: Hailiang Zhang <zhanghailiang@xfusion.com>,
Zhang Chen <chen.zhang@intel.com>
Subject: Re: [PATCH 2/3] migration/colo: make colo_incoming_co() return void
Date: Thu, 16 May 2024 03:37:36 +0000 [thread overview]
Message-ID: <29c24cce-18b6-4f3a-b62e-96e2cf31b239@fujitsu.com> (raw)
In-Reply-To: <87le4aew1m.fsf@suse.de>
On 16/05/2024 03:04, Fabiano Rosas wrote:
> Li Zhijian via <qemu-devel@nongnu.org> writes:
>
>> Currently, it always returns 0, no need to check the return value at all.
>> In addition, enter colo coroutine only if migration_incoming_colo_enabled()
>> is true.
>> Once the destination side enters the COLO* state, the COLO process will
>> take over the remaining processes until COLO exits.
>>
>> Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
>> ---
>> migration/colo.c | 9 ++-------
>> migration/migration.c | 6 +++---
>> 2 files changed, 5 insertions(+), 10 deletions(-)
>>
>> diff --git a/migration/colo.c b/migration/colo.c
>> index 5600a43d78..991806c06a 100644
>> --- a/migration/colo.c
>> +++ b/migration/colo.c
>> @@ -929,16 +929,13 @@ out:
>> return NULL;
>> }
>>
>> -int coroutine_fn colo_incoming_co(void)
>> +void coroutine_fn colo_incoming_co(void)
>> {
>> MigrationIncomingState *mis = migration_incoming_get_current();
>> QemuThread th;
>>
>> assert(bql_locked());
>> -
>> - if (!migration_incoming_colo_enabled()) {
>> - return 0;
>> - }
>> + assert(migration_incoming_colo_enabled());
>
> FAILED: libcommon.fa.p/migration_colo.c.o
> /usr/bin/gcc-13 ... ../migration/colo.c
> ../migration/colo.c:930:19: error: conflicting types for ‘colo_incoming_co’; have ‘void(void)’
> 930 | void coroutine_fn colo_incoming_co(void)
> | ^~~~~~~~~~~~~~~~
> In file included from ../migration/colo.c:20:
> ... qemu/include/migration/colo.h:52:18: note: previous declaration of ‘colo_incoming_co’ with type ‘int(void)’
> 52 | int coroutine_fn colo_incoming_co(void);
My fault, will fix it soon
Thanks
Zhijian
> | ^~~~~~~~~~~~~~~~
next prev parent reply other threads:[~2024-05-16 3:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 3:31 [PATCH 1/3] migration/colo: Minor fix for colo error message Li Zhijian via
2024-05-09 3:31 ` [PATCH 2/3] migration/colo: make colo_incoming_co() return void Li Zhijian via
2024-05-09 13:37 ` Peter Xu
2024-05-11 2:51 ` Zhang, Chen
2024-05-15 19:04 ` Fabiano Rosas
2024-05-16 3:37 ` Zhijian Li (Fujitsu) via [this message]
2024-05-09 3:31 ` [PATCH 3/3] migration/colo: Tidy up bql_unlock() around bdrv_activate_all() Li Zhijian via
2024-05-09 13:38 ` Peter Xu
2024-05-11 2:51 ` Zhang, Chen
2024-05-09 13:33 ` [PATCH 1/3] migration/colo: Minor fix for colo error message Peter Xu
2024-05-11 2:51 ` Zhang, Chen
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=29c24cce-18b6-4f3a-b62e-96e2cf31b239@fujitsu.com \
--to=qemu-devel@nongnu.org \
--cc=chen.zhang@intel.com \
--cc=farosas@suse.de \
--cc=lizhijian@fujitsu.com \
--cc=peterx@redhat.com \
--cc=zhanghailiang@xfusion.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 read-only IMAP folder(s) and NNTP newsgroup(s).