On 15/10/2019 18.26, Philippe Mathieu-Daudé wrote: > Move the KVM-related call to "sysemu/kvm.h". > > Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> > --- > include/hw/i386/pc.h | 1 - > include/sysemu/kvm.h | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > 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); Why? The function is defined in hw/i386/kvm/ - so moving its prototype to a generic header sounds wrong to me. Thomas