[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] qtest: irq_intercept_[out/in]: return FAIL if no intercep
From: |
Chris Laplante |
Subject: |
[PATCH v2 5/6] qtest: irq_intercept_[out/in]: return FAIL if no intercepts are installed |
Date: |
Wed, 26 Jul 2023 03:32:21 +0000 |
This is much better than just silently failing with OK.
Signed-off-by: Chris Laplante <chris@laplante.io>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
softmmu/qtest.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index 1719bbddc3..c9751f527f 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -399,6 +399,7 @@ static void qtest_process_command(CharBackend *chr, gchar
**words)
NamedGPIOList *ngl;
bool is_named;
bool is_outbound;
+ bool interception_succeeded = false;
g_assert(words[1]);
is_named = words[2] != NULL;
@@ -431,6 +432,7 @@ static void qtest_process_command(CharBackend *chr, gchar
**words)
if (is_named) {
if (ngl->name && strcmp(ngl->name, words[2]) == 0) {
qtest_install_gpio_out_intercept(dev, ngl->name, 0);
+ interception_succeeded = true;
break;
}
} else if (!ngl->name) {
@@ -438,15 +440,22 @@ static void qtest_process_command(CharBackend *chr, gchar
**words)
for (i = 0; i < ngl->num_out; ++i) {
qtest_install_gpio_out_intercept(dev, ngl->name, i);
}
+ interception_succeeded = true;
}
} else {
qemu_irq_intercept_in(ngl->in, qtest_irq_handler,
ngl->num_in);
+ interception_succeeded = true;
}
}
- irq_intercept_dev = dev;
+
qtest_send_prefix(chr);
- qtest_send(chr, "OK\n");
+ if (interception_succeeded) {
+ irq_intercept_dev = dev;
+ qtest_send(chr, "OK\n");
+ } else {
+ qtest_send(chr, "FAIL No intercepts installed\n");
+ }
} else if (strcmp(words[0], "set_irq_in") == 0) {
DeviceState *dev;
qemu_irq irq;
--
2.41.0
- [PATCH v2 0/6] Add nRF51 DETECT signal with test, Chris Laplante, 2023/07/25
- [PATCH v2 2/6] qtest: factor out qtest_install_gpio_out_intercept, Chris Laplante, 2023/07/25
- [PATCH v2 5/6] qtest: irq_intercept_[out/in]: return FAIL if no intercepts are installed,
Chris Laplante <=
- [PATCH v2 4/6] qtest: bail from irq_intercept_in if name is specified, Chris Laplante, 2023/07/25
- [PATCH v2 6/6] qtest: microbit-test: add tests for nRF51 DETECT, Chris Laplante, 2023/07/25
- Re: [PATCH v2 0/6] Add nRF51 DETECT signal with test, Peter Maydell, 2023/07/27