From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, "Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Hao Wu" <wuhaotsh@google.com>, "Peter Xu" <peterx@redhat.com>,
"Warner Losh" <imp@bsdimp.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
qemu-arm@nongnu.org, "Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Kyle Evans" <kevans@freebsd.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Bin Meng" <bmeng.cn@gmail.com>,
qemu-rust@nongnu.org, "Laurent Vivier" <lvivier@redhat.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Weiwei Li" <liwei1518@gmail.com>,
qemu-riscv@nongnu.org, "Fabiano Rosas" <farosas@suse.de>,
"Tyrone Ting" <kfting@nuvoton.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Alexandre Iooss" <erdnaxe@crans.org>
Subject: [PATCH 04/18] tests/qtest: simplify qtest_process_inbuf
Date: Mon, 3 Feb 2025 14:40:34 +0000 [thread overview]
Message-ID: <20250203144048.2131117-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20250203144048.2131117-1-alex.bennee@linaro.org>
Don't both creating a GString to temporarily hold our qtest command.
Instead do a simpler g_strndup and use autofree to clean up
afterwards.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
system/qtest.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/system/qtest.c b/system/qtest.c
index e68ed0f2a8..bb1efba9fd 100644
--- a/system/qtest.c
+++ b/system/qtest.c
@@ -763,25 +763,21 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
}
}
+/*
+ * Process as much of @inbuf as we can in newline terminated chunks.
+ * Remove the processed commands from @inbuf as we go.
+ */
static void qtest_process_inbuf(CharBackend *chr, GString *inbuf)
{
char *end;
while ((end = strchr(inbuf->str, '\n')) != NULL) {
- size_t offset;
- GString *cmd;
- gchar **words;
-
- offset = end - inbuf->str;
+ size_t len = end - inbuf->str;
+ g_autofree char *cmd = g_strndup(inbuf->str, len);
+ g_auto(GStrv) words = g_strsplit(cmd, " ", 0);
- cmd = g_string_new_len(inbuf->str, offset);
- g_string_erase(inbuf, 0, offset + 1);
-
- words = g_strsplit(cmd->str, " ", 0);
+ g_string_erase(inbuf, 0, len + 1);
qtest_process_command(chr, words);
- g_strfreev(words);
-
- g_string_free(cmd, TRUE);
}
}
--
2.39.5
next prev parent reply other threads:[~2025-02-03 14:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-03 14:40 [PATCH 00/18] maintainer updates for feb25 (qtest, gdbstub, plugins) Alex Bennée
2025-02-03 14:40 ` [PATCH 01/18] tests/docker: replicate the check-rust-tools-nightly CI job Alex Bennée
2025-02-03 14:40 ` [PATCH 02/18] tests/qtest: don't attempt to clock_step while waiting for virtio ISR Alex Bennée
2025-02-03 14:40 ` [PATCH 03/18] tests/qtest: don't step clock at start of npcm7xx periodic IRQ test Alex Bennée
2025-02-03 14:40 ` Alex Bennée [this message]
2025-02-06 15:50 ` [PATCH 04/18] tests/qtest: simplify qtest_process_inbuf Peter Maydell
2025-02-03 14:40 ` [PATCH 05/18] tests/qtest: rename qtest_send_prefix and roll-up into qtest_send Alex Bennée
2025-02-03 14:40 ` [PATCH 06/18] tests/qtest: tighten up the checks on clock_step Alex Bennée
2025-02-06 15:52 ` Peter Maydell
2025-02-03 14:40 ` [PATCH 07/18] Revert "util/timer: avoid deadlock when shutting down" Alex Bennée
2025-02-06 15:53 ` Peter Maydell
2025-02-03 14:40 ` [PATCH 08/18] tests/qtest/migration: Add --full option Alex Bennée
2025-02-03 14:40 ` [PATCH 09/18] tests/qtest/migration: Pick smoke tests Alex Bennée
2025-02-03 14:40 ` [PATCH 10/18] gdbstub: Allow the %d placeholder in the socket path Alex Bennée
2025-02-03 14:40 ` [PATCH 11/18] gdbstub: Try unlinking the unix socket before binding Alex Bennée
2025-02-03 14:40 ` [PATCH 12/18] user: Introduce user/signal.h Alex Bennée
2025-02-03 14:40 ` [PATCH 13/18] user: Introduce host_interrupt_signal Alex Bennée
2025-02-03 14:40 ` [PATCH 14/18] osdep: Introduce qemu_kill_thread() Alex Bennée
2025-02-03 14:40 ` [PATCH 15/18] gdbstub: Allow late attachment Alex Bennée
2025-02-03 14:40 ` [PATCH 16/18] docs/user: Document the %d placeholder and suspend=n QEMU_GDB features Alex Bennée
2025-02-03 14:40 ` [PATCH 17/18] tests/tcg: Add late gdbstub attach test Alex Bennée
2025-02-03 14:40 ` [PATCH 18/18] plugins: fix -Werror=maybe-uninitialized false-positive Alex Bennée
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=20250203144048.2131117-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=bmeng.cn@gmail.com \
--cc=danielhb413@gmail.com \
--cc=erdnaxe@crans.org \
--cc=farosas@suse.de \
--cc=harshpb@linux.ibm.com \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=kfting@nuvoton.com \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=lvivier@redhat.com \
--cc=ma.mandourr@gmail.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-rust@nongnu.org \
--cc=riku.voipio@iki.fi \
--cc=thuth@redhat.com \
--cc=wuhaotsh@google.com \
--cc=zhiwei_liu@linux.alibaba.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).