summaryrefslogtreecommitdiffstats
path: root/hw/musicpal.c
diff options
context:
space:
mode:
authorPaul Brook2009-05-23 01:05:19 +0200
committerPaul Brook2009-05-23 01:13:41 +0200
commit02e2da45c4601909d5105838323d5c529ec7010b (patch)
treee9b1099baa55c3f8084110feb28f57ede8d2de3a /hw/musicpal.c
parentFix lance segfaults (diff)
downloadqemu-02e2da45c4601909d5105838323d5c529ec7010b.tar.gz
qemu-02e2da45c4601909d5105838323d5c529ec7010b.tar.xz
qemu-02e2da45c4601909d5105838323d5c529ec7010b.zip
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 <paul@codesourcery.com>
Diffstat (limited to 'hw/musicpal.c')
-rw-r--r--hw/musicpal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 16476f2d4c..1e0aff5cbb 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -431,7 +431,7 @@ static i2c_interface *musicpal_audio_init(qemu_irq irq)
s->irq = irq;
i2c = qemu_mallocz(sizeof(i2c_interface));
- i2c->bus = i2c_init_bus();
+ i2c->bus = i2c_init_bus(NULL, "i2c");
i2c->current_addr = -1;
s->wm = i2c_create_slave(i2c->bus, "wm8750", MP_WM_ADDR);