From: Zhang Chen <chen.zhang@intel.com>
To: Jason Wang <jasowang@redhat.com>,
qemu-dev <qemu-devel@nongnu.org>, Eric Blake <eblake@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Lukas Straub <lukasstraub2@web.de>
Cc: Zhang Chen <chen.zhang@intel.com>, Zhang Chen <zhangckid@gmail.com>
Subject: [PATCH V3 4/7] hmp-commands: Add new HMP command for COLO passthrough
Date: Thu, 18 Mar 2021 11:04:57 +0800 [thread overview]
Message-ID: <20210318030500.55352-5-chen.zhang@intel.com> (raw)
In-Reply-To: <20210318030500.55352-1-chen.zhang@intel.com>
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.zhang@intel.com>
---
hmp-commands.hx | 26 ++++++++++++++++++++++++++
include/monitor/hmp.h | 2 ++
monitor/hmp-cmds.c | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 73e0832ea1..c71521303c 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1341,6 +1341,32 @@ SRST
Remove host network device.
ERST
+ {
+ .name = "colo_passthrough_add",
+ .args_type = "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?",
+ .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]",
+ .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,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?",
+ .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]",
+ .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:O",
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index ed2913fd18..3c4943b09f 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -81,6 +81,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 fd4d77e246..de675d16e7 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1660,6 +1660,40 @@ 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");
+ L4_Connection *l4_conn = g_new0(L4_Connection, 1);
+ Error *err = NULL;
+
+ l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id"));
+ l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, -1, &err);
+ l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip"));
+ l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip"));
+ l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0);
+ l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0);
+
+ qmp_colo_passthrough_add(l4_conn, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict)
+{
+ const char *prot = qdict_get_str(qdict, "protocol");
+ L4_Connection *l4_conn = g_new0(L4_Connection, 1);
+ Error *err = NULL;
+
+ l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id"));
+ l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, -1, &err);
+ l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip"));
+ l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip"));
+ l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0);
+ l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0);
+
+ qmp_colo_passthrough_del(l4_conn, &err);
+ hmp_handle_error(mon, err);
+}
+
void hmp_object_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
--
2.25.1
next prev parent reply other threads:[~2021-03-18 3:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 3:04 [PATCH V3 0/7] Bypass specific network traffic in COLO Zhang Chen
2021-03-18 3:04 ` [PATCH V3 1/7] qapi/net.json: Add IP_PROTOCOL definition Zhang Chen
2021-03-18 3:04 ` [PATCH V3 2/7] qapi/net.json: Add L4_Connection definition Zhang Chen
2021-03-18 3:04 ` [PATCH V3 3/7] qapi/net: Add new QMP command for COLO passthrough Zhang Chen
2021-03-18 3:04 ` Zhang Chen [this message]
2021-03-18 3:04 ` [PATCH V3 5/7] net/colo-compare: Move data structure and define to .h file Zhang Chen
2021-03-18 3:04 ` [PATCH V3 6/7] net/colo-compare: Add passthrough list to CompareState Zhang Chen
2021-03-18 3:05 ` [PATCH V3 7/7] net/net.c: Add handler for COLO passthrough connection Zhang Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210318030500.55352-5-chen.zhang@intel.com \
--to=chen.zhang@intel.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=lukasstraub2@web.de \
--cc=qemu-devel@nongnu.org \
--cc=zhangckid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).