All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Oleinik, Alexander" <alxndr@bu.edu>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	"Oleinik, Alexander" <alxndr@bu.edu>,
	"bsd@redhat.com" <bsd@redhat.com>,
	"stefanha@redhat.com" <stefanha@redhat.com>,
	"pbonzini@redhat.com" <pbonzini@redhat.com>
Subject: [PATCH v5 12/20] libqtest: add in-process qtest.c tx/rx handlers
Date: Wed, 13 Nov 2019 22:50:49 +0000	[thread overview]
Message-ID: <20191113225030.17023-13-alxndr@bu.edu> (raw)
In-Reply-To: <20191113225030.17023-1-alxndr@bu.edu>

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
---
 tests/libqtest.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/libqtest.h |  3 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 6d3bcb6766..da0e5c7ef8 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -1368,3 +1368,57 @@ 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);
+    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/libqtest.h b/tests/libqtest.h
index 0e9b8908ef..f5cf93c386 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -729,7 +729,8 @@ bool qtest_probe_child(QTestState *s);
  */
 void qtest_set_expected_status(QTestState *s, int status);
 
-QTestState *qtest_inproc_init(bool log, const char* arch,
+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



  parent reply	other threads:[~2019-11-13 23:04 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-13 22:50 [PATCH v5 00/20] Add virtual device fuzzing support Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 01/20] softmmu: split off vl.c:main() into main.c Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 02/20] libqos: Rename i2c_send and i2c_recv Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 03/20] fuzz: Add FUZZ_TARGET module type Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 04/20] qtest: add qtest_server_send abstraction Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 05/20] libqtest: Add a layer of abstraciton to send/recv Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 06/20] module: check module wasn't already initialized Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 07/20] qtest: add in-process incoming command handler Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 08/20] tests: provide test variables to other targets Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 09/20] libqos: split qos-test and libqos makefile vars Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 10/20] libqos: move useful qos-test funcs to qos_external Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 11/20] libqtest: make bufwrite rely on the TransportOps Oleinik, Alexander
2019-11-13 22:50 ` Oleinik, Alexander [this message]
2019-11-13 22:50 ` [PATCH v5 13/20] fuzz: add configure flag --enable-fuzzing Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 14/20] fuzz: Add target/fuzz makefile rules Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 15/20] fuzz: add fuzzer skeleton Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 16/20] fuzz: add support for fork-based fuzzing Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 17/20] fuzz: add support for qos-assisted fuzz targets Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 19/20] fuzz: add virtio-net fuzz target Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 18/20] fuzz: add i440fx fuzz targets Oleinik, Alexander
2019-11-13 22:50 ` [PATCH v5 20/20] fuzz: add documentation to docs/devel/ Oleinik, Alexander
2019-11-14 10:55 ` [PATCH v5 00/20] Add virtual device fuzzing support Darren Kenny
2019-11-14 15:04   ` Alexander Bulekov

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=20191113225030.17023-13-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.