From: Chris Laplante <chris@laplante.io>
To: qemu-devel@nongnu.org
Cc: Joel Stanley <joel@jms.id.au>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, Chris Laplante <chris@laplante.io>
Subject: [PATCH 4/6] qtest: factor out qtest_install_gpio_out_intercepts
Date: Fri, 14 Jul 2023 23:27:37 +0000 [thread overview]
Message-ID: <20230714232659.76434-5-chris@laplante.io> (raw)
In-Reply-To: <20230714232659.76434-1-chris@laplante.io>
Simplify the code a bit.
Signed-off-by: Chris Laplante <chris@laplante.io>
---
softmmu/qtest.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index 74482ce3cd..051bbf4177 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -365,6 +365,15 @@ void qtest_set_command_cb(bool (*pc_cb)(CharBackend *chr, gchar **words))
process_command_cb = pc_cb;
}
+static void qtest_install_gpio_out_intercepts(DeviceState *dev, const char *name, int n)
+{
+ qemu_irq *disconnected = g_new0(qemu_irq, 1);
+ qemu_irq icpt = qemu_allocate_irq(qtest_irq_handler,
+ disconnected, n);
+
+ *disconnected = qdev_intercept_gpio_out(dev, icpt,name, n);
+}
+
static void qtest_process_command(CharBackend *chr, gchar **words)
{
const gchar *command;
@@ -421,23 +430,13 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
if (is_outbound) {
if (is_named) {
if (ngl->name && strcmp(ngl->name, words[2]) == 0) {
- qemu_irq *disconnected = g_new0(qemu_irq, 1);
- qemu_irq icpt = qemu_allocate_irq(qtest_irq_handler,
- disconnected, 0);
-
- *disconnected = qdev_intercept_gpio_out(dev, icpt,
- ngl->name, 0);
+ qtest_install_gpio_out_intercepts(dev, ngl->name, 0);
break;
}
} else if (!ngl->name) {
int i;
for (i = 0; i < ngl->num_out; ++i) {
- qemu_irq *disconnected = g_new0(qemu_irq, 1);
- qemu_irq icpt = qemu_allocate_irq(qtest_irq_handler,
- disconnected, i);
-
- *disconnected = qdev_intercept_gpio_out(dev, icpt,
- ngl->name, i);
+ qtest_install_gpio_out_intercepts(dev, ngl->name, i);
}
}
} else {
--
2.39.2
next prev parent reply other threads:[~2023-07-14 23:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-14 23:27 [PATCH 0/6] Add nRF51 DETECT signal with test Chris Laplante
2023-07-14 23:27 ` [PATCH 1/6] hw/gpio/nrf51: implement DETECT signal Chris Laplante
2023-07-24 16:10 ` Peter Maydell
2023-07-14 23:27 ` [PATCH 2/6] qtest: implement named interception of out-GPIO Chris Laplante
2023-07-14 23:27 ` [PATCH 3/6] qtest: bail from irq_intercept_in if name is specified Chris Laplante
2023-07-24 16:17 ` Peter Maydell
2023-07-14 23:27 ` Chris Laplante [this message]
2023-07-24 16:18 ` [PATCH 4/6] qtest: factor out qtest_install_gpio_out_intercepts Peter Maydell
2023-07-14 23:27 ` [PATCH 5/6] qtest: irq_intercept_[out/in]: return FAIL if no intercepts are installed Chris Laplante
2023-07-24 16:19 ` Peter Maydell
2023-07-25 4:03 ` Chris Laplante
2023-07-14 23:27 ` [PATCH 6/6] qtest: microbit-test: add tests for nRF51 DETECT Chris Laplante
2023-07-24 16:24 ` Peter Maydell
2023-07-24 16:27 ` [PATCH 0/6] Add nRF51 DETECT signal with test Peter Maydell
2023-07-25 3:24 ` Chris Laplante
2023-07-25 9:23 ` Peter Maydell
2023-07-26 2:58 ` Chris Laplante
2023-07-27 22:51 ` Chris Laplante
2023-07-28 9:32 ` Peter Maydell
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=20230714232659.76434-5-chris@laplante.io \
--to=chris@laplante.io \
--cc=joel@jms.id.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.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).