Merge remote branch 'kwolf/for-anthony' into staging

[qemu.git] / hw / ssi.h

diff --git a/hw/ssi.h b/hw/ssi.h
index 861c4849e73398a698005b970abc1323ca04efa9..24610a80cba500196014dfecfa9909f823f458ee 100644 (file)
--- a/hw/ssi.h
+++ b/hw/ssi.h
@@ -18,7 +18,7 @@ typedef struct SSISlave SSISlave;
 /* Slave devices.  */
 typedef struct {
     DeviceInfo qdev;
-    void (*init)(SSISlave *dev);
+    int (*init)(SSISlave *dev);
     uint32_t (*transfer)(SSISlave *dev, uint32_t val);
 } SSISlaveInfo;
 
@@ -30,7 +30,7 @@ struct SSISlave {
 #define SSI_SLAVE_FROM_QDEV(dev) DO_UPCAST(SSISlave, qdev, dev)
 #define FROM_SSI_SLAVE(type, dev) DO_UPCAST(type, ssidev, dev)
 
-void ssi_register_slave(const char *name, int size, SSISlaveInfo *info);
+void ssi_register_slave(SSISlaveInfo *info);
 
 DeviceState *ssi_create_slave(SSIBus *bus, const char *name);