[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/10] qapi: Inline and remove QERR_MIGRATION_ACTIVE definition
From: |
Markus Armbruster |
Subject: |
[PULL 09/10] qapi: Inline and remove QERR_MIGRATION_ACTIVE definition |
Date: |
Wed, 24 Apr 2024 10:03:36 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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]
---
include/qapi/qmp/qerror.h | 3 ---
migration/migration.c | 2 +-
migration/options.c | 4 ++--
migration/savevm.c | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index b723830eff..385a4876d6 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 86bf76e925..32cd89e13d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -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;
}
diff --git a/migration/options.c b/migration/options.c
index d7a773aea8..239f5ecfb4 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -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;
}
diff --git a/migration/savevm.c b/migration/savevm.c
index e7c1215671..3fae9f155f 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -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;
}
--
2.44.0
- [PULL 00/10] Error reporting patches for 2024-04-24, Markus Armbruster, 2024/04/24
- [PULL 07/10] qapi: Inline and remove QERR_INVALID_PARAMETER_TYPE definition, Markus Armbruster, 2024/04/24
- [PULL 04/10] qapi: Inline and remove QERR_DEVICE_NO_HOTPLUG definition, Markus Armbruster, 2024/04/24
- [PULL 09/10] qapi: Inline and remove QERR_MIGRATION_ACTIVE definition,
Markus Armbruster <=
- [PULL 02/10] qapi: Inline and remove QERR_BUS_NO_HOTPLUG definition, Markus Armbruster, 2024/04/24
- [PULL 05/10] qapi: Inline and remove QERR_INVALID_PARAMETER definition, Markus Armbruster, 2024/04/24
- [PULL 08/10] qapi: Correct error message for 'vcpu_dirty_limit' parameter, Markus Armbruster, 2024/04/24
- [PULL 03/10] qapi: Inline and remove QERR_DEVICE_HAS_NO_MEDIUM definition, Markus Armbruster, 2024/04/24
- [PULL 06/10] qapi: Inline QERR_INVALID_PARAMETER_TYPE definition (constant value), Markus Armbruster, 2024/04/24
- [PULL 01/10] error: Drop superfluous #include "qapi/qmp/qerror.h", Markus Armbruster, 2024/04/24
- [PULL 10/10] qapi: Inline and remove QERR_PROPERTY_VALUE_BAD definition, Markus Armbruster, 2024/04/24
- Re: [PULL 00/10] Error reporting patches for 2024-04-24, Richard Henderson, 2024/04/24