From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50971)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.crosthwaite@petalogix.com>) id 1Z7a83-0001IG-E6
	for qemu-devel@nongnu.org; Tue, 23 Jun 2015 22:09:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.crosthwaite@petalogix.com>) id 1Z7a7z-0008UB-EW
	for qemu-devel@nongnu.org; Tue, 23 Jun 2015 22:09:31 -0400
Received: from mail-yk0-f173.google.com ([209.85.160.173]:33038)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.crosthwaite@petalogix.com>) id 1Z7a7z-0008Tz-AT
	for qemu-devel@nongnu.org; Tue, 23 Jun 2015 22:09:27 -0400
Received: by ykdt186 with SMTP id t186so16421673ykd.0
	for <qemu-devel@nongnu.org>; Tue, 23 Jun 2015 19:09:26 -0700 (PDT)
MIME-Version: 1.0
Sender: peter.crosthwaite@petalogix.com
In-Reply-To: <20150618193537.GJ3874@thinpad.lan.raisama.net>
References: <1434648295-30584-1-git-send-email-crosthwaite.peter@gmail.com>
	<1434648295-30584-8-git-send-email-crosthwaite.peter@gmail.com>
	<20150618193537.GJ3874@thinpad.lan.raisama.net>
Date: Tue, 23 Jun 2015 19:09:26 -0700
Message-ID: <CAEgOgz7Zo61rwu3Q8ygLPtM8Jnd4v8f1Cn9CgTyEFYv_Qm6BVA@mail.gmail.com>
From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH v3 7/8] cpus: Change exec_init() arg to cpu, not env
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: Eduardo Habkost <ehabkost@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, Jia Liu <proljc@gmail.com>, Peter Crosthwaite <crosthwaite.peter@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Anthony Green <green@moxielogic.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, Alexander Graf <agraf@suse.de>, Blue Swirl <blauwirbel@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>, Peter Crosthwaite <crosthwaitepeter@gmail.com>, Michael Walle <michael@walle.cc>, Paolo Bonzini <pbonzini@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>, Leon Alrae <leon.alrae@imgtec.com>, =?UTF-8?Q?Andreas_F=C3=A4rber?= <afaerber@suse.de>, Aurelien Jarno <aurelien@aurel32.net>, Richard Henderson <rth@twiddle.net>

On Thu, Jun 18, 2015 at 12:35 PM, Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Thu, Jun 18, 2015 at 10:24:54AM -0700, Peter Crosthwaite wrote:
> [...]
>> diff --git a/exec.c b/exec.c
>> index b1c8aae..7fc1950 100644
>> --- a/exec.c
>> +++ b/exec.c
>> @@ -554,9 +554,8 @@ void cpu_exec_exit(CPUState *cpu)
>>  }
>>  #endif
>>
>> -void cpu_exec_init(CPUArchState *env, Error **errp)
>> +void cpu_exec_init(CPUState *cpu, Error **errp)
>>  {
>> -    CPUState *cpu = ENV_GET_CPU(env);
>>      CPUClass *cc = CPU_GET_CLASS(cpu);
>>      int cpu_index;
>>      Error *local_err = NULL;
>> @@ -585,6 +584,7 @@ void cpu_exec_init(CPUArchState *env, Error **errp)
>>          vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu);
>>      }
>>  #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY)
>> +    CPUArchState *env = cpu->env_ptr;
>
> Mixed declarations (declarations that are not a the beginning of a
> block) are not allowed by QEMU coding style. It looks simpler to just
> eliminate the variable and use cpu->env_ptr directly at the
> register_savevm() call below.
>

Fixed in v4.

Regards,
Peter

>>      register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION,
>>                      cpu_save, cpu_load, env);
>>      assert(cc->vmsd == NULL);
>
> --
> Eduardo
>