From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49800 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pmu8K-00011K-ON for qemu-devel@nongnu.org; Tue, 08 Feb 2011 15:25:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pmu8J-00020i-9G for qemu-devel@nongnu.org; Tue, 08 Feb 2011 15:25:56 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:34415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pmu8J-00020W-0h for qemu-devel@nongnu.org; Tue, 08 Feb 2011 15:25:55 -0500 Message-ID: <4D51A6A4.4020608@web.de> Date: Tue, 08 Feb 2011 21:25:08 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> <1297185509-20996-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1297185509-20996-6-git-send-email-pbonzini@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig9E61634247BAC96A58938DC2" Sender: jan.kiszka@web.de Subject: [Qemu-devel] Re: [CFT PATCH 05/12] always qemu_cpu_kick after unhalting a cpu List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig9E61634247BAC96A58938DC2 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 2011-02-08 18:18, Paolo Bonzini wrote: > This ensures env->halt_cond is broadcast, and the loop in > qemu_tcg_wait_io_event and qemu_kvm_wait_io_event is exited > naturally rather than through a timeout. >=20 > Signed-off-by: Paolo Bonzini > --- > hw/apic.c | 1 + > hw/pc.c | 1 + > hw/ppc.c | 2 ++ > hw/sun4m.c | 11 +++++++++-- > hw/sun4u.c | 4 ++-- > target-s390x/kvm.c | 1 + > 6 files changed, 16 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/apic.c b/hw/apic.c > index 2f8376a..97e3b2b 100644 > --- a/hw/apic.c > +++ b/hw/apic.c > @@ -527,6 +527,7 @@ void apic_sipi(DeviceState *d) > return; > cpu_x86_load_seg_cache_sipi(s->cpu_env, s->sipi_vector); > s->wait_for_sipi =3D 0; > + qemu_cpu_kick(s->cpu_env); > } > =20 > static void apic_deliver(DeviceState *d, uint8_t dest, uint8_t dest_mo= de, > diff --git a/hw/pc.c b/hw/pc.c > index 4dfdc0b..fc1aa27 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -907,6 +907,7 @@ static void pc_cpu_reset(void *opaque) > =20 > cpu_reset(env); > env->halted =3D !cpu_is_bsp(env); > + qemu_cpu_kick(env); That should be unneeded, reset is performed with all vcpus stopped. > } > =20 > static CPUState *pc_new_cpu(const char *cpu_model) > diff --git a/hw/ppc.c b/hw/ppc.c > index 968aec1..de02d33 100644 > --- a/hw/ppc.c > +++ b/hw/ppc.c > @@ -208,6 +208,7 @@ static void ppc970_set_irq (void *opaque, int pin, = int level) > } else { > LOG_IRQ("%s: restart the CPU\n", __func__); > env->halted =3D 0; > + qemu_cpu_kick(env); > } > break; > case PPC970_INPUT_HRESET: > @@ -300,6 +301,7 @@ static void ppc40x_set_irq (void *opaque, int pin, = int level) > } else { > LOG_IRQ("%s: restart the CPU\n", __func__); > env->halted =3D 0; > + qemu_cpu_kick(env); > } > break; > case PPC40x_INPUT_DEBUG: > diff --git a/hw/sun4m.c b/hw/sun4m.c > index 30e8a21..47d88be 100644 > --- a/hw/sun4m.c > +++ b/hw/sun4m.c > @@ -253,15 +253,21 @@ void cpu_check_irqs(CPUState *env) > } > } > =20 > +static void cpu_kick_irq(CPUState *env) > +{ > + env->halted =3D 0; > + cpu_check_irqs(env); > + qemu_cpu_kick(env); > +} > + > static void cpu_set_irq(void *opaque, int irq, int level) > { > CPUState *env =3D opaque; > =20 > if (level) { > trace_sun4m_cpu_set_irq_raise(irq); > - env->halted =3D 0; > env->pil_in |=3D 1 << irq; > - cpu_check_irqs(env); > + cpu_kick_irq(env); > } else { > trace_sun4m_cpu_set_irq_lower(irq); > env->pil_in &=3D ~(1 << irq); > @@ -279,6 +285,7 @@ static void main_cpu_reset(void *opaque) > =20 > cpu_reset(env); > env->halted =3D 0; > + qemu_cpu_kick(env); Same here. > } > =20 > static void secondary_cpu_reset(void *opaque) > diff --git a/hw/sun4u.c b/hw/sun4u.c > index 90b1ce2..d282324 100644 > --- a/hw/sun4u.c > +++ b/hw/sun4u.c > @@ -298,6 +298,7 @@ static void cpu_kick_irq(CPUState *env) > { > env->halted =3D 0; > cpu_check_irqs(env); > + qemu_cpu_kick(env); > } > =20 > static void cpu_set_irq(void *opaque, int irq, int level) > @@ -306,9 +307,8 @@ static void cpu_set_irq(void *opaque, int irq, int = level) > =20 > if (level) { > CPUIRQ_DPRINTF("Raise CPU IRQ %d\n", irq); > - env->halted =3D 0; > env->pil_in |=3D 1 << irq; > - cpu_check_irqs(env); > + cpu_kick_irq(env); > } else { > CPUIRQ_DPRINTF("Lower CPU IRQ %d\n", irq); > env->pil_in &=3D ~(1 << irq); > diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c > index 1702c46..fc90b8d 100644 > --- a/target-s390x/kvm.c > +++ b/target-s390x/kvm.c > @@ -196,6 +196,7 @@ static void kvm_s390_interrupt_internal(CPUState *e= nv, int type, uint32_t parm, > =20 > env->halted =3D 0; > env->exception_index =3D -1; > + qemu_cpu_kick (env); > =20 > kvmint.type =3D type; > kvmint.parm =3D parm; Makes sense otherwise. Jan --------------enig9E61634247BAC96A58938DC2 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.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk1RpqQACgkQitSsb3rl5xRcNgCgqSOBPCfN03FW3EHzGtzrknzL RRkAnRN7s6s5j2hzTjMJ96vSgxnBrPpO =qyf0 -----END PGP SIGNATURE----- --------------enig9E61634247BAC96A58938DC2--