[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/20] qtest: add qtest_server_send abstraction
From: |
Oleinik, Alexander |
Subject: |
[PATCH v4 04/20] qtest: add qtest_server_send abstraction |
Date: |
Wed, 30 Oct 2019 14:49:51 +0000 |
From: Alexander Oleinik <address@hidden>
qtest_server_send is a function pointer specifying the handler used to
transmit data to the qtest client. In the standard configuration, this
calls the CharBackend handler, but now it is possible for other types of
handlers, e.g direct-function calls if the qtest client and server
exist within the same process (inproc)
Signed-off-by: Alexander Oleinik <address@hidden>
---
include/sysemu/qtest.h | 3 +++
qtest.c | 17 +++++++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
index 5ed09c80b1..fda7000d2c 100644
--- a/include/sysemu/qtest.h
+++ b/include/sysemu/qtest.h
@@ -26,4 +26,7 @@ bool qtest_driver(void);
void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error
**errp);
+void qtest_server_set_tx_handler(void (*send)(void *, const char *, size_t),
+ void *opaque);
+
#endif
diff --git a/qtest.c b/qtest.c
index 8b50e2783e..ae7e6d779d 100644
--- a/qtest.c
+++ b/qtest.c
@@ -42,6 +42,8 @@ static GString *inbuf;
static int irq_levels[MAX_IRQ];
static qemu_timeval start_time;
static bool qtest_opened;
+static void (*qtest_server_send)(void*, const char*, size_t);
+static void *qtest_server_send_opaque;
#define FMT_timeval "%ld.%06ld"
@@ -228,8 +230,9 @@ static void GCC_FMT_ATTR(1, 2) qtest_log_send(const char
*fmt, ...)
va_end(ap);
}
-static void do_qtest_send(CharBackend *chr, const char *str, size_t len)
+static void qtest_server_char_be_send(void *opaque, const char *str, size_t
len)
{
+ CharBackend* chr = (CharBackend *)opaque;
qemu_chr_fe_write_all(chr, (uint8_t *)str, len);
if (qtest_log_fp && qtest_opened) {
fprintf(qtest_log_fp, "%s", str);
@@ -238,7 +241,7 @@ static void do_qtest_send(CharBackend *chr, const char
*str, size_t len)
static void qtest_send(CharBackend *chr, const char *str)
{
- do_qtest_send(chr, str, strlen(str));
+ qtest_server_send(qtest_server_send_opaque, str, strlen(str));
}
static void GCC_FMT_ATTR(2, 3) qtest_sendf(CharBackend *chr,
@@ -783,6 +786,16 @@ void qtest_server_init(const char *qtest_chrdev, const
char *qtest_log, Error **
qemu_chr_fe_set_echo(&qtest_chr, true);
inbuf = g_string_new("");
+
+ if (!qtest_server_send) {
+ qtest_server_set_tx_handler(qtest_server_char_be_send, &qtest_chr);
+ }
+}
+
+void qtest_server_set_tx_handler(void (*send)(void*, const char*, size_t),
void *opaque)
+{
+ qtest_server_send = send;
+ qtest_server_send_opaque = opaque;
}
bool qtest_driver(void)
--
2.23.0
- [PATCH v4 00/20] Add virtual device fuzzing support, Oleinik, Alexander, 2019/10/30
- [PATCH v4 01/20] softmmu: split off vl.c:main() into main.c, Oleinik, Alexander, 2019/10/30
- [PATCH v4 03/20] fuzz: Add FUZZ_TARGET module type, Oleinik, Alexander, 2019/10/30
- [PATCH v4 04/20] qtest: add qtest_server_send abstraction,
Oleinik, Alexander <=
- [PATCH v4 11/20] libqtest: make qtest_bufwrite send "atomic", Oleinik, Alexander, 2019/10/30
- [PATCH v4 09/20] libqos: split qos-test and libqos makefile vars, Oleinik, Alexander, 2019/10/30
- [PATCH v4 06/20] module: check module wasn't already initialized, Oleinik, Alexander, 2019/10/30
- [PATCH v4 05/20] libqtest: Add a layer of abstraciton to send/recv, Oleinik, Alexander, 2019/10/30
- [PATCH v4 07/20] qtest: add in-process incoming command handler, Oleinik, Alexander, 2019/10/30
- [PATCH v4 02/20] libqos: Rename i2c_send and i2c_recv, Oleinik, Alexander, 2019/10/30
- [PATCH v4 08/20] tests: provide test variables to other targets, Oleinik, Alexander, 2019/10/30
- [PATCH v4 13/20] fuzz: add configure flag --enable-fuzzing, Oleinik, Alexander, 2019/10/30
- [PATCH v4 12/20] libqtest: add in-process qtest.c tx/rx handlers, Oleinik, Alexander, 2019/10/30
- [PATCH v4 10/20] libqos: move useful qos-test funcs to qos_external, Oleinik, Alexander, 2019/10/30