From 02e2da45c4601909d5105838323d5c529ec7010b Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Sat, 23 May 2009 00:05:19 +0100 Subject: Add common BusState Implement and use a common device bus state. The main side-effect is that creating a bus and attaching it to a parent device are no longer separate operations. For legacy code we allow a NULL parent, but that should go away eventually. Also tweak creation code to veriry theat a device in on the right bus. Signed-off-by: Paul Brook --- hw/spitz.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'hw/spitz.c') diff --git a/hw/spitz.c b/hw/spitz.c index dd167806c2..aa1487b20a 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -706,12 +706,9 @@ static void corgi_ssp_init(SSISlave *dev) CorgiSSPState *s = FROM_SSI_SLAVE(CorgiSSPState, dev); qdev_init_gpio_in(&dev->qdev, corgi_ssp_gpio_cs, 3); - s->bus[0] = ssi_create_bus(); - qdev_attach_child_bus(&dev->qdev, "ssi0", s->bus[0]); - s->bus[1] = ssi_create_bus(); - qdev_attach_child_bus(&dev->qdev, "ssi1", s->bus[1]); - s->bus[2] = ssi_create_bus(); - qdev_attach_child_bus(&dev->qdev, "ssi2", s->bus[2]); + s->bus[0] = ssi_create_bus(&dev->qdev, "ssi0"); + s->bus[1] = ssi_create_bus(&dev->qdev, "ssi1"); + s->bus[2] = ssi_create_bus(&dev->qdev, "ssi2"); register_savevm("spitz_ssp", -1, 1, spitz_ssp_save, spitz_ssp_load, s); } -- cgit v1.2.1