Message ID | 20200129053357.27454-8-alxndr@bu.edu |
---|---|
State | New |
Headers | show |
Series | [v8,01/21] softmmu: split off vl.c:main() into main.c | expand |
On Wed, Jan 29, 2020 at 05:34:17AM +0000, Bulekov, Alexander wrote: >The handler allows a qtest client to send commands to the server by >directly calling a function, rather than using a file/CharBackend > >Signed-off-by: Alexander Bulekov <alxndr@bu.edu> >Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> >--- > include/sysemu/qtest.h | 1 + > qtest.c | 13 +++++++++++++ > 2 files changed, 14 insertions(+) > >diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h >index e2f1047fd7..eedd3664f0 100644 >--- a/include/sysemu/qtest.h >+++ b/include/sysemu/qtest.h >@@ -28,5 +28,6 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error ** > > void qtest_server_set_send_handler(void (*send)(void *, const char *), > void *opaque); >+void qtest_server_inproc_recv(void *opaque, const char *buf); > > #endif >diff --git a/qtest.c b/qtest.c >index 938c3746d6..ad6eb6a526 100644 >--- a/qtest.c >+++ b/qtest.c >@@ -803,3 +803,16 @@ bool qtest_driver(void) > { > return qtest_chr.chr != NULL; > } >+ >+void qtest_server_inproc_recv(void *dummy, const char *buf) >+{ >+ static GString *gstr; >+ if (!gstr) { >+ gstr = g_string_new(NULL); >+ } >+ g_string_append(gstr, buf); >+ if (gstr->str[gstr->len - 1] == '\n') { >+ qtest_process_inbuf(NULL, gstr); >+ g_string_truncate(gstr, 0); >+ } >+} >-- >2.23.0 > >
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index e2f1047fd7..eedd3664f0 100644 --- a/include/sysemu/qtest.h +++ b/include/sysemu/qtest.h @@ -28,5 +28,6 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error ** void qtest_server_set_send_handler(void (*send)(void *, const char *), void *opaque); +void qtest_server_inproc_recv(void *opaque, const char *buf); #endif diff --git a/qtest.c b/qtest.c index 938c3746d6..ad6eb6a526 100644 --- a/qtest.c +++ b/qtest.c @@ -803,3 +803,16 @@ bool qtest_driver(void) { return qtest_chr.chr != NULL; } + +void qtest_server_inproc_recv(void *dummy, const char *buf) +{ + static GString *gstr; + if (!gstr) { + gstr = g_string_new(NULL); + } + g_string_append(gstr, buf); + if (gstr->str[gstr->len - 1] == '\n') { + qtest_process_inbuf(NULL, gstr); + g_string_truncate(gstr, 0); + } +}