Create the cpr-exec-command migration parameter, defined as a list of
strings. It will be used for cpr-exec migration mode in a subsequent
patch, and contains forward references to cpr-exec mode in the qapi
doc.
No functional change, except that cpr-exec-command is shown by the
'info migrate' command.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
qapi/migration.json | 21 ++++++++++++++++++---
migration/migration-hmp-cmds.c | 25 +++++++++++++++++++++++++
migration/options.c | 14 ++++++++++++++
hmp-commands.hx | 2 +-
4 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/qapi/migration.json b/qapi/migration.json
index 2387c21..ea410fd 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -924,6 +924,10 @@
# only has effect if the @mapped-ram capability is enabled.
# (Since 9.1)
#
+# @cpr-exec-command: Command to start the new QEMU process when @mode
+# is @cpr-exec. The first list element is the program's filename,
+# the remainder its arguments. (Since 10.2)
+#
# Features:
#
# @unstable: Members @x-checkpoint-delay and
@@ -950,7 +954,8 @@
'vcpu-dirty-limit',
'mode',
'zero-page-detection',
- 'direct-io'] }
+ 'direct-io',
+ 'cpr-exec-command'] }
##
# @MigrateSetParameters:
@@ -1105,6 +1110,10 @@
# only has effect if the @mapped-ram capability is enabled.
# (Since 9.1)
#
+# @cpr-exec-command: Command to start the new QEMU process when @mode
+# is @cpr-exec. The first list element is the program's filename,
+# the remainder its arguments. (Since 10.2)
+#
# Features:
#
# @unstable: Members @x-checkpoint-delay and
@@ -1146,7 +1155,8 @@
'*vcpu-dirty-limit': 'uint64',
'*mode': 'MigMode',
'*zero-page-detection': 'ZeroPageDetection',
- '*direct-io': 'bool' } }
+ '*direct-io': 'bool',
+ '*cpr-exec-command': [ 'str' ]} }
##
# @migrate-set-parameters:
@@ -1315,6 +1325,10 @@
# only has effect if the @mapped-ram capability is enabled.
# (Since 9.1)
#
+# @cpr-exec-command: Command to start the new QEMU process when @mode
+# is @cpr-exec. The first list element is the program's filename,
+# the remainder its arguments. (Since 10.2)
+#
# Features:
#
# @unstable: Members @x-checkpoint-delay and
@@ -1353,7 +1367,8 @@
'*vcpu-dirty-limit': 'uint64',
'*mode': 'MigMode',
'*zero-page-detection': 'ZeroPageDetection',
- '*direct-io': 'bool' } }
+ '*direct-io': 'bool',
+ '*cpr-exec-command': [ 'str' ]} }
##
# @query-migrate-parameters:
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index 0fc21f0..79aa528 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -306,6 +306,18 @@ void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict)
qapi_free_MigrationCapabilityStatusList(caps);
}
+static void monitor_print_cpr_exec_command(Monitor *mon, strList *args)
+{
+ monitor_printf(mon, "%s:",
+ MigrationParameter_str(MIGRATION_PARAMETER_CPR_EXEC_COMMAND));
+
+ while (args) {
+ monitor_printf(mon, " %s", args->value);
+ args = args->next;
+ }
+ monitor_printf(mon, "\n");
+}
+
void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
{
MigrationParameters *params;
@@ -435,6 +447,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
MIGRATION_PARAMETER_DIRECT_IO),
params->direct_io ? "on" : "off");
}
+
+ assert(params->has_cpr_exec_command);
+ monitor_print_cpr_exec_command(mon, params->cpr_exec_command);
}
qapi_free_MigrationParameters(params);
@@ -716,6 +731,16 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
p->has_direct_io = true;
visit_type_bool(v, param, &p->direct_io, &err);
break;
+ case MIGRATION_PARAMETER_CPR_EXEC_COMMAND: {
+ g_autofree char **strv = g_strsplit(valuestr ?: "", " ", -1);
+ strList **tail = &p->cpr_exec_command;
+
+ for (int i = 0; strv[i]; i++) {
+ QAPI_LIST_APPEND(tail, strv[i]);
+ }
+ p->has_cpr_exec_command = true;
+ break;
+ }
default:
g_assert_not_reached();
}
diff --git a/migration/options.c b/migration/options.c
index 4e923a2..5183112 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -959,6 +959,9 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
params->zero_page_detection = s->parameters.zero_page_detection;
params->has_direct_io = true;
params->direct_io = s->parameters.direct_io;
+ params->has_cpr_exec_command = true;
+ params->cpr_exec_command = QAPI_CLONE(strList,
+ s->parameters.cpr_exec_command);
return params;
}
@@ -993,6 +996,7 @@ void migrate_params_init(MigrationParameters *params)
params->has_mode = true;
params->has_zero_page_detection = true;
params->has_direct_io = true;
+ params->has_cpr_exec_command = true;
}
/*
@@ -1297,6 +1301,10 @@ static void migrate_params_test_apply(MigrateSetParameters *params,
if (params->has_direct_io) {
dest->direct_io = params->direct_io;
}
+
+ if (params->has_cpr_exec_command) {
+ dest->cpr_exec_command = params->cpr_exec_command;
+ }
}
static void migrate_params_apply(MigrateSetParameters *params, Error **errp)
@@ -1429,6 +1437,12 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp)
if (params->has_direct_io) {
s->parameters.direct_io = params->direct_io;
}
+
+ if (params->has_cpr_exec_command) {
+ qapi_free_strList(s->parameters.cpr_exec_command);
+ s->parameters.cpr_exec_command =
+ QAPI_CLONE(strList, params->cpr_exec_command);
+ }
}
void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index d0e4f35..3cace8f 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1009,7 +1009,7 @@ ERST
{
.name = "migrate_set_parameter",
- .args_type = "parameter:s,value:s",
+ .args_type = "parameter:s,value:S",
.params = "parameter value",
.help = "Set the parameter for migration",
.cmd = hmp_migrate_set_parameter,
--
1.8.3.1Steve Sistare <steven.sistare@oracle.com> writes:
> Create the cpr-exec-command migration parameter, defined as a list of
> strings. It will be used for cpr-exec migration mode in a subsequent
> patch, and contains forward references to cpr-exec mode in the qapi
> doc.
>
> No functional change, except that cpr-exec-command is shown by the
> 'info migrate' command.
>
> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
> ---
> qapi/migration.json | 21 ++++++++++++++++++---
> migration/migration-hmp-cmds.c | 25 +++++++++++++++++++++++++
> migration/options.c | 14 ++++++++++++++
> hmp-commands.hx | 2 +-
> 4 files changed, 58 insertions(+), 4 deletions(-)
>
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 2387c21..ea410fd 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -924,6 +924,10 @@
> # only has effect if the @mapped-ram capability is enabled.
> # (Since 9.1)
> #
> +# @cpr-exec-command: Command to start the new QEMU process when @mode
> +# is @cpr-exec. The first list element is the program's filename,
> +# the remainder its arguments. (Since 10.2)
Please add a second space in ". (" for all three copies.
> +#
> # Features:
> #
> # @unstable: Members @x-checkpoint-delay and
> @@ -950,7 +954,8 @@
> 'vcpu-dirty-limit',
> 'mode',
> 'zero-page-detection',
> - 'direct-io'] }
> + 'direct-io',
> + 'cpr-exec-command'] }
>
> ##
> # @MigrateSetParameters:
> @@ -1105,6 +1110,10 @@
> # only has effect if the @mapped-ram capability is enabled.
> # (Since 9.1)
> #
> +# @cpr-exec-command: Command to start the new QEMU process when @mode
> +# is @cpr-exec. The first list element is the program's filename,
> +# the remainder its arguments. (Since 10.2)
> +#
> # Features:
> #
> # @unstable: Members @x-checkpoint-delay and
> @@ -1146,7 +1155,8 @@
> '*vcpu-dirty-limit': 'uint64',
> '*mode': 'MigMode',
> '*zero-page-detection': 'ZeroPageDetection',
> - '*direct-io': 'bool' } }
> + '*direct-io': 'bool',
> + '*cpr-exec-command': [ 'str' ]} }
>
> ##
> # @migrate-set-parameters:
> @@ -1315,6 +1325,10 @@
> # only has effect if the @mapped-ram capability is enabled.
> # (Since 9.1)
> #
> +# @cpr-exec-command: Command to start the new QEMU process when @mode
> +# is @cpr-exec. The first list element is the program's filename,
> +# the remainder its arguments. (Since 10.2)
> +#
> # Features:
> #
> # @unstable: Members @x-checkpoint-delay and
> @@ -1353,7 +1367,8 @@
> '*vcpu-dirty-limit': 'uint64',
> '*mode': 'MigMode',
> '*zero-page-detection': 'ZeroPageDetection',
> - '*direct-io': 'bool' } }
> + '*direct-io': 'bool',
> + '*cpr-exec-command': [ 'str' ]} }
>
> ##
> # @query-migrate-parameters:
Acked-by: Markus Armbruster <armbru@redhat.com>
[...]
On 9/11/2025 11:10 AM, Markus Armbruster wrote:
> Steve Sistare <steven.sistare@oracle.com> writes:
>
>> Create the cpr-exec-command migration parameter, defined as a list of
>> strings. It will be used for cpr-exec migration mode in a subsequent
>> patch, and contains forward references to cpr-exec mode in the qapi
>> doc.
>>
>> No functional change, except that cpr-exec-command is shown by the
>> 'info migrate' command.
>>
>> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
>> ---
>> qapi/migration.json | 21 ++++++++++++++++++---
>> migration/migration-hmp-cmds.c | 25 +++++++++++++++++++++++++
>> migration/options.c | 14 ++++++++++++++
>> hmp-commands.hx | 2 +-
>> 4 files changed, 58 insertions(+), 4 deletions(-)
>>
>> diff --git a/qapi/migration.json b/qapi/migration.json
>> index 2387c21..ea410fd 100644
>> --- a/qapi/migration.json
>> +++ b/qapi/migration.json
>> @@ -924,6 +924,10 @@
>> # only has effect if the @mapped-ram capability is enabled.
>> # (Since 9.1)
>> #
>> +# @cpr-exec-command: Command to start the new QEMU process when @mode
>> +# is @cpr-exec. The first list element is the program's filename,
>> +# the remainder its arguments. (Since 10.2)
>
> Please add a second space in ". (" for all three copies.
Sure. Thanks for reviewing.
- Steve
>> +#
>> # Features:
>> #
>> # @unstable: Members @x-checkpoint-delay and
>> @@ -950,7 +954,8 @@
>> 'vcpu-dirty-limit',
>> 'mode',
>> 'zero-page-detection',
>> - 'direct-io'] }
>> + 'direct-io',
>> + 'cpr-exec-command'] }
>>
>> ##
>> # @MigrateSetParameters:
>> @@ -1105,6 +1110,10 @@
>> # only has effect if the @mapped-ram capability is enabled.
>> # (Since 9.1)
>> #
>> +# @cpr-exec-command: Command to start the new QEMU process when @mode
>> +# is @cpr-exec. The first list element is the program's filename,
>> +# the remainder its arguments. (Since 10.2)
>> +#
>> # Features:
>> #
>> # @unstable: Members @x-checkpoint-delay and
>> @@ -1146,7 +1155,8 @@
>> '*vcpu-dirty-limit': 'uint64',
>> '*mode': 'MigMode',
>> '*zero-page-detection': 'ZeroPageDetection',
>> - '*direct-io': 'bool' } }
>> + '*direct-io': 'bool',
>> + '*cpr-exec-command': [ 'str' ]} }
>>
>> ##
>> # @migrate-set-parameters:
>> @@ -1315,6 +1325,10 @@
>> # only has effect if the @mapped-ram capability is enabled.
>> # (Since 9.1)
>> #
>> +# @cpr-exec-command: Command to start the new QEMU process when @mode
>> +# is @cpr-exec. The first list element is the program's filename,
>> +# the remainder its arguments. (Since 10.2)
>> +#
>> # Features:
>> #
>> # @unstable: Members @x-checkpoint-delay and
>> @@ -1353,7 +1367,8 @@
>> '*vcpu-dirty-limit': 'uint64',
>> '*mode': 'MigMode',
>> '*zero-page-detection': 'ZeroPageDetection',
>> - '*direct-io': 'bool' } }
>> + '*direct-io': 'bool',
>> + '*cpr-exec-command': [ 'str' ]} }
>>
>> ##
>> # @query-migrate-parameters:
>
> Acked-by: Markus Armbruster <armbru@redhat.com>
>
>
> [...]
>
On Thu, Aug 14, 2025 at 10:17:19AM -0700, Steve Sistare wrote:
> Create the cpr-exec-command migration parameter, defined as a list of
> strings. It will be used for cpr-exec migration mode in a subsequent
> patch, and contains forward references to cpr-exec mode in the qapi
> doc.
>
> No functional change, except that cpr-exec-command is shown by the
> 'info migrate' command.
>
> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
> ---
> qapi/migration.json | 21 ++++++++++++++++++---
> migration/migration-hmp-cmds.c | 25 +++++++++++++++++++++++++
> migration/options.c | 14 ++++++++++++++
> hmp-commands.hx | 2 +-
> 4 files changed, 58 insertions(+), 4 deletions(-)
> diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
> index 0fc21f0..79aa528 100644
> --- a/migration/migration-hmp-cmds.c
> +++ b/migration/migration-hmp-cmds.c
> @@ -306,6 +306,18 @@ void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict)
> qapi_free_MigrationCapabilityStatusList(caps);
> }
>
> +static void monitor_print_cpr_exec_command(Monitor *mon, strList *args)
> +{
> + monitor_printf(mon, "%s:",
> + MigrationParameter_str(MIGRATION_PARAMETER_CPR_EXEC_COMMAND));
> +
> + while (args) {
> + monitor_printf(mon, " %s", args->value);
> + args = args->next;
> + }
> + monitor_printf(mon, "\n");
> +}
> +
> void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
> {
> MigrationParameters *params;
> @@ -435,6 +447,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
> MIGRATION_PARAMETER_DIRECT_IO),
> params->direct_io ? "on" : "off");
> }
> +
> + assert(params->has_cpr_exec_command);
> + monitor_print_cpr_exec_command(mon, params->cpr_exec_command);
> }
>
> qapi_free_MigrationParameters(params);
> @@ -716,6 +731,16 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
> p->has_direct_io = true;
> visit_type_bool(v, param, &p->direct_io, &err);
> break;
> + case MIGRATION_PARAMETER_CPR_EXEC_COMMAND: {
> + g_autofree char **strv = g_strsplit(valuestr ?: "", " ", -1);
Perhaps we should use g_shell_parse_argv() in the HMP case ? IIUC
it should handle quoting for args containing whitespace (as long as
HMP itself has not already mangled that ?).
> + strList **tail = &p->cpr_exec_command;
> +
> + for (int i = 0; strv[i]; i++) {
> + QAPI_LIST_APPEND(tail, strv[i]);
> + }
> + p->has_cpr_exec_command = true;
> + break;
> + }
> default:
> g_assert_not_reached();
> }
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 9/8/2025 12:07 PM, Daniel P. Berrangé wrote:
> On Thu, Aug 14, 2025 at 10:17:19AM -0700, Steve Sistare wrote:
>> Create the cpr-exec-command migration parameter, defined as a list of
>> strings. It will be used for cpr-exec migration mode in a subsequent
>> patch, and contains forward references to cpr-exec mode in the qapi
>> doc.
>>
>> No functional change, except that cpr-exec-command is shown by the
>> 'info migrate' command.
>>
>> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
>> ---
>> qapi/migration.json | 21 ++++++++++++++++++---
>> migration/migration-hmp-cmds.c | 25 +++++++++++++++++++++++++
>> migration/options.c | 14 ++++++++++++++
>> hmp-commands.hx | 2 +-
>> 4 files changed, 58 insertions(+), 4 deletions(-)
>
>> diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
>> index 0fc21f0..79aa528 100644
>> --- a/migration/migration-hmp-cmds.c
>> +++ b/migration/migration-hmp-cmds.c
>> @@ -306,6 +306,18 @@ void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict)
>> qapi_free_MigrationCapabilityStatusList(caps);
>> }
>>
>> +static void monitor_print_cpr_exec_command(Monitor *mon, strList *args)
>> +{
>> + monitor_printf(mon, "%s:",
>> + MigrationParameter_str(MIGRATION_PARAMETER_CPR_EXEC_COMMAND));
>> +
>> + while (args) {
>> + monitor_printf(mon, " %s", args->value);
>> + args = args->next;
>> + }
>> + monitor_printf(mon, "\n");
>> +}
>> +
>> void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
>> {
>> MigrationParameters *params;
>> @@ -435,6 +447,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
>> MIGRATION_PARAMETER_DIRECT_IO),
>> params->direct_io ? "on" : "off");
>> }
>> +
>> + assert(params->has_cpr_exec_command);
>> + monitor_print_cpr_exec_command(mon, params->cpr_exec_command);
>> }
>>
>> qapi_free_MigrationParameters(params);
>> @@ -716,6 +731,16 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
>> p->has_direct_io = true;
>> visit_type_bool(v, param, &p->direct_io, &err);
>> break;
>> + case MIGRATION_PARAMETER_CPR_EXEC_COMMAND: {
>> + g_autofree char **strv = g_strsplit(valuestr ?: "", " ", -1);
>
>
> Perhaps we should use g_shell_parse_argv() in the HMP case ? IIUC
> it should handle quoting for args containing whitespace (as long as
> HMP itself has not already mangled that ?).
Thank-you Daniel, that is a good idea.
I verified it works with HMP:
$ build/qemu-system-x86_64 -display none -monitor stdio
(qemu) migrate_set_parameter cpr-exec-command 'a b' c
[0] = a b
[1] = c
(qemu) migrate_set_parameter cpr-exec-command "a b" c
[0] = a b
[1] = c
- Steve
© 2016 - 2025 Red Hat, Inc.