[Qemu-devel] [qemu-devel][PATCH v1 1/2] ssi.c: Check if slave already attached to a parent bus

[Qemu-devel] [qemu-devel][PATCH v1 1/2] ssi.c: Check if slave already attached to a parent bus

[saipavanboddu]

From: Sai Pavan Boddu <saipava@xilinx.com>

Skip auto-connect if already connected to a bus

Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
 hw/ssi/ssi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index 7eaaf56..6953c92 100644
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -152,7 +152,7 @@ static int ssi_auto_connect_slave(Object *child, void *opaque)
     SSISlave *dev = (SSISlave *)object_dynamic_cast(child, TYPE_SSI_SLAVE);
     qemu_irq cs_line;
 
-    if (!dev) {
+    if (!dev || qdev_get_parent_bus(DEVICE(dev))) {
         return 0;
     }
 
-- 
2.7.4

[Qemu-devel] [qemu-devel][PATCH v1 2/2] xilinx_spi: use qdev_init_gpio_out for gpio init

[saipavanboddu]

From: Sai Pavan Boddu <saipava@xilinx.com>

useful to connect gpio with qdev_connect_gpio_out

Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
 hw/ssi/xilinx_spi.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 83585bc..dcd1a2f 100644
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -323,7 +323,6 @@ static int xilinx_spi_init(SysBusDevice *sbd)
 {
     DeviceState *dev = DEVICE(sbd);
     XilinxSPI *s = XILINX_SPI(dev);
-    int i;
 
     DB_PRINT("\n");
 
@@ -332,9 +331,7 @@ static int xilinx_spi_init(SysBusDevice *sbd)
     sysbus_init_irq(sbd, &s->irq);
     s->cs_lines = g_new0(qemu_irq, s->num_cs);
     ssi_auto_connect_slaves(dev, s->cs_lines, s->spi);
-    for (i = 0; i < s->num_cs; ++i) {
-        sysbus_init_irq(sbd, &s->cs_lines[i]);
-    }
+    qdev_init_gpio_out(dev, s->cs_lines, s->num_cs);
 
     memory_region_init_io(&s->mmio, OBJECT(s), &spi_ops, s,
                           "xilinx-spi", R_MAX * 4);
-- 
2.7.4