[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/6] migration: fix applying wrong capabilities
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 5/6] migration: fix applying wrong capabilities |
Date: |
Fri, 9 Mar 2018 17:54:52 +0000 |
From: Peter Xu <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
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
- [Qemu-devel] [PULL 0/6] migration queue, Dr. David Alan Gilbert (git), 2018/03/09
- [Qemu-devel] [PULL 1/6] migration: fix minor finalize leak, Dr. David Alan Gilbert (git), 2018/03/09
- [Qemu-devel] [PULL 2/6] migration: do not transfer ram during bulk storage migration, Dr. David Alan Gilbert (git), 2018/03/09
- [Qemu-devel] [PULL 5/6] migration: fix applying wrong capabilities,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 3/6] migration/block: reset dirty bitmap before read in bulk phase, Dr. David Alan Gilbert (git), 2018/03/09
- [Qemu-devel] [PULL 4/6] migration/block: rename MAX_INFLIGHT_IO to MAX_IO_BUFFERS, Dr. David Alan Gilbert (git), 2018/03/09
- [Qemu-devel] [PULL 6/6] tests: Silence migration-test 'bad' test, Dr. David Alan Gilbert (git), 2018/03/09
- Re: [Qemu-devel] [PULL 0/6] migration queue, Peter Maydell, 2018/03/12