qtest: implement named interception of out-GPIO

Adds qtest_irq_intercept_out_named method, which utilizes a new optional
name parameter to the irq_intercept_out qtest command.

Signed-off-by: Chris Laplante <chris@laplante.io>
Message-id: 20230728160324.1159090-4-chris@laplante.io
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Chris Laplante 2023-08-22 17:31:00 +01:00 committed by Peter Maydell
parent 7458dcf4e6
commit a8610f8bd7
3 changed files with 27 additions and 8 deletions

View file

@ -397,8 +397,10 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
|| strcmp(words[0], "irq_intercept_in") == 0) { || strcmp(words[0], "irq_intercept_in") == 0) {
DeviceState *dev; DeviceState *dev;
NamedGPIOList *ngl; NamedGPIOList *ngl;
bool is_outbound;
g_assert(words[1]); g_assert(words[1]);
is_outbound = words[0][14] == 'o';
dev = DEVICE(object_resolve_path(words[1], NULL)); dev = DEVICE(object_resolve_path(words[1], NULL));
if (!dev) { if (!dev) {
qtest_send_prefix(chr); qtest_send_prefix(chr);
@ -417,14 +419,14 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
} }
QLIST_FOREACH(ngl, &dev->gpios, node) { QLIST_FOREACH(ngl, &dev->gpios, node) {
/* We don't support intercept of named GPIOs yet */ /* We don't support inbound interception of named GPIOs yet */
if (ngl->name) { if (is_outbound) {
continue; /* NULL is valid and matchable, for "unnamed GPIO" */
} if (g_strcmp0(ngl->name, words[2]) == 0) {
if (words[0][14] == 'o') { int i;
int i; for (i = 0; i < ngl->num_out; ++i) {
for (i = 0; i < ngl->num_out; ++i) { qtest_install_gpio_out_intercept(dev, ngl->name, i);
qtest_install_gpio_out_intercept(dev, ngl->name, i); }
} }
} else { } else {
qemu_irq_intercept_in(ngl->in, qtest_irq_handler, qemu_irq_intercept_in(ngl->in, qtest_irq_handler,

View file

@ -993,6 +993,12 @@ void qtest_irq_intercept_out(QTestState *s, const char *qom_path)
qtest_rsp(s); qtest_rsp(s);
} }
void qtest_irq_intercept_out_named(QTestState *s, const char *qom_path, const char *name)
{
qtest_sendf(s, "irq_intercept_out %s %s\n", qom_path, name);
qtest_rsp(s);
}
void qtest_irq_intercept_in(QTestState *s, const char *qom_path) void qtest_irq_intercept_in(QTestState *s, const char *qom_path)
{ {
qtest_sendf(s, "irq_intercept_in %s\n", qom_path); qtest_sendf(s, "irq_intercept_in %s\n", qom_path);

View file

@ -371,6 +371,17 @@ void qtest_irq_intercept_in(QTestState *s, const char *string);
*/ */
void qtest_irq_intercept_out(QTestState *s, const char *string); void qtest_irq_intercept_out(QTestState *s, const char *string);
/**
* qtest_irq_intercept_out_named:
* @s: #QTestState instance to operate on.
* @qom_path: QOM path of a device.
* @name: Name of the GPIO out pin
*
* Associate a qtest irq with the named GPIO-out pin of the device
* whose path is specified by @string and whose name is @name.
*/
void qtest_irq_intercept_out_named(QTestState *s, const char *qom_path, const char *name);
/** /**
* qtest_set_irq_in: * qtest_set_irq_in:
* @s: QTestState instance to operate on. * @s: QTestState instance to operate on.