diff --git a/hmp-commands.hx b/hmp-commands.hx index d42c09f257..bfa5681dd2 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -955,8 +955,8 @@ ETEXI { .name = "announce_self", - .args_type = "interfaces:s?", - .params = "[interfaces]", + .args_type = "interfaces:s?,id:s?", + .params = "[interfaces] [id]", .help = "Trigger GARP/RARP announcements", .cmd = hmp_announce_self, }, @@ -968,7 +968,8 @@ Trigger a round of GARP/RARP broadcasts; this is useful for explicitly updating network infrastructure after a reconfiguration or some forms of migration. The timings of the round are set by the migration announce parameters. An optional comma separated @var{interfaces} list restricts the announce to the -named set of interfaces. +named set of interfaces. An optional @var{id} can be used to start a separate announce +timer and to change the parameters of it later. ETEXI { diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 0fce1793f5..9de35387c3 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1660,12 +1660,15 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict) void hmp_announce_self(Monitor *mon, const QDict *qdict) { const char *interfaces_str = qdict_get_try_str(qdict, "interfaces"); + const char *id = qdict_get_try_str(qdict, "id"); AnnounceParameters *params = QAPI_CLONE(AnnounceParameters, migrate_announce_params()); qapi_free_strList(params->interfaces); params->interfaces = strList_from_comma_list(interfaces_str); params->has_interfaces = params->interfaces != NULL; + params->id = g_strdup(id); + params->has_id = !!params->id; qmp_announce_self(params, NULL); qapi_free_AnnounceParameters(params); }