From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] kvm-userspace: Fix -no-kvm-irqchip Date: Fri, 05 Dec 2008 20:20:38 +0100 Message-ID: <49397F06.9040001@web.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2F8438E8A7BC05C884271397" Cc: Avi Kivity , Jes Sorensen To: kvm-devel Return-path: Received: from fmmailgate03.web.de ([217.72.192.234]:59021 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755163AbYLETVA (ORCPT ); Fri, 5 Dec 2008 14:21:00 -0500 Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2F8438E8A7BC05C884271397 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable 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 --- 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 =3D 0; =20 if (env) { - if (current_env && !current_env->kvm_cpu_state.created) + if (!current_env || !current_env->kvm_cpu_state.created) signal =3D 1; /* * Testing for created here is really redundant --------------enig2F8438E8A7BC05C884271397 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkk5fwoACgkQniDOoMHTA+nOuwCfRTVi0UOdhfEosLkypQ3KMD/0 DD8An3VmHf574H+Y5jXzyaj4y5rCgvPI =6cUK -----END PGP SIGNATURE----- --------------enig2F8438E8A7BC05C884271397--