On Wed, 9 Jun 2021 19:38:09 +0100
Alexandru Elisei <alexandru.elisei@xxxxxxx> wrote:
> The device tree code passes the function generate_irq_prop() to MMIO
> devices to create the "interrupts" property. The typedef fdt_irq_fn is the
> type used to pass the function to the device. It makes more sense for the
> typedef to be in fdt.h with the rest of the device tree functions, so move
> it there.
>
> Signed-off-by: Alexandru Elisei <alexandru.elisei@xxxxxxx>
Not sure why we really need that, but doesn't seem to hurt:
Reviewed-by: Andre Przywara <andre.przywara@xxxxxxx>
Cheers,
Andre
> ---
> hw/rtc.c | 1 +
> include/kvm/fdt.h | 2 ++
> include/kvm/kvm.h | 1 -
> 3 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/rtc.c b/hw/rtc.c
> index aec31c52a85a..9b8785a869dd 100644
> --- a/hw/rtc.c
> +++ b/hw/rtc.c
> @@ -1,5 +1,6 @@
> #include "kvm/rtc.h"
>
> +#include "kvm/fdt.h"
> #include "kvm/ioport.h"
> #include "kvm/kvm.h"
>
> diff --git a/include/kvm/fdt.h b/include/kvm/fdt.h
> index 4e6157256482..060c37b947cc 100644
> --- a/include/kvm/fdt.h
> +++ b/include/kvm/fdt.h
> @@ -25,6 +25,8 @@ enum irq_type {
> IRQ_TYPE_LEVEL_MASK = (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH),
> };
>
> +typedef void (*fdt_irq_fn)(void *fdt, u8 irq, enum irq_type irq_type);
> +
> extern char *fdt_stdout_path;
>
> /* Helper for the various bits of code that generate FDT nodes */
> diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h
> index 6c28afa3f0bb..56e9c8e347a0 100644
> --- a/include/kvm/kvm.h
> +++ b/include/kvm/kvm.h
> @@ -44,7 +44,6 @@
> struct kvm_cpu;
> typedef void (*mmio_handler_fn)(struct kvm_cpu *vcpu, u64 addr, u8 *data,
> u32 len, u8 is_write, void *ptr);
> -typedef void (*fdt_irq_fn)(void *fdt, u8 irq, enum irq_type irq_type);
>
> enum {
> KVM_VMSTATE_RUNNING,
