From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34353)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WKwPA-0004yF-RE
	for qemu-devel@nongnu.org; Tue, 04 Mar 2014 15:57:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WKwP4-00021M-Fz
	for qemu-devel@nongnu.org; Tue, 04 Mar 2014 15:57:36 -0500
Received: from cantor2.suse.de ([195.135.220.15]:38364 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WKwP4-00021D-93
	for qemu-devel@nongnu.org; Tue, 04 Mar 2014 15:57:30 -0500
Message-ID: <53163E36.9010106@suse.de>
Date: Tue, 04 Mar 2014 21:57:26 +0100
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <cover.1392164348.git.peter.crosthwaite@xilinx.com>
	<f2cf40a6621c932cfb031fff29d26120ab2ad79c.1392164348.git.peter.crosthwaite@xilinx.com>
In-Reply-To: <f2cf40a6621c932cfb031fff29d26120ab2ad79c.1392164348.git.peter.crosthwaite@xilinx.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH qom-next v1 6/6] block/m25p80: Remove
 FROM_SSI_SLAVE usages
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: Peter Crosthwaite <peter.crosthwaite@xilinx.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org

Am 12.02.2014 01:30, schrieb Peter Crosthwaite:
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> ---
>=20
>  hw/block/m25p80.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>=20
> diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
> index 02a1544..bdbb139 100644
> --- a/hw/block/m25p80.c
> +++ b/hw/block/m25p80.c
> @@ -545,7 +545,7 @@ static void decode_new_cmd(Flash *s, uint32_t value=
)
> =20
>  static int m25p80_cs(SSISlave *ss, bool select)
>  {
> -    Flash *s =3D FROM_SSI_SLAVE(Flash, ss);
> +    Flash *s =3D M25P80(ss);
> =20
>      if (select) {
>          s->len =3D 0;
> @@ -561,7 +561,7 @@ static int m25p80_cs(SSISlave *ss, bool select)
> =20
>  static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)
>  {
> -    Flash *s =3D FROM_SSI_SLAVE(Flash, ss);
> +    Flash *s =3D M25P80(ss);
>      uint32_t r =3D 0;
> =20
>      switch (s->state) {
> @@ -610,7 +610,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint=
32_t tx)
>  static int m25p80_init(SSISlave *ss)
>  {
>      DriveInfo *dinfo;
> -    Flash *s =3D FROM_SSI_SLAVE(Flash, ss);
> +    Flash *s =3D M25P80(ss);
>      M25P80Class *mc =3D M25P80_GET_CLASS(s);
> =20
>      s->pi =3D mc->pi;

Adding:

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index bdbb139..e29a738 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -241,7 +241,8 @@ typedef enum {
 } CMDState;

 typedef struct Flash {
-    SSISlave ssidev;
+    SSISlave parent_obj;
+
     uint32_t r;

     BlockDriverState *bdrv;

Andreas

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg