On 2012-08-15 13:08, Peter Maydell wrote:
> Move the init of the irqchip_inject_ioctl field of KVMState out of
> kvm_irqchip_create() and into kvm_init(), so that kvm_set_irq()
> can be used even when no irqchip is created (for architectures
> that support async interrupt notification even without an in
> kernel irqchip).
>
> Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
> ---
> Changes v1->v2: move whe whole chunk of init code, for both
> KVM_IRQ_LINE and KVM_IRQ_LINE_STATUS possibilities.
>
> kvm-all.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/kvm-all.c b/kvm-all.c
> index 34b02c1..72d84a2 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1200,10 +1200,6 @@ static int kvm_irqchip_create(KVMState *s)
> return ret;
> }
>
> - s->irqchip_inject_ioctl = KVM_IRQ_LINE;
> - if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {
> - s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS;
> - }
> kvm_kernel_irqchip = true;
> /* If we have an in-kernel IRQ chip then we must have asynchronous
> * interrupt delivery (though the reverse is not necessarily true)
> @@ -1350,6 +1346,11 @@ int kvm_init(void)
> s->direct_msi = (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0);
> #endif
>
> + s->irqchip_inject_ioctl = KVM_IRQ_LINE;
> + if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {
> + s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS;
> + }
> +
> ret = kvm_arch_init(s);
> if (ret < 0) {
> goto err;
>
As it's not yet merged, some late comment: irqchip_inject_ioctl should
be renamed as well. irq_inject_ioctl?
Jan
--
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
