qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eric Blake" <eblake@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"John Snow" <jsnow@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	qemu-block@nongnu.org, "Leonardo Bras" <leobras@redhat.com>,
	"Fam Zheng" <fam@euphon.net>, "Peter Xu" <peterx@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 06/16] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry
Date: Fri,  5 May 2023 02:48:02 +0200	[thread overview]
Message-ID: <20230505004812.31583-7-quintela@redhat.com> (raw)
In-Reply-To: <20230505004812.31583-1-quintela@redhat.com>

Fixes this commit, clearly a bad merge after a rebase or similar, it
should have been its own case since that point.

commit 5b0e9dd46fbda5152566a4a26fd96bc0d0452bf7
Author: Peter Lieven <pl@kamp.de>
Date:   Tue Jun 24 11:32:36 2014 +0200

    migration: catch unknown flag combinations in ram_load

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230504114443.23891-2-quintela@redhat.com>
---
 migration/ram.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 23ba1cefff..5e7bf20ca5 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -4445,14 +4445,12 @@ static int ram_load_precopy(QEMUFile *f)
                 multifd_recv_sync_main();
             }
             break;
+        case RAM_SAVE_FLAG_HOOK:
+            ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL);
+            break;
         default:
-            if (flags & RAM_SAVE_FLAG_HOOK) {
-                ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL);
-            } else {
-                error_report("Unknown combination of migration flags: 0x%x",
-                             flags);
-                ret = -EINVAL;
-            }
+            error_report("Unknown combination of migration flags: 0x%x", flags);
+            ret = -EINVAL;
         }
         if (!ret) {
             ret = qemu_file_get_error(f);
-- 
2.40.0



  parent reply	other threads:[~2023-05-05  0:51 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-05  0:47 [PULL 00/16] Migration 20230505 patches Juan Quintela
2023-05-05  0:47 ` [PULL 01/16] migration: Fix block_bitmap_mapping migration Juan Quintela
2023-05-05  0:47 ` [PULL 02/16] migration/rdma: Don't pass the QIOChannelRDMA as an opaque Juan Quintela
2023-05-05  0:47 ` [PULL 03/16] migration: Document all migration_stats Juan Quintela
2023-05-05  0:48 ` [PULL 04/16] migration: Put zero_pages in alphabetical order Juan Quintela
2023-05-05  0:48 ` [PULL 05/16] migration: Rename xbzrle_enabled xbzrle_started Juan Quintela
2023-05-05  0:48 ` Juan Quintela [this message]
2023-05-05  0:48 ` [PULL 07/16] migration/rdma: simplify ram_control_load_hook() Juan Quintela
2023-05-05  0:48 ` [PULL 08/16] migration/rdma: We can calculate the rioc from the QEMUFile Juan Quintela
2023-05-05  0:48 ` [PULL 09/16] migration/rdma: It makes no sense to recive that flag without RDMA Juan Quintela
2023-05-05  0:48 ` [PULL 10/16] migration/rdma: Check for postcopy sooner Juan Quintela
2023-05-05  0:48 ` [PULL 11/16] migration: max_postcopy_bandwidth is a size parameter Juan Quintela
2023-05-05  0:48 ` [PULL 12/16] migration: qemu_file_total_transferred() function is monotonic Juan Quintela
2023-05-05  0:48 ` [PULL 13/16] qemu-file: No need to check for shutdown in qemu_file_rate_limit Juan Quintela
2023-05-05  0:48 ` [PULL 14/16] qemu-file: remove shutdown member Juan Quintela
2023-05-05  0:48 ` [PULL 15/16] qemu-file: Make total_transferred an uint64_t Juan Quintela
2023-05-05  0:48 ` [PULL 16/16] qemu-file: Make ram_control_save_page() use accessors for rate_limit Juan Quintela
2023-05-05 21:18 ` [PULL 00/16] Migration 20230505 patches Richard Henderson

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=20230505004812.31583-7-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    /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).