Re: [PATCH 02/32] hw/i386/pc: Move kvm_i8259_init() declaration to sysemu/kvm.h

[Philippe Mathieu-Daudé]

On 10/17/19 4:57 PM, Aleksandar Markovic wrote:
> On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <address@hidden 
> <mailto:address@hidden>> wrote:
>
>     Move the KVM-related call to "sysemu/kvm.h".

Maybe s/call/function declaration/

>     Signed-off-by: Philippe Mathieu-Daudé <address@hidden
>     <mailto:address@hidden>>
>     ---
>       include/hw/i386/pc.h | 1 -
>       include/sysemu/kvm.h | 1 +
>       2 files changed, 1 insertion(+), 1 deletion(-)
>
>
> Is there any other similar case in our code base?

These look appropriate:

include/hw/ppc/openpic_kvm.h:5:int kvm_openpic_connect_vcpu(DeviceState 
*d, CPUState *cs);
include/hw/timer/i8254.h:67:static inline ISADevice *kvm_pit_init(ISABus 
*bus, int base)
hw/intc/vgic_common.h:25: * kvm_arm_gic_set_irq - Send an IRQ to the 
in-kernel vGIC
hw/intc/vgic_common.h:33:void kvm_arm_gic_set_irq(uint32_t num_irq, int 
irq, int level);

although kvm_pit_init() is probably borderline.

> A.
>
>     diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
>     index 6df4f4b6fb..09e74e7764 100644
>     --- a/include/hw/i386/pc.h
>     +++ b/include/hw/i386/pc.h
>     @@ -158,7 +158,6 @@ typedef struct PCMachineClass {
>
>       extern DeviceState *isa_pic;
>       qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq);
>     -qemu_irq *kvm_i8259_init(ISABus *bus);
>       int pic_read_irq(DeviceState *d);
>       int pic_get_output(DeviceState *d);
>
>     diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
>     index 9d143282bc..da8aa9f5a8 100644
>     --- a/include/sysemu/kvm.h
>     +++ b/include/sysemu/kvm.h
>     @@ -513,6 +513,7 @@ void kvm_irqchip_set_qemuirq_gsi(KVMState *s,
>     qemu_irq irq, int gsi);
>       void kvm_pc_gsi_handler(void *opaque, int n, int level);
>       void kvm_pc_setup_irq_routing(bool pci_enabled);
>       void kvm_init_irq_routing(KVMState *s);
>     +qemu_irq *kvm_i8259_init(ISABus *bus);
>
>       /**
>        * kvm_arch_irqchip_create:
>     -- 
>     2.21.0