diff options
| -rw-r--r-- | hmp-commands.hx | 6 | ||||
| -rw-r--r-- | monitor/hmp-cmds.c | 38 |
2 files changed, 41 insertions, 3 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index 8b7aec3e8d..d42c09f257 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -955,8 +955,8 @@ ETEXI { .name = "announce_self", - .args_type = "", - .params = "", + .args_type = "interfaces:s?", + .params = "[interfaces]", .help = "Trigger GARP/RARP announcements", .cmd = hmp_announce_self, }, @@ -967,6 +967,8 @@ STEXI Trigger a round of GARP/RARP broadcasts; this is useful for explicitly updating the 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. ETEXI { diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index c283dde0e9..0fce1793f5 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -27,6 +27,7 @@ #include "monitor/monitor-internal.h" #include "monitor/qdev.h" #include "qapi/error.h" +#include "qapi/clone-visitor.h" #include "qapi/opts-visitor.h" #include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-commands-block.h" @@ -38,6 +39,7 @@ #include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-tpm.h" #include "qapi/qapi-commands-ui.h" +#include "qapi/qapi-visit-net.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/string-input-visitor.h" @@ -67,6 +69,32 @@ static void hmp_handle_error(Monitor *mon, Error **errp) } } +/* + * Produce a strList from a comma separated list. + * A NULL or empty input string return NULL. + */ +static strList *strList_from_comma_list(const char *in) +{ + strList *res = NULL; + strList **hook = &res; + + while (in && in[0]) { + char *comma = strchr(in, ','); + *hook = g_new0(strList, 1); + + if (comma) { + (*hook)->value = g_strndup(in, comma - in); + in = comma + 1; /* skip the , */ + } else { + (*hook)->value = g_strdup(in); + in = NULL; + } + hook = &(*hook)->next; + } + + return res; +} + void hmp_info_name(Monitor *mon, const QDict *qdict) { NameInfo *info; @@ -1631,7 +1659,15 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict) void hmp_announce_self(Monitor *mon, const QDict *qdict) { - qmp_announce_self(migrate_announce_params(), NULL); + const char *interfaces_str = qdict_get_try_str(qdict, "interfaces"); + 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; + qmp_announce_self(params, NULL); + qapi_free_AnnounceParameters(params); } void hmp_migrate_cancel(Monitor *mon, const QDict *qdict) |