Add hmp_colo_passthrough_add and hmp_colo_passthrough_del make user
can maintain COLO network passthrough list in human monitor
Signed-off-by: Zhang Chen <chen.zh...@intel.com>
---
hmp-commands.hx | 26 ++++++++++++++
include/monitor/hmp.h | 2 ++
monitor/hmp-cmds.c | 84 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 112 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 435c591a1c..cbb08623c7 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1290,6 +1290,32 @@ SRST
Remove host network device.
ERST
+ {
+ .name = "colo_passthrough_add",
+ .args_type = "protocol:s,object-name:s?,src:s?,dst:s?",
+ .params = "protocol [object-name] [src] [dst]",
+ .help = "Add network stream to colo passthrough list",
+ .cmd = hmp_colo_passthrough_add,
+ },
+
+SRST
+``colo_passthrough_add``
+ Add network stream to colo passthrough list.
+ERST
+
+ {
+ .name = "colo_passthrough_del",
+ .args_type = "protocol:s,object-name:s?,src:s?,dst:s?",
+ .params = "protocol [object-name] [src] [dst]",
+ .help = "Delete network stream from colo passthrough list",
+ .cmd = hmp_colo_passthrough_del,
+ },
+
+SRST
+``colo_passthrough_del``
+ Delete network stream from colo passthrough list.
+ERST
+
{
.name = "object_add",
.args_type = "object:S",
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 605d57287a..a784f98531 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -77,6 +77,8 @@ void hmp_device_del(Monitor *mon, const QDict *qdict);
void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict);
void hmp_netdev_add(Monitor *mon, const QDict *qdict);
void hmp_netdev_del(Monitor *mon, const QDict *qdict);
+void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict);
+void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict);
void hmp_getfd(Monitor *mon, const QDict *qdict);
void hmp_closefd(Monitor *mon, const QDict *qdict);
void hmp_sendkey(Monitor *mon, const QDict *qdict);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 0ad5b77477..2c1c382c9e 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1634,6 +1634,90 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
+void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict)
+{
+ const char *prot = qdict_get_str(qdict, "protocol");
+ IPFlowSpec *spec = g_new0(IPFlowSpec, 1);
+ char *src, *dst;
+ Error *err = NULL;
+
+ spec->object_name = g_strdup(qdict_get_try_str(qdict, "object-name"));
+ spec->protocol = qapi_enum_parse(&IPProtocol_lookup, prot, -1, &err);
+
+ src = g_strdup(qdict_get_try_str(qdict, "src"));
+ if (src) {
+ spec->source = g_new0(InetSocketAddressBase, 1);
+
+ if (inet_parse_base(spec->source, src, NULL)) {
+ monitor_printf(mon, "bad colo passthrough src address");
+ goto out;
+ }
+ }
+
+ dst = g_strdup(qdict_get_try_str(qdict, "dst"));
+ if (dst) {
+ spec->destination = g_new0(InetSocketAddressBase, 1);
+
+ if (inet_parse_base(spec->destination, dst, NULL)) {
+ monitor_printf(mon, "bad colo passthrough dst address");
+ goto out;
+ }
+ }
+
+ qmp_colo_passthrough_add(spec, &err);
+
+out:
+ g_free(src);
+ src = NULL;
+
+ g_free(dst);
+ dst = NULL;
+
+ hmp_handle_error(mon, err);
+}
+
+void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict)
+{
+ const char *prot = qdict_get_str(qdict, "protocol");
+ IPFlowSpec *spec = g_new0(IPFlowSpec, 1);
+ char *src, *dst;
+ Error *err = NULL;
+
+ spec->object_name = g_strdup(qdict_get_try_str(qdict, "object-name"));
+ spec->protocol = qapi_enum_parse(&IPProtocol_lookup, prot, -1, &err);
+
+ src = g_strdup(qdict_get_try_str(qdict, "src"));
+ if (src) {
+ spec->source = g_new0(InetSocketAddressBase, 1);
+
+ if (inet_parse_base(spec->source, src, NULL)) {
+ monitor_printf(mon, "bad colo passthrough src address");
+ goto out;
+ }
+ }
+
+ dst = g_strdup(qdict_get_try_str(qdict, "dst"));
+ if (dst) {
+ spec->destination = g_new0(InetSocketAddressBase, 1);
+
+ if (inet_parse_base(spec->destination, dst, NULL)) {
+ monitor_printf(mon, "bad colo passthrough dst address");
+ goto out;
+ }
+ }
+
+ qmp_colo_passthrough_del(spec, &err);
+
+out:
+ g_free(src);
+ src = NULL;
+
+ g_free(dst);
+ dst = NULL;
+
+ hmp_handle_error(mon, err);
+}
+
void hmp_object_add(Monitor *mon, const QDict *qdict)
{
const char *options = qdict_get_str(qdict, "object");
--
2.25.1
