Browse Source

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]
Philippe Mathieu-Daudé 1 year ago
parent
commit
005807860d
4 changed files with 4 additions and 7 deletions
  1. 0 3
      include/qapi/qmp/qerror.h
  2. 1 1
      migration/migration.c
  3. 2 2
      migration/options.c
  4. 1 1
      migration/savevm.c

+ 0 - 3
include/qapi/qmp/qerror.h

@@ -23,9 +23,6 @@
 #define QERR_IO_ERROR \
 #define QERR_IO_ERROR \
     "An IO error has occurred"
     "An IO error has occurred"
 
 
-#define QERR_MIGRATION_ACTIVE \
-    "There's a migration process in progress"
-
 #define QERR_MISSING_PARAMETER \
 #define QERR_MISSING_PARAMETER \
     "Parameter '%s' is missing"
     "Parameter '%s' is missing"
 
 

+ 1 - 1
migration/migration.c

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

+ 2 - 2
migration/options.c

@@ -685,7 +685,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp)
     bool new_caps[MIGRATION_CAPABILITY__MAX];
     bool new_caps[MIGRATION_CAPABILITY__MAX];
 
 
     if (migration_is_running()) {
     if (migration_is_running()) {
-        error_setg(errp, QERR_MIGRATION_ACTIVE);
+        error_setg(errp, "There's a migration process in progress");
         return false;
         return false;
     }
     }
 
 
@@ -729,7 +729,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
     bool new_caps[MIGRATION_CAPABILITY__MAX];
     bool new_caps[MIGRATION_CAPABILITY__MAX];
 
 
     if (migration_is_running() || migration_in_colo_state()) {
     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;
         return;
     }
     }
 
 

+ 1 - 1
migration/savevm.c

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