From: "Bulekov, Alexander" <alxndr@bu.edu>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
"Bulekov, Alexander" <alxndr@bu.edu>,
"bsd@redhat.com" <bsd@redhat.com>,
"stefanha@redhat.com" <stefanha@redhat.com>,
"pbonzini@redhat.com" <pbonzini@redhat.com>
Subject: [PATCH v7 10/20] libqtest: make bufwrite rely on the TransportOps
Date: Mon, 20 Jan 2020 05:54:57 +0000 [thread overview]
Message-ID: <20200120055410.22322-16-alxndr@bu.edu> (raw)
In-Reply-To: <20200120055410.22322-1-alxndr@bu.edu>
When using qtest "in-process" communication, qtest_sendf directly calls
a function in the server (qtest.c). Previously, bufwrite used
socket_send, which bypasses the TransportOps enabling the call into
qtest.c. This change replaces the socket_send calls with ops->send,
maintaining the benefits of the direct socket_send call, while adding
support for in-process qtest calls.
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qtest/libqtest.c | 71 ++++++++++++++++++++++++++++++++++++++++--
tests/qtest/libqtest.h | 4 +++
2 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index e5056a1d0f..49075b55a1 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -37,10 +37,18 @@
typedef void (*QTestSendFn)(QTestState *s, const char *buf);
+typedef void (*ExternalSendFn)(void *s, const char *buf);
typedef GString* (*QTestRecvFn)(QTestState *);
typedef struct QTestClientTransportOps {
QTestSendFn send; /* for sending qtest commands */
+
+ /*
+ * use external_send to send qtest command strings through functions which
+ * do not accept a QTestState as the first parameter.
+ */
+ ExternalSendFn external_send;
+
QTestRecvFn recv_line; /* for receiving qtest command responses */
} QTestTransportOps;
@@ -1078,8 +1086,8 @@ void qtest_bufwrite(QTestState *s, uint64_t addr, const void *data, size_t size)
bdata = g_base64_encode(data, size);
qtest_sendf(s, "b64write 0x%" PRIx64 " 0x%zx ", addr, size);
- socket_send(s->fd, bdata, strlen(bdata));
- socket_send(s->fd, "\n", 1);
+ s->ops.send(s, bdata);
+ s->ops.send(s, "\n");
qtest_rsp(s, 0);
g_free(bdata);
}
@@ -1367,3 +1375,62 @@ static void qtest_client_set_rx_handler(QTestState *s, QTestRecvFn recv)
{
s->ops.recv_line = recv;
}
+/* A type-safe wrapper for s->send() */
+static void send_wrapper(QTestState *s, const char *buf)
+{
+ s->ops.external_send(s, buf);
+}
+
+static GString *qtest_client_inproc_recv_line(QTestState *s)
+{
+ GString *line;
+ size_t offset;
+ char *eol;
+
+ eol = strchr(s->rx->str, '\n');
+ offset = eol - s->rx->str;
+ line = g_string_new_len(s->rx->str, offset);
+ g_string_erase(s->rx, 0, offset + 1);
+ return line;
+}
+
+QTestState *qtest_inproc_init(QTestState **s, bool log, const char* arch,
+ void (*send)(void*, const char*))
+{
+ QTestState *qts;
+ qts = g_new0(QTestState, 1);
+ *s = qts; /* Expose qts early on, since the query endianness relies on it */
+ qts->wstatus = 0;
+ for (int i = 0; i < MAX_IRQ; i++) {
+ qts->irq_level[i] = false;
+ }
+
+ qtest_client_set_rx_handler(qts, qtest_client_inproc_recv_line);
+
+ /* send() may not have a matching protoype, so use a type-safe wrapper */
+ qts->ops.external_send = send;
+ qtest_client_set_tx_handler(qts, send_wrapper);
+
+ qts->big_endian = qtest_query_target_endianness(qts);
+
+ /*
+ * Set a dummy path for QTEST_QEMU_BINARY. Doesn't need to exist, but this
+ * way, qtest_get_arch works for inproc qtest.
+ */
+ gchar *bin_path = g_strconcat("/qemu-system-", arch, NULL);
+ setenv("QTEST_QEMU_BINARY", bin_path, 0);
+ g_free(bin_path);
+
+ return qts;
+}
+
+void qtest_client_inproc_recv(void *opaque, const char *str)
+{
+ QTestState *qts = *(QTestState **)opaque;
+
+ if (!qts->rx) {
+ qts->rx = g_string_new(NULL);
+ }
+ g_string_append(qts->rx, str);
+ return;
+}
diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h
index c9e21e05b3..f5cf93c386 100644
--- a/tests/qtest/libqtest.h
+++ b/tests/qtest/libqtest.h
@@ -729,4 +729,8 @@ bool qtest_probe_child(QTestState *s);
*/
void qtest_set_expected_status(QTestState *s, int status);
+QTestState *qtest_inproc_init(QTestState **s, bool log, const char* arch,
+ void (*send)(void*, const char*));
+
+void qtest_client_inproc_recv(void *opaque, const char *str);
#endif
--
2.23.0
next prev parent reply other threads:[~2020-01-20 6:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 5:54 [PATCH v7 00/20] Add virtual device fuzzing support Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 01/20] softmmu: split off vl.c:main() into main.c Bulekov, Alexander
2020-01-21 16:26 ` Stefan Hajnoczi
2020-01-20 5:54 ` [PATCH v7 02/20] libqos: rename i2c_send and i2c_recv Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 02/20] module: check module wasn't already initialized Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 03/20] fuzz: add FUZZ_TARGET module type Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 05/20] libqtest: add a layer of abstraction to send/recv Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 04/20] qtest: add qtest_server_send abstraction Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 06/20] libqtest: make bufwrite rely on the TransportOps Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 06/20] module: check module wasn't already initialized Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 07/20] qtest: add in-process incoming command handler Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 08/20] libqos: rename i2c_send and i2c_recv Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 08/20] libqos: split qos-test and libqos makefile vars Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 09/20] libqos: move useful qos-test funcs to qos_external Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 09/20] libqos: split qos-test and libqos makefile vars Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 10/20] libqos: move useful qos-test funcs to qos_external Bulekov, Alexander
2020-01-20 5:54 ` Bulekov, Alexander [this message]
2020-01-20 5:54 ` [PATCH v7 11/20] fuzz: add fuzzer skeleton Bulekov, Alexander
2020-01-20 5:54 ` [PATCH v7 12/20] exec: keep ram block across fork when using qtest Bulekov, Alexander
2020-01-21 16:29 ` Stefan Hajnoczi
2020-01-20 5:55 ` [PATCH v7 13/20] fuzz: support for fork-based fuzzing Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 14/20] fuzz: add support for qos-assisted fuzz targets Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 15/20] fuzz: add target/fuzz makefile rules Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 16/20] fuzz: add configure flag --enable-fuzzing Bulekov, Alexander
2020-01-20 17:22 ` Alexander Bulekov
2020-01-20 5:55 ` [PATCH v7 17/20] fuzz: add documentation to docs/devel/ Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 17/20] fuzz: add i440fx fuzz targets Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 18/20] " Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 18/20] fuzz: add virtio-net fuzz target Bulekov, Alexander
2020-01-21 16:42 ` Stefan Hajnoczi
2020-01-20 5:55 ` [PATCH v7 19/20] " Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 19/20] fuzz: add virtio-scsi " Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 20/20] fuzz: add documentation to docs/devel/ Bulekov, Alexander
2020-01-20 5:55 ` [PATCH v7 20/20] fuzz: add virtio-scsi fuzz target Bulekov, Alexander
2020-01-21 16:44 ` [PATCH v7 00/20] Add virtual device fuzzing support Stefan Hajnoczi
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=20200120055410.22322-16-alxndr@bu.edu \
--to=alxndr@bu.edu \
--cc=bsd@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.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).