All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@redhat.com, pl@kamp.de, peterx@redhat.com,
	quintela@redhat.com
Subject: [Qemu-devel] [PULL 5/6] migration: fix applying wrong capabilities
Date: Fri,  9 Mar 2018 17:54:52 +0000	[thread overview]
Message-ID: <20180309175453.41548-6-dgilbert@redhat.com> (raw)
In-Reply-To: <20180309175453.41548-1-dgilbert@redhat.com>

From: Peter Xu <peterx@redhat.com>

When setting migration capabilities via QMP/HMP, we'll apply them even
if the capability check failed.  Fix it.

Fixes: 4a84214ebe ("migration: provide migrate_caps_check()", 2017-07-18)
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180305094938.31374-1-peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/migration.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index 62c243d2d4..6a4780ef6f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -747,13 +747,15 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
 {
     MigrationState *s = migrate_get_current();
     MigrationCapabilityStatusList *cap;
+    bool cap_list[MIGRATION_CAPABILITY__MAX];
 
     if (migration_is_setup_or_active(s->state)) {
         error_setg(errp, QERR_MIGRATION_ACTIVE);
         return;
     }
 
-    if (!migrate_caps_check(s->enabled_capabilities, params, errp)) {
+    memcpy(cap_list, s->enabled_capabilities, sizeof(cap_list));
+    if (!migrate_caps_check(cap_list, params, errp)) {
         return;
     }
 
-- 
2.14.3

  parent reply	other threads:[~2018-03-09 17:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-09 17:54 [Qemu-devel] [PULL 0/6] migration queue Dr. David Alan Gilbert (git)
2018-03-09 17:54 ` [Qemu-devel] [PULL 1/6] migration: fix minor finalize leak Dr. David Alan Gilbert (git)
2018-03-09 17:54 ` [Qemu-devel] [PULL 2/6] migration: do not transfer ram during bulk storage migration Dr. David Alan Gilbert (git)
2018-03-09 17:54 ` [Qemu-devel] [PULL 3/6] migration/block: reset dirty bitmap before read in bulk phase Dr. David Alan Gilbert (git)
2018-03-09 17:54 ` [Qemu-devel] [PULL 4/6] migration/block: rename MAX_INFLIGHT_IO to MAX_IO_BUFFERS Dr. David Alan Gilbert (git)
2018-03-09 17:54 ` Dr. David Alan Gilbert (git) [this message]
2018-03-09 17:54 ` [Qemu-devel] [PULL 6/6] tests: Silence migration-test 'bad' test Dr. David Alan Gilbert (git)
2018-03-12 14:06 ` [Qemu-devel] [PULL 0/6] migration queue Peter Maydell

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=20180309175453.41548-6-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=peterx@redhat.com \
    --cc=pl@kamp.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.