Re: [Qemu-devel] [PATCH qom-next v1 6/6] block/m25p80: Remove FROM_SSI_SLAVE usages

[Andreas Färber]

Am 12.02.2014 01:30, schrieb Peter Crosthwaite:
> Signed-off-by: Peter Crosthwaite <address@hidden>
> ---
> 
>  hw/block/m25p80.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> 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)
>  
>  static int m25p80_cs(SSISlave *ss, bool select)
>  {
> -    Flash *s = FROM_SSI_SLAVE(Flash, ss);
> +    Flash *s = M25P80(ss);
>  
>      if (select) {
>          s->len = 0;
> @@ -561,7 +561,7 @@ static int m25p80_cs(SSISlave *ss, bool select)
>  
>  static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)
>  {
> -    Flash *s = FROM_SSI_SLAVE(Flash, ss);
> +    Flash *s = M25P80(ss);
>      uint32_t r = 0;
>  
>      switch (s->state) {
> @@ -610,7 +610,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t 
> tx)
>  static int m25p80_init(SSISlave *ss)
>  {
>      DriveInfo *dinfo;
> -    Flash *s = FROM_SSI_SLAVE(Flash, ss);
> +    Flash *s = M25P80(ss);
>      M25P80Class *mc = M25P80_GET_CLASS(s);
>  
>      s->pi = 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

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg