From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60230)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <nchip@afflict.kos.to>) id 1V2nMS-00057L-2b
	for qemu-devel@nongnu.org; Fri, 26 Jul 2013 15:07:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <nchip@afflict.kos.to>) id 1V2nML-0006nV-Ob
	for qemu-devel@nongnu.org; Fri, 26 Jul 2013 15:07:31 -0400
Received: from afflict.kos.to ([92.243.29.197]:46900)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <nchip@afflict.kos.to>) id 1V2nML-0006n8-IX
	for qemu-devel@nongnu.org; Fri, 26 Jul 2013 15:07:25 -0400
Date: Fri, 26 Jul 2013 22:07:23 +0300
From: Riku Voipio <riku.voipio@iki.fi>
Message-ID: <20130726190723.GA27041@afflict.kos.to>
References: <1374853454-10999-1-git-send-email-afaerber@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <1374853454-10999-1-git-send-email-afaerber@suse.de>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH qom-cpu for-1.6] linux-user: Avoid
 redundant ENV_GET_CPU()
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: Andreas =?utf-8?Q?F=C3=A4rber?= <afaerber@suse.de>
Cc: Riku Voipio <riku.voipio@iki.fi>, qemu-devel@nongnu.org

On Fri, Jul 26, 2013 at 05:44:14PM +0200, Andreas F=C3=A4rber wrote:
> This fixes a mismerge in 874ec3c5b3821bb964f9f37b2f930f2a9ce51652.
=20
> Signed-off-by: Andreas F=C3=A4rber <afaerber@suse.de>

Acked-by: Riku Voipio <riku.voipio@iki.fi>

> ---
>  linux-user/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 5dc0947..5309117 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -3637,7 +3637,7 @@ int main(int argc, char **argv, char **envp)
>          exit(1);
>      }
>      cpu =3D ENV_GET_CPU(env);
> -    cpu_reset(ENV_GET_CPU(env));
> +    cpu_reset(cpu);
> =20
>      thread_cpu =3D cpu;
> =20
> --=20
> 1.8.1.4