[PATCH] kvm-userspace: Fix -no-kvm-irqchip

[PATCH] kvm-userspace: Fix -no-kvm-irqchip

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

Commit fc94d163d1e3424199166cf50449e03447400579 broke -no-kvm-irqchip.
This fixes the issue by restoring the logic of
kvm_update_interrupt_request /wrt IRQ injection from the IO thread.

[However, I did not yet get the need for all the additional tests in
that function.]

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
---

 qemu/qemu-kvm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index a7cfa24..9ca8da4 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -117,7 +117,7 @@ void kvm_update_interrupt_request(CPUState *env)
     int signal = 0;
 
     if (env) {
-        if (current_env && !current_env->kvm_cpu_state.created)
+        if (!current_env || !current_env->kvm_cpu_state.created)
             signal = 1;
         /*
          * Testing for created here is really redundant


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [PATCH] kvm-userspace: Fix -no-kvm-irqchip

[Avi Kivity]

Jan Kiszka wrote:
> Commit fc94d163d1e3424199166cf50449e03447400579 broke -no-kvm-irqchip.
> This fixes the issue by restoring the logic of
> kvm_update_interrupt_request /wrt IRQ injection from the IO thread.
>
>   

Applied, thanks.

> [However, I did not yet get the need for all the additional tests in
> that function.]
>   

Neither does the comment in that function...

-- 
error compiling committee.c: too many arguments to function