[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/17] net/announce: Add HMP optional interface list
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 09/17] net/announce: Add HMP optional interface list |
Date: |
Tue, 2 Jul 2019 10:31:21 +0800 |
From: "Dr. David Alan Gilbert" <address@hidden>
Add the optional interface list to the HMP command.
i.e.
All interfaces
announce_self
Just the named interfaces:
announce_self vn1,vn2
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hmp-commands.hx | 6 ++++--
monitor/hmp-cmds.c | 38 +++++++++++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 8b7aec3..d42c09f 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 c283dde..0fce179 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)
--
2.5.0
- [Qemu-devel] [PULL 00/17] Net patches, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 04/17] net: fix assertion failure when ipv6-prefixlen is not a number, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 06/17] net: use g_strsplit() for parsing host address and port, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 07/17] net: remove unused get_str_sep() function, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 03/17] ftgmac100: do not link to netdev, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 08/17] net/announce: Allow optional list of interfaces, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 01/17] MAINTAINERS: Add qemu-bridge-helper.c to "Network device backends", Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 02/17] qemu-bridge-helper: Document known shortcomings, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 09/17] net/announce: Add HMP optional interface list,
Jason Wang <=
- [Qemu-devel] [PULL 05/17] net: avoid using variable length array in net_client_init(), Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 10/17] net/announce: Add optional ID, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 11/17] net/announce: Add HMP optional ID, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 12/17] net/announce: Expand test for stopping self announce, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 13/17] COLO-compare: Add new parameter to communicate with remote colo-frame, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 14/17] COLO-compare: Add remote notification chardev handler frame, Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 15/17] COLO-compare: Make the compare_chr_send() can send notification message., Jason Wang, 2019/07/01
- [Qemu-devel] [PULL 16/17] COLO-compare: Add colo-compare remote notify support, Jason Wang, 2019/07/01