From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
To: qemu devel <qemu-devel@nongnu.org>, Jason Wang <jasowang@redhat.com>
Cc: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>,
"eddie . dong" <eddie.dong@intel.com>,
bian naimeng <biannm@cn.fujitsu.com>,
Li Zhijian <lizhijian@cn.fujitsu.com>
Subject: [Qemu-devel] [PATCH 2/3] COLO-compare: Add Xen notify chardev socket handler frame
Date: Tue, 28 Feb 2017 18:48:21 +0800 [thread overview]
Message-ID: <1488278902-11223-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1488278902-11223-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>
Add chardev handler to get Xen colo-frame's notify.
Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
---
net/colo-compare.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 57d336b..947a9e2 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -72,8 +72,10 @@ typedef struct CompareState {
CharBackend chr_pri_in;
CharBackend chr_sec_in;
CharBackend chr_out;
+ CharBackend chr_notify_dev;
SocketReadState pri_rs;
SocketReadState sec_rs;
+ SocketReadState notify_rs;
/* connection list: the connections belonged to this NIC could be found
* in this list.
@@ -513,6 +515,19 @@ static gboolean check_old_packet_regular(void *opaque)
return TRUE;
}
+static void compare_notify_chr(void *opaque, const uint8_t *buf, int size)
+{
+ CompareState *s = COLO_COMPARE(opaque);
+ int ret;
+
+ ret = net_fill_rstate(&s->notify_rs, buf, size);
+ if (ret == -1) {
+ qemu_chr_fe_set_handlers(&s->chr_notify_dev, NULL, NULL, NULL,
+ NULL, NULL, true);
+ error_report("colo-compare notify_dev error");
+ }
+}
+
static void *colo_compare_thread(void *opaque)
{
CompareState *s = opaque;
@@ -524,6 +539,8 @@ static void *colo_compare_thread(void *opaque)
compare_pri_chr_in, NULL, s, s->worker_context, true);
qemu_chr_fe_set_handlers(&s->chr_sec_in, compare_chr_can_read,
compare_sec_chr_in, NULL, s, s->worker_context, true);
+ qemu_chr_fe_set_handlers(&s->chr_notify_dev, compare_chr_can_read,
+ compare_notify_chr, NULL, s, s->worker_context, true);
s->compare_loop = g_main_loop_new(s->worker_context, FALSE);
@@ -626,6 +643,10 @@ static void compare_sec_rs_finalize(SocketReadState *sec_rs)
}
}
+static void compare_notify_rs_finalize(SocketReadState *notify_rs)
+{
+ /* Get Xen colo-frame's notify and handle the message */
+}
/*
* Return 0 is success.
@@ -689,8 +710,14 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
return;
}
+ if (find_and_check_chardev(&chr, s->notify_dev, errp) ||
+ !qemu_chr_fe_init(&s->chr_notify_dev, chr, errp)) {
+ return;
+ }
+
net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize);
net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize);
+ net_socket_rs_init(&s->notify_rs, compare_notify_rs_finalize);
g_queue_init(&s->conn_list);
@@ -757,6 +784,7 @@ static void colo_compare_finalize(Object *obj)
qemu_chr_fe_set_handlers(&s->chr_sec_in, NULL, NULL, NULL, NULL,
s->worker_context, true);
qemu_chr_fe_deinit(&s->chr_out);
+ qemu_chr_fe_deinit(&s->chr_notify_dev);
g_main_loop_quit(s->compare_loop);
qemu_thread_join(&s->thread);
--
2.7.4
next prev parent reply other threads:[~2017-02-28 10:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 10:48 [Qemu-devel] [PATCH 0/3] COLO-compare: Make COLO-compare support Xen Zhang Chen
2017-02-28 10:48 ` [Qemu-devel] [PATCH 1/3] COLO-compare: Add new parameter for communicate with Xen colo-frame Zhang Chen
2017-02-28 10:48 ` Zhang Chen [this message]
2017-02-28 10:48 ` [Qemu-devel] [PATCH 3/3] COLO-compare: Add colo-compare Xen notify Zhang Chen
2017-03-13 6:18 ` [Qemu-devel] [PATCH 0/3] COLO-compare: Make COLO-compare support Xen Zhang Chen
2017-03-13 6:28 ` Jason Wang
2017-03-13 7:10 ` Zhang Chen
2017-03-13 7:21 ` Zhang Chen
2017-03-14 7:37 ` Jason Wang
2017-03-14 8:18 ` 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=1488278902-11223-3-git-send-email-zhangchen.fnst@cn.fujitsu.com \
--to=zhangchen.fnst@cn.fujitsu.com \
--cc=biannm@cn.fujitsu.com \
--cc=eddie.dong@intel.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=qemu-devel@nongnu.org \
--cc=zhang.zhanghailiang@huawei.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).