From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41019)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UpyeG-0002Ag-08
	for qemu-devel@nongnu.org; Fri, 21 Jun 2013 06:32:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UpyeF-0005ck-0x
	for qemu-devel@nongnu.org; Fri, 21 Jun 2013 06:32:55 -0400
Message-ID: <51C42BD4.3010908@suse.de>
Date: Fri, 21 Jun 2013 12:32:52 +0200
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1371398269-6213-1-git-send-email-afaerber@suse.de>
	<1371398269-6213-20-git-send-email-afaerber@suse.de>
	<51BF7455.9050405@twiddle.net>
In-Reply-To: <51BF7455.9050405@twiddle.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH qom-cpu v2 19/29] cpu: Replace
 cpu_single_env with CPUState cpu_single_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: Richard Henderson <rth@twiddle.net>
Cc: Peter Maydell <peter.maydell@linaro.org>, Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, Alexander Graf <agraf@suse.de>, Blue Swirl <blauwirbel@gmail.com>, =?UTF-8?B?SGVydsOpIFBvdXNzaW5lYXU=?= <hpoussin@reactos.org>, Paul Brook <paul@codesourcery.com>, Scott Wood <scottwood@freescale.com>, qemu-ppc <qemu-ppc@nongnu.org>, Aurelien Jarno <aurelien@aurel32.net>

Am 17.06.2013 22:40, schrieb Richard Henderson:
> On 06/16/2013 08:57 AM, Andreas F=C3=A4rber wrote:
>> diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
>> index 207dcad..f0b1f6f 100644
>> --- a/hw/alpha/typhoon.c
>> +++ b/hw/alpha/typhoon.c
>> @@ -72,9 +72,8 @@ static void cpu_irq_change(AlphaCPU *cpu, uint64_t r=
eq)
>> =20
>>  static uint64_t cchip_read(void *opaque, hwaddr addr, unsigned size)
>>  {
>> -    CPUAlphaState *env =3D cpu_single_env;
>> +    CPUState *cpu =3D cpu_single_cpu;
>>      TyphoonState *s =3D opaque;
>> -    CPUState *cpu;
>>      uint64_t ret =3D 0;
>> =20
>>      if (addr & 4) {
>> @@ -95,7 +94,6 @@ static uint64_t cchip_read(void *opaque, hwaddr addr=
, unsigned size)
>> =20
>>      case 0x0080:
>>          /* MISC: Miscellaneous Register.  */
>> -        cpu =3D ENV_GET_CPU(env);
>>          ret =3D s->cchip.misc | (cpu->cpu_index & 3);
>>          break;
>> =20
>> @@ -197,8 +195,7 @@ static uint64_t cchip_read(void *opaque, hwaddr ad=
dr, unsigned size)
>>          break;
>> =20
>>      default:
>> -        cpu =3D CPU(alpha_env_get_cpu(cpu_single_env));
>> -        cpu_unassigned_access(cpu, addr, false, false, 0, size);
>> +        cpu_unassigned_access(cpu_single_cpu, addr, false, false, 0, =
size);
>=20
> Keep using the local "cpu" variable?

Fixed, thanks.

Andreas

--=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