ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw: Move declaration of IRQState to header and add init function 

To allow embedding a qemu_irq in a struct move its definition to the
header and add a function to init it in place without allocating it.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <e3ffd0f6ef8845d0f7247c9b6ff33f7ee8b432cf.1719690591.git.balaton@eik.bme.hu>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
This commit is contained in:
BALATON Zoltan 2024-06-29 22:01:53 +02:00 committed by Michael S. Tsirkin
parent 2688e8df60
commit e72a7f65c1
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/core/irq.c
View File

@ -26,16 +26,6 @@
#include "hw/irq.h" #include "hw/irq.h"
#include "qom/object.h" #include "qom/object.h"
OBJECT_DECLARE_SIMPLE_TYPE(IRQState, IRQ)
struct IRQState {
Object parent_obj;
qemu_irq_handler handler;
void *opaque;
int n;
};
void qemu_set_irq(qemu_irq irq, int level) void qemu_set_irq(qemu_irq irq, int level)
{ {
if (!irq) if (!irq)
@ -44,6 +34,15 @@ void qemu_set_irq(qemu_irq irq, int level)
irq->handler(irq->opaque, irq->n, level); irq->handler(irq->opaque, irq->n, level);
} }
void qemu_init_irq(IRQState *irq, qemu_irq_handler handler, void *opaque,
int n)
{
object_initialize(irq, sizeof(*irq), TYPE_IRQ);
irq->handler = handler;
irq->opaque = opaque;
irq->n = n;
}
qemu_irq *qemu_extend_irqs(qemu_irq *old, int n_old, qemu_irq_handler handler, qemu_irq *qemu_extend_irqs(qemu_irq *old, int n_old, qemu_irq_handler handler,
void *opaque, int n) void *opaque, int n)
{ {
@ -69,10 +68,8 @@ qemu_irq qemu_allocate_irq(qemu_irq_handler handler, void *opaque, int n)
{ {
IRQState *irq; IRQState *irq;
irq = IRQ(object_new(TYPE_IRQ)); irq = g_new(IRQState, 1);
irq->handler = handler; qemu_init_irq(irq, handler, opaque, n);
irq->opaque = opaque;
irq->n = n;
return irq; return irq;
} }

18
include/hw/irq.h
View File

@ -1,9 +1,20 @@
#ifndef QEMU_IRQ_H #ifndef QEMU_IRQ_H
#define QEMU_IRQ_H #define QEMU_IRQ_H
#include "qom/object.h"
/* Generic IRQ/GPIO pin infrastructure. */ /* Generic IRQ/GPIO pin infrastructure. */
#define TYPE_IRQ "irq" #define TYPE_IRQ "irq"
OBJECT_DECLARE_SIMPLE_TYPE(IRQState, IRQ)
struct IRQState {
Object parent_obj;
qemu_irq_handler handler;
void *opaque;
int n;
};
void qemu_set_irq(qemu_irq irq, int level); void qemu_set_irq(qemu_irq irq, int level);
@ -23,6 +34,13 @@ static inline void qemu_irq_pulse(qemu_irq irq)
qemu_set_irq(irq, 0); qemu_set_irq(irq, 0);
} }
/*
* Init a single IRQ. The irq is assigned with a handler, an opaque data
* and the interrupt number.
*/
void qemu_init_irq(IRQState *irq, qemu_irq_handler handler, void *opaque,
int n);
/* Returns an array of N IRQs. Each IRQ is assigned the argument handler and /* Returns an array of N IRQs. Each IRQ is assigned the argument handler and
* opaque data. * opaque data.
*/ */