[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/15] migration: Fail migration blocker for --only-m
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 10/15] migration: Fail migration blocker for --only-migratable |
Date: |
Tue, 24 Jan 2017 18:47:37 +0000 |
From: Ashijeet Acharya <address@hidden>
migrate_add_blocker should rightly fail if the '--only-migratable'
option was specified and the device in use should not be able to
perform the action which results in an unmigratable VM.
Make migrate_add_blocker return -EACCES in this case.
Signed-off-by: Ashijeet Acharya <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
include/migration/migration.h | 2 +-
migration/migration.c | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index bcbdb03..7881e89 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -291,7 +291,7 @@ int ram_postcopy_incoming_init(MigrationIncomingState *mis);
*
* @errp - [out] The reason (if any) we cannot block migration right now.
*
- * @returns - 0 on success, -EBUSY on failure, with errp set.
+ * @returns - 0 on success, -EBUSY/-EACCES on failure, with errp set.
*/
int migrate_add_blocker(Error *reason, Error **errp);
diff --git a/migration/migration.c b/migration/migration.c
index 0d88286..7dcb7d7 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1113,6 +1113,13 @@ static GSList *migration_blockers;
int migrate_add_blocker(Error *reason, Error **errp)
{
+ if (only_migratable) {
+ error_propagate(errp, error_copy(reason));
+ error_prepend(errp, "disallowing migration blocker "
+ "(--only_migratable) for: ");
+ return -EACCES;
+ }
+
if (migration_is_idle(NULL)) {
migration_blockers = g_slist_prepend(migration_blockers, reason);
return 0;
--
2.9.3
- [Qemu-devel] [PULL 00/15] migration queue, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 01/15] MAINTAINERS: Add myself as a migration submaintainer, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 04/15] tests/migration: Add test for QTAILQ migration, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 06/15] block/vvfat: Remove the undesirable comment, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 05/15] migration: add error_report, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 07/15] migration: Add a new option to enable only-migratable, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 10/15] migration: Fail migration blocker for --only-migratable,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 12/15] migration: Change name of live migration thread, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 13/15] PCI/migration merge vmstate_pci_device and vmstate_pcie_device, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 09/15] migration: disallow migrate_add_blocker during migration, Dr. David Alan Gilbert (git), 2017/01/24
- [Qemu-devel] [PULL 02/15] migration: extend VMStateInfo, Dr. David Alan Gilbert (git), 2017/01/24
- Re: [Qemu-devel] [PULL 02/15] migration: extend VMStateInfo, Fam Zheng, 2017/01/25
- Re: [Qemu-devel] [PULL 02/15] migration: extend VMStateInfo, Dr. David Alan Gilbert, 2017/01/25
- Re: [Qemu-devel] [PULL 02/15] migration: extend VMStateInfo, Cornelia Huck, 2017/01/25
- Re: [Qemu-devel] [PULL 02/15] migration: extend VMStateInfo, Fam Zheng, 2017/01/25
- Re: [Qemu-devel] [PULL 02/15] migration: extend VMStateInfo, Cornelia Huck, 2017/01/25
- Re: [Qemu-devel] [PULL 02/15] migration: extend VMStateInfo, Dr. David Alan Gilbert, 2017/01/25