From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RFkqG-00024g-Eb for mharc-qemu-trivial@gnu.org; Mon, 17 Oct 2011 06:54:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:35356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFkqE-0001vl-0I for qemu-trivial@nongnu.org; Mon, 17 Oct 2011 06:54:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFkqC-00053e-Rt for qemu-trivial@nongnu.org; Mon, 17 Oct 2011 06:54:45 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38323 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFkq5-000536-3J; Mon, 17 Oct 2011 06:54:37 -0400 Received: from [10.10.102.108] (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 7937B8A95F; Mon, 17 Oct 2011 12:54:35 +0200 (CEST) Message-ID: <4E9C096B.9060405@suse.de> Date: Mon, 17 Oct 2011 12:54:35 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110922 Thunderbird/7.0 MIME-Version: 1.0 To: Dmitry Koshelev References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: qemu-trivial@nongnu.org, Peter Maydell , qemu-devel@nongnu.org, paul@codesourcery.com Subject: Re: [Qemu-trivial] [Qemu-devel] [PATCH] arm gic saving/loading fix X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Oct 2011 10:54:47 -0000 Am 17.10.2011 12:48, schrieb Dmitry Koshelev: > irq_target field saving/loading is in the wrong loop >=20 > Signed-off-by: Dmitry Koshelev Reviewed-by: Andreas F=E4rber Andreas > --- > hw/arm_gic.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/arm_gic.c b/hw/arm_gic.c > index 8286a28..ba05131 100644 > --- a/hw/arm_gic.c > +++ b/hw/arm_gic.c > @@ -662,9 +662,6 @@ static void gic_save(QEMUFile *f, void *opaque) > qemu_put_be32(f, s->enabled); > for (i =3D 0; i < NUM_CPU(s); i++) { > qemu_put_be32(f, s->cpu_enabled[i]); > -#ifndef NVIC > - qemu_put_be32(f, s->irq_target[i]); > -#endif > for (j =3D 0; j < 32; j++) > qemu_put_be32(f, s->priority1[j][i]); > for (j =3D 0; j < GIC_NIRQ; j++) > @@ -678,6 +675,9 @@ static void gic_save(QEMUFile *f, void *opaque) > qemu_put_be32(f, s->priority2[i]); > } > for (i =3D 0; i < GIC_NIRQ; i++) { > +#ifndef NVIC > + qemu_put_be32(f, s->irq_target[i]); > +#endif > qemu_put_byte(f, s->irq_state[i].enabled); > qemu_put_byte(f, s->irq_state[i].pending); > qemu_put_byte(f, s->irq_state[i].active); > @@ -699,9 +699,6 @@ static int gic_load(QEMUFile *f, void *opaque, int > version_id) > s->enabled =3D qemu_get_be32(f); > for (i =3D 0; i < NUM_CPU(s); i++) { > s->cpu_enabled[i] =3D qemu_get_be32(f); > -#ifndef NVIC > - s->irq_target[i] =3D qemu_get_be32(f); > -#endif > for (j =3D 0; j < 32; j++) > s->priority1[j][i] =3D qemu_get_be32(f); > for (j =3D 0; j < GIC_NIRQ; j++) > @@ -715,6 +712,9 @@ static int gic_load(QEMUFile *f, void *opaque, int > version_id) > s->priority2[i] =3D qemu_get_be32(f); > } > for (i =3D 0; i < GIC_NIRQ; i++) { > +#ifndef NVIC > + s->irq_target[i] =3D qemu_get_be32(f); > +#endif > s->irq_state[i].enabled =3D qemu_get_byte(f); > s->irq_state[i].pending =3D qemu_get_byte(f); > s->irq_state[i].active =3D qemu_get_byte(f); --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746, AG N=FCrnb= erg From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFkq6-0001tP-Uv for qemu-devel@nongnu.org; Mon, 17 Oct 2011 06:54:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFkq5-00053D-HW for qemu-devel@nongnu.org; Mon, 17 Oct 2011 06:54:38 -0400 Message-ID: <4E9C096B.9060405@suse.de> Date: Mon, 17 Oct 2011 12:54:35 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] arm gic saving/loading fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Dmitry Koshelev Cc: qemu-trivial@nongnu.org, Peter Maydell , qemu-devel@nongnu.org, paul@codesourcery.com Am 17.10.2011 12:48, schrieb Dmitry Koshelev: > irq_target field saving/loading is in the wrong loop >=20 > Signed-off-by: Dmitry Koshelev Reviewed-by: Andreas F=E4rber Andreas > --- > hw/arm_gic.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/arm_gic.c b/hw/arm_gic.c > index 8286a28..ba05131 100644 > --- a/hw/arm_gic.c > +++ b/hw/arm_gic.c > @@ -662,9 +662,6 @@ static void gic_save(QEMUFile *f, void *opaque) > qemu_put_be32(f, s->enabled); > for (i =3D 0; i < NUM_CPU(s); i++) { > qemu_put_be32(f, s->cpu_enabled[i]); > -#ifndef NVIC > - qemu_put_be32(f, s->irq_target[i]); > -#endif > for (j =3D 0; j < 32; j++) > qemu_put_be32(f, s->priority1[j][i]); > for (j =3D 0; j < GIC_NIRQ; j++) > @@ -678,6 +675,9 @@ static void gic_save(QEMUFile *f, void *opaque) > qemu_put_be32(f, s->priority2[i]); > } > for (i =3D 0; i < GIC_NIRQ; i++) { > +#ifndef NVIC > + qemu_put_be32(f, s->irq_target[i]); > +#endif > qemu_put_byte(f, s->irq_state[i].enabled); > qemu_put_byte(f, s->irq_state[i].pending); > qemu_put_byte(f, s->irq_state[i].active); > @@ -699,9 +699,6 @@ static int gic_load(QEMUFile *f, void *opaque, int > version_id) > s->enabled =3D qemu_get_be32(f); > for (i =3D 0; i < NUM_CPU(s); i++) { > s->cpu_enabled[i] =3D qemu_get_be32(f); > -#ifndef NVIC > - s->irq_target[i] =3D qemu_get_be32(f); > -#endif > for (j =3D 0; j < 32; j++) > s->priority1[j][i] =3D qemu_get_be32(f); > for (j =3D 0; j < GIC_NIRQ; j++) > @@ -715,6 +712,9 @@ static int gic_load(QEMUFile *f, void *opaque, int > version_id) > s->priority2[i] =3D qemu_get_be32(f); > } > for (i =3D 0; i < GIC_NIRQ; i++) { > +#ifndef NVIC > + s->irq_target[i] =3D qemu_get_be32(f); > +#endif > s->irq_state[i].enabled =3D qemu_get_byte(f); > s->irq_state[i].pending =3D qemu_get_byte(f); > s->irq_state[i].active =3D qemu_get_byte(f); --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746, AG N=FCrnb= erg