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>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Li Zhijian" <lizhijian@cn.fujitsu.com>
Cc: Zhang Chen <chen.zhang@intel.com>,
Lukas Straub <lukasstraub2@web.de>,
Zhang Chen <zhangckid@gmail.com>
Subject: [PATCH V8 3/6] hmp-commands: Add new HMP command for COLO passthrough
Date: Tue, 15 Jun 2021 19:37:37 +0800 [thread overview]
Message-ID: <20210615113740.2278015-4-chen.zhang@intel.com> (raw)
In-Reply-To: <20210615113740.2278015-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 | 82 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 110 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 8e45bce2cd..895e60a774 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1292,6 +1292,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 3baa1058e2..2e171dba0c 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 d10ee14110..9d3269b28b 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1634,6 +1634,88 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
+void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict)
+{
+ IPFlowSpec *spec = g_new0(IPFlowSpec, 1);
+ char *src, *dst;
+ Error *err = NULL;
+
+ spec->protocol = g_strdup(qdict_get_try_str(qdict, "protocol"));
+ spec->object_name = g_strdup(qdict_get_try_str(qdict, "object-name"));
+
+ 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)
+{
+ IPFlowSpec *spec = g_new0(IPFlowSpec, 1);
+ char *src, *dst;
+ Error *err = NULL;
+
+ spec->protocol = g_strdup(qdict_get_try_str(qdict, "protocol"));
+ spec->object_name = g_strdup(qdict_get_try_str(qdict, "object-name"));
+
+ 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
next prev parent reply other threads:[~2021-06-15 11:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 11:37 [PATCH V8 0/6] Passthrough specific network traffic in COLO Zhang Chen
2021-06-15 11:37 ` [PATCH V8 1/6] qapi/net: Add IPFlowSpec and QMP command for COLO passthrough Zhang Chen
2021-06-15 14:43 ` Markus Armbruster
2021-06-16 2:12 ` Zhang, Chen
2021-06-16 6:04 ` Markus Armbruster
2021-06-16 6:45 ` Zhang, Chen
2021-06-16 13:26 ` Markus Armbruster
2021-06-17 3:27 ` Zhang, Chen
2021-06-17 11:03 ` Markus Armbruster
2021-06-22 5:58 ` chen.zhang
2021-06-21 11:30 ` Dr. David Alan Gilbert
2021-06-22 6:01 ` chen.zhang
2021-06-22 7:04 ` Jason Wang
2021-06-22 7:38 ` chen.zhang
2021-06-22 8:03 ` Jason Wang
2021-06-22 8:02 ` chen.zhang
2021-06-15 15:01 ` Lukas Straub
2021-06-16 1:20 ` Zhang, Chen
2021-06-22 7:05 ` Jason Wang
2021-06-22 7:41 ` chen.zhang
2021-06-15 11:37 ` [PATCH V8 2/6] util/qemu-sockets.c: Add inet_parse_base to handle InetSocketAddressBase Zhang Chen
2021-06-15 11:37 ` Zhang Chen [this message]
2021-06-15 11:37 ` [PATCH V8 4/6] net/colo-compare: Move data structure and define to .h file Zhang Chen
2021-06-15 11:37 ` [PATCH V8 5/6] net/colo-compare: Add passthrough list to CompareState Zhang Chen
2021-06-15 11:37 ` [PATCH V8 6/6] 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=20210615113740.2278015-4-chen.zhang@intel.com \
--to=chen.zhang@intel.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=lizhijian@cn.fujitsu.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 read-only IMAP folder(s) and NNTP newsgroup(s).