[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 3/5] migration: Simplify ram_find_and_save_block()
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH 3/5] migration: Simplify ram_find_and_save_block() |
Date: |
Tue, 5 Jul 2022 13:51:23 +0100 |
User-agent: |
Mutt/2.2.6 (2022-06-05) |
* Juan Quintela (quintela@redhat.com) wrote:
> We will need later that find_dirty_block() return errors, so
> simplify the loop.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> migration/ram.c | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 35816a3a0a..1d4ff3185b 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2256,7 +2256,6 @@ static int ram_find_and_save_block(RAMState *rs)
> {
> PageSearchStatus pss;
> int pages = 0;
> - bool again, found;
>
> /* No dirty page as there is zero RAM */
> if (!ram_bytes_total()) {
> @@ -2272,18 +2271,17 @@ static int ram_find_and_save_block(RAMState *rs)
> }
>
> do {
> - again = true;
> - found = get_queued_page(rs, &pss);
> -
> - if (!found) {
> + if (!get_queued_page(rs, &pss)) {
> /* priority queue empty, so just search for something dirty */
> - found = find_dirty_block(rs, &pss, &again);
> + bool again = true;
> + if (!find_dirty_block(rs, &pss, &again)) {
> + if (!again) {
> + break;
> + }
> + }
> }
> -
> - if (found) {
> - pages = ram_save_host_page(rs, &pss);
> - }
> - } while (!pages && again);
> + pages = ram_save_host_page(rs, &pss);
> + } while (!pages);
>
> rs->last_seen_block = pss.block;
> rs->last_page = pss.page;
> --
> 2.34.1
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH 3/5] migration: Simplify ram_find_and_save_block(),
Dr. David Alan Gilbert <=