Re: [Qemu-devel] [PATCH qom-next v1 1/6] ssi: Convert legacy casts from SSI_SLAVE->DEVICE

[Andreas Färber]

Am 04.03.2014 23:07, schrieb Andreas Färber:
> Am 12.02.2014 01:27, schrieb Peter Crosthwaite:
>> Convert legacy ->qdev style casts from TYPE_SSI_SLAVE to TYPE_DEVICE.
>>
>> Signed-off-by: Peter Crosthwaite <address@hidden>
>> ---
>>
>>  hw/arm/spitz.c       | 9 +++++----
>>  hw/display/ads7846.c | 2 +-
>>  hw/display/ssd0323.c | 4 ++--
>>  hw/misc/max111x.c    | 4 ++--
>>  hw/sd/ssi-sd.c       | 2 +-
>>  5 files changed, 11 insertions(+), 10 deletions(-)
> 
> Here's my changes, requiring to adjust 4/6:
[snip]

And another one blocking SSISlave::dev rename:

diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index 7be7c53..017f022 100644
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -60,7 +60,7 @@ static int ssi_slave_init(DeviceState *dev)

     if (ssc->transfer_raw == ssi_transfer_raw_default &&
             ssc->cs_polarity != SSI_CS_NONE) {
-        qdev_init_gpio_in(&s->qdev, ssi_cs_default, 1);
+        qdev_init_gpio_in(dev, ssi_cs_default, 1);
     }

     return ssc->init(s);

Andreas

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