From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:53775)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UGYOw-00072h-Vy
	for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:26:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UGYOs-0006aA-6Q
	for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:26:42 -0400
Received: from cantor2.suse.de ([195.135.220.15]:45760 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UGYOs-0006RO-08
	for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:26:38 -0400
Message-ID: <514359A2.5020600@suse.de>
Date: Fri, 15 Mar 2013 18:25:54 +0100
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1363341460-51903-1-git-send-email-cornelia.huck@de.ibm.com>
In-Reply-To: <1363341460-51903-1-git-send-email-cornelia.huck@de.ibm.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout.
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Alexander Graf <agraf@suse.de>, qemu-devel <qemu-devel@nongnu.org>

Am 15.03.2013 10:57, schrieb Cornelia Huck:
> Commit 259186a7 "cpu: Move halted and interrupt_request fields to CPUSt=
ate"
> seems to have missed one instance in target-s390x/kvm.c:
>=20
> /home/cohuck/git/qemu/target-s390x/kvm.c: In function =E2=80=98kvm_arch=
_process_async_events=E2=80=99:
> /home/cohuck/git/qemu/target-s390x/kvm.c:319: error: =E2=80=98CPUS390XS=
tate=E2=80=99 has no member named =E2=80=98halted=E2=80=99
> /home/cohuck/git/qemu/target-s390x/kvm.c:320: warning: control reaches =
end of non-void function
> make[1]: *** [target-s390x/kvm.o] Error 1
>=20
> Let's just switch to cs->halted.
>=20
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> ---
>  target-s390x/kvm.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

I definitely compile-tested qom-cpu on s390x before submitting my pull,
so this looks like a merge conflict to me...

Acked-by: Andreas F=C3=A4rber <afaerber@suse.de>

Andreas

>=20
> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
> index 8f111ae..644f484 100644
> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -315,8 +315,7 @@ void kvm_arch_post_run(CPUState *cpu, struct kvm_ru=
n *run)
> =20
>  int kvm_arch_process_async_events(CPUState *cs)
>  {
> -    S390CPU *cpu =3D S390_CPU(cs);
> -    return cpu->env.halted;
> +    return cs->halted;
>  }
> =20
>  void kvm_s390_interrupt_internal(S390CPU *cpu, int type, uint32_t parm=
,
>=20


--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC=
rnberg