From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7pQO-0004gC-S7 for qemu-devel@nongnu.org; Wed, 24 Jun 2015 14:29:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7pQK-00029V-Tu for qemu-devel@nongnu.org; Wed, 24 Jun 2015 14:29:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50360 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7pQK-00029H-OM for qemu-devel@nongnu.org; Wed, 24 Jun 2015 14:29:24 -0400 Message-ID: <558AF703.4070609@suse.de> Date: Wed, 24 Jun 2015 20:29:23 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <2d37cbbe85f142eb56e07538e0ef4e341b7fa637.1435115710.git.crosthwaite.peter@gmail.com> <558AF04F.30908@suse.de> In-Reply-To: <558AF04F.30908@suse.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom v3 4/4] microblaze: boot: Use cpu_set_pc() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Peter Crosthwaite , edgar.iglesias@gmail.com Am 24.06.2015 um 20:00 schrieb Andreas F=C3=A4rber: > Am 24.06.2015 um 05:19 schrieb Peter Crosthwaite: >> Use cpu_set_pc() for setting program counters when bootloading. This >> removes an instance of system level code having to reach into the CPU >> env. >> >> Reviewed-by: Andreas F=C3=A4rber >> Signed-off-by: Peter Crosthwaite >> --- >> changed since v2: >> Add () to function names in commit messages >> --- >> dtc | 2 +- >> hw/microblaze/boot.c | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/dtc b/dtc >> index 65cc4d2..bc895d6 160000 >> --- a/dtc >> +++ b/dtc >> @@ -1 +1 @@ >> -Subproject commit 65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf >> +Subproject commit bc895d6d09695d05ceb8b52486ffe861d6cfbdde >=20 > Submodule strikes again. Preparing to queue. Will squash the following deduplication: diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 9f4698a..3e8820f 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -48,13 +48,14 @@ static struct static void main_cpu_reset(void *opaque) { MicroBlazeCPU *cpu =3D opaque; + CPUState *cs =3D CPU(cpu); CPUMBState *env =3D &cpu->env; - cpu_reset(CPU(cpu)); + cpu_reset(cs); env->regs[5] =3D boot_info.cmdline; env->regs[6] =3D boot_info.initrd_start; env->regs[7] =3D boot_info.fdt; - cpu_set_pc(CPU(cpu), boot_info.bootstrap_pc); + cpu_set_pc(cs, boot_info.bootstrap_pc); if (boot_info.machine_cpu_reset) { boot_info.machine_cpu_reset(cpu); } Regards, Andreas --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Felix Imend=C3=B6rffer, Jane Smithard, Dilip Upmanyu, Graham Norton; = HRB 21284 (AG N=C3=BCrnberg)