From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, jsnow@redhat.com
Subject: [Qemu-devel] [PULL 12/14] qtest: add memset to qtest protocol
Date: Mon, 11 May 2015 14:12:41 -0400 [thread overview]
Message-ID: <1431367963-24437-13-git-send-email-jsnow@redhat.com> (raw)
In-Reply-To: <1431367963-24437-1-git-send-email-jsnow@redhat.com>
Previously, memset was just a frontend to write() and only
stupidly sent the pattern many times across the wire.
Let's not discuss who stupidly wrote it like that in the first place.
(Hint: It was me.)
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1430864578-22072-4-git-send-email-jsnow@redhat.com
---
qtest.c | 20 ++++++++++++++++++++
tests/libqtest.c | 8 +-------
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/qtest.c b/qtest.c
index 70bb97f..c4999c3 100644
--- a/qtest.c
+++ b/qtest.c
@@ -125,6 +125,9 @@ static bool qtest_opened;
* > b64write ADDR SIZE B64_DATA
* < OK
*
+ * > memset ADDR SIZE VALUE
+ * < OK
+ *
* ADDR, SIZE, VALUE are all integers parsed with strtoul() with a base of 0.
*
* DATA is an arbitrarily long hex number prefixed with '0x'. If it's smaller
@@ -473,6 +476,23 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
qtest_send_prefix(chr);
qtest_send(chr, "OK\n");
+ } else if (strcmp(words[0], "memset") == 0) {
+ uint64_t addr, len;
+ uint8_t *data;
+ uint8_t pattern;
+
+ g_assert(words[1] && words[2] && words[3]);
+ addr = strtoull(words[1], NULL, 0);
+ len = strtoull(words[2], NULL, 0);
+ pattern = strtoull(words[3], NULL, 0);
+
+ data = g_malloc(len);
+ memset(data, pattern, len);
+ cpu_physical_memory_write(addr, data, len);
+ g_free(data);
+
+ qtest_send_prefix(chr);
+ qtest_send(chr, "OK\n");
} else if (strcmp(words[0], "b64write") == 0) {
uint64_t addr, len;
uint8_t *data;
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 5f57005..055aad6 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -741,13 +741,7 @@ void qtest_memwrite(QTestState *s, uint64_t addr, const void *data, size_t size)
void qtest_memset(QTestState *s, uint64_t addr, uint8_t pattern, size_t size)
{
- size_t i;
-
- qtest_sendf(s, "write 0x%" PRIx64 " 0x%zx 0x", addr, size);
- for (i = 0; i < size; i++) {
- qtest_sendf(s, "%02x", pattern);
- }
- qtest_sendf(s, "\n");
+ qtest_sendf(s, "memset 0x%" PRIx64 " 0x%zx 0x%02x\n", addr, size, pattern);
qtest_rsp(s, 0);
}
--
2.1.0
next prev parent reply other threads:[~2015-05-11 18:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 18:12 [Qemu-devel] [PULL 00/14] Ide patches John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 01/14] libqos/ahci: Add halted command helpers John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 02/14] libqos/ahci: Fix sector set method John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 03/14] libqos: Add migration helpers John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 04/14] ich9/ahci: Enable Migration John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 05/14] qtest/ahci: Add migration test John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 06/14] qtest/ahci: add migrate dma test John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 07/14] qtest/ahci: add flush migrate test John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 08/14] qtest/ahci: add halted dma test John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 09/14] qtest/ahci: add migrate " John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 10/14] qtest: allow arbitrarily long sends John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 11/14] qtest: Add base64 encoded read/write John Snow
2015-05-11 18:12 ` John Snow [this message]
2015-05-11 18:12 ` [Qemu-devel] [PULL 13/14] libqos/ahci: Swap memread/write with bufread/write John Snow
2015-05-11 18:12 ` [Qemu-devel] [PULL 14/14] qtest: pre-buffer hex nibs John Snow
2015-05-12 10:44 ` [Qemu-devel] [PULL 00/14] Ide patches Peter Maydell
2015-05-12 15:22 ` John Snow
2015-05-12 15:25 ` Peter Maydell
2015-05-12 18:53 ` John Snow
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=1431367963-24437-13-git-send-email-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).