Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- hw/irq.c | 18 +++++++++++ hw/irq.h | 3 ++ hw/pc_piix.c | 2 - qtest.c | 96 ++++++++++++++++++++++++++++++++++++++++----------------- qtest.h | 2 - 5 files changed, 88 insertions(+), 33 deletions(-)
diff --git a/hw/irq.c b/hw/irq.c index 62f766e..48c48e1 100644 --- a/hw/irq.c +++ b/hw/irq.c @@ -104,3 +104,20 @@ qemu_irq *qemu_irq_proxy(qemu_irq **target, int n) { return qemu_allocate_irqs(proxy_irq_handler, target, n); } + +void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, int n) +{ + int i; + qemu_irq *old_irqs = qemu_allocate_irqs(NULL, NULL, n); + for (i = 0; i < n; i++) { + *old_irqs[i] = *gpio_in[i]; + gpio_in[i]->handler = handler; + gpio_in[i]->opaque = old_irqs; + } +} + +void qemu_irq_intercept_out(qemu_irq **gpio_out, qemu_irq_handler handler, int n) +{ + qemu_irq *old_irqs = *gpio_out; + *gpio_out = qemu_allocate_irqs(handler, old_irqs, n); +} diff --git a/hw/irq.h b/hw/irq.h index 64da2fd..d2ff320 100644 --- a/hw/irq.h +++ b/hw/irq.h @@ -38,4 +38,9 @@ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2); */ qemu_irq *qemu_irq_proxy(qemu_irq **target, int n); +/* For internal use in qtest. Similar to qemu_irq_split, but operating + on an existing vector of qemu_irq. */ +void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, int n); +void qemu_irq_intercept_out(qemu_irq **gpio_out, qemu_irq_handler handler, int n); + #endif diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 3f92bf9..9dea2dc 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -158,8 +158,6 @@ static void pc_init1(MemoryRegion *system_memory, if (xen_enabled()) { i8259 = xen_interrupt_controller_init(); - } else if (qtest_enabled()) { - i8259 = qtest_interrupt_controller_init(); } else { cpu_irq = pc_allocate_cpu_irq(); i8259 = i8259_init(isa_bus, cpu_irq[0]); diff --git a/qtest.c b/qtest.c index c2fbf50..010befe 100644 --- a/qtest.c +++ b/qtest.c @@ -12,6 +12,7 @@ */ #include "qtest.h" +#include "hw/qdev.h" #include "qemu-char.h" #include "ioport.h" #include "memory.h" @@ -24,6 +25,7 @@ const char *qtest_chrdev; const char *qtest_log; int qtest_allowed = 0; +static DeviceState *irq_intercept_dev; static FILE *qtest_log_fp; static CharDriverState *qtest_chr; static GString *inbuf; @@ -66,18 +68,30 @@ static bool qtest_opened; * > write ADDR SIZE DATA * < OK * - * Valid async messages: - * - * IRQ raise NUM - * IRQ lower NUM - * * 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 * than the expected size, the value will be zero filled at the end of the data * sequence. * - * NUM is an IRQ number. + * IRQ management: + * + * > irq_intercept_in QOM-PATH + * < OK + * + * > irq_intercept_out QOM-PATH + * < OK + * + * Attach to the gpio-in (resp. gpio-out) pins exported by the device at + * QOM-PATH. When the pin is triggered, one of the following async messages + * will be printed to the qtest stream: + * + * IRQ raise NUM + * IRQ lower NUM + * + * where NUM is an IRQ number. For the PC, interrupts can be intercepted + * simply with "irq_intercept_in ioapic" (note that IRQ0 comes out with + * NUM=0 even though it is remapped to GSI 2). */ static int hex2nib(char ch) @@ -133,6 +146,20 @@ static void qtest_send(CharDriverState *chr, const char *fmt, ...) } } +static void qtest_irq_handler(void *opaque, int n, int level) +{ + qemu_irq *old_irqs = opaque; + qemu_set_irq(old_irqs[n], level); + + if (irq_levels[n] != level) { + CharDriverState *chr = qtest_chr; + irq_levels[n] = level; + qtest_send_prefix(chr); + qtest_send(chr, "IRQ %s %d\n", + level ? "raise" : "lower", n); + } +} + static void qtest_process_command(CharDriverState *chr, gchar **words) { const gchar *command; @@ -155,9 +182,40 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) } g_assert(command); - if (strcmp(words[0], "outb") == 0 || - strcmp(words[0], "outw") == 0 || - strcmp(words[0], "outl") == 0) { + if (strcmp(words[0], "irq_intercept_out") == 0 + || strcmp(words[0], "irq_intercept_in") == 0) { + DeviceState *dev; + + g_assert(words[1]); + dev = qdev_resolve_path(words[1], NULL); + if (!dev) { + qtest_send_prefix(chr); + qtest_send(chr, "FAIL Unknown device\n"); + return; + } + + if (irq_intercept_dev) { + qtest_send_prefix(chr); + if (irq_intercept_dev != dev) { + qtest_send(chr, "FAIL IRQ intercept already enabled\n"); + } else { + qtest_send(chr, "OK\n"); + } + return; + } + + if (words[0][14] == 'o') { + qemu_irq_intercept_out(&dev->gpio_out, qtest_irq_handler, dev->num_gpio_out); + } else { + qemu_irq_intercept_in(dev->gpio_in, qtest_irq_handler, dev->num_gpio_in); + } + irq_intercept_dev = dev; + qtest_send_prefix(chr); + qtest_send(chr, "OK\n"); + + } else if (strcmp(words[0], "outb") == 0 || + strcmp(words[0], "outw") == 0 || + strcmp(words[0], "outl") == 0) { uint16_t addr; uint32_t value; @@ -312,26 +370,6 @@ static void qtest_event(void *opaque, int event) } } -static void qtest_set_irq(void *opaque, int irq, int level) -{ - CharDriverState *chr = qtest_chr; - bool changed; - - changed = (irq_levels[irq] != level); - irq_levels[irq] = level; - - if (changed) { - qtest_send_prefix(chr); - qtest_send(chr, "IRQ %s %d\n", - level ? "raise" : "lower", irq); - } -} - -qemu_irq *qtest_interrupt_controller_init(void) -{ - return qemu_allocate_irqs(qtest_set_irq, NULL, MAX_IRQ); -} - int qtest_init(void) { CharDriverState *chr; diff --git a/qtest.h b/qtest.h index f0e1377..1478343 100644 --- a/qtest.h +++ b/qtest.h @@ -32,6 +32,4 @@ static inline int qtest_available(void) int qtest_init(void); -qemu_irq *qtest_interrupt_controller_init(void); - #endif -- 1.7.7.1