qapi: Inline and remove QERR_MIGRATION_ACTIVE definition
Address the comment added in commit 4629ed1e98
("qerror: Finally unused, clean up"), from 2015:
/*
* These macros will go away, please don't use
* in new code, and do not add new ones!
*/
Mechanical transformation using sed, manually
removing the definition in include/qapi/qmp/qerror.h.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240312141343.3168265-10-armbru@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
[Straightforward conflict with commit aeaafb1e59f (migration: export
migration_is_running) resolved]
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index b723830..385a487 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -23,9 +23,6 @@
#define QERR_IO_ERROR \
"An IO error has occurred"
-#define QERR_MIGRATION_ACTIVE \
- "There's a migration process in progress"
-
#define QERR_MISSING_PARAMETER \
"Parameter '%s' is missing"
diff --git a/migration/migration.c b/migration/migration.c
index 86bf76e..32cd89e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1956,7 +1956,7 @@
}
if (migration_is_running()) {
- error_setg(errp, QERR_MIGRATION_ACTIVE);
+ error_setg(errp, "There's a migration process in progress");
return false;
}
diff --git a/migration/options.c b/migration/options.c
index d7a773a..239f5ec 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -685,7 +685,7 @@
bool new_caps[MIGRATION_CAPABILITY__MAX];
if (migration_is_running()) {
- error_setg(errp, QERR_MIGRATION_ACTIVE);
+ error_setg(errp, "There's a migration process in progress");
return false;
}
@@ -729,7 +729,7 @@
bool new_caps[MIGRATION_CAPABILITY__MAX];
if (migration_is_running() || migration_in_colo_state()) {
- error_setg(errp, QERR_MIGRATION_ACTIVE);
+ error_setg(errp, "There's a migration process in progress");
return;
}
diff --git a/migration/savevm.c b/migration/savevm.c
index e7c1215..3fae9f1 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1707,7 +1707,7 @@
MigrationStatus status;
if (migration_is_running()) {
- error_setg(errp, QERR_MIGRATION_ACTIVE);
+ error_setg(errp, "There's a migration process in progress");
return -EINVAL;
}
