mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Inline and remove QERR_MIGRATION_ACTIVE definition

Browse Source 
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 aeaafb1e59 (migration: export
migration_is_running) resolved]
This commit is contained in:
Philippe Mathieu-Daudé 2024-03-12 15:13:42 +01:00 committed by Markus Armbruster
parent 45d19d9306
commit 005807860d
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qapi/qmp/qerror.h
View File

@ -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"

2
migration/migration.c
View File

@ -1956,7 +1956,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
}
if (migration_is_running()) {
error_setg(errp, QERR_MIGRATION_ACTIVE);
error_setg(errp, "There's a migration process in progress");
return false;
}

4
migration/options.c
View File

@ -685,7 +685,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp)
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 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
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;
}

2
migration/savevm.c
View File

@ -1707,7 +1707,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
MigrationStatus status;
if (migration_is_running()) {
error_setg(errp, QERR_MIGRATION_ACTIVE);
error_setg(errp, "There's a migration process in progress");
return -EINVAL;
}