diff options
| author | Peter Maydell | 2014-07-01 12:00:52 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-07-01 12:00:53 +0200 |
| commit | b3959efdbb2dc3d5959e3b0a8e188126930beca8 (patch) | |
| tree | 99b0812a43a2c43784f01f5d87b71fa765c47c83 /include | |
| parent | Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging (diff) | |
| parent | irq: Slim conversion of qemu_irq to QOM (diff) | |
| download | qemu-b3959efdbb2dc3d5959e3b0a8e188126930beca8.tar.gz qemu-b3959efdbb2dc3d5959e3b0a8e188126930beca8.tar.xz qemu-b3959efdbb2dc3d5959e3b0a8e188126930beca8.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.1' into staging
QOM and device refactorings
* QOM unparenting cleanup
* IRQ conversion to QOM
# gpg: Signature made Tue 01 Jul 2014 04:03:23 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-2.1:
irq: Slim conversion of qemu_irq to QOM
irq: Allocate IRQs individually
hw: Fix qemu_allocate_irqs() leaks
sdhci: Fix misuse of qemu_free_irqs()
qom: Remove parent pointer when unparenting
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/irq.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/hw/irq.h b/include/hw/irq.h index d08bc02a0d..6f874f5ac0 100644 --- a/include/hw/irq.h +++ b/include/hw/irq.h @@ -3,6 +3,8 @@ /* Generic IRQ/GPIO pin infrastructure. */ +#define TYPE_IRQ "irq" + typedef struct IRQState *qemu_irq; typedef void (*qemu_irq_handler)(void *opaque, int n, int level); @@ -42,7 +44,7 @@ qemu_irq qemu_allocate_irq(qemu_irq_handler handler, void *opaque, int n); qemu_irq *qemu_extend_irqs(qemu_irq *old, int n_old, qemu_irq_handler handler, void *opaque, int n); -void qemu_free_irqs(qemu_irq *s); +void qemu_free_irqs(qemu_irq *s, int n); void qemu_free_irq(qemu_irq irq); /* Returns a new IRQ with opposite polarity. */ |