diff options
| author | Markus Armbruster <armbru@redhat.com> | 2009-10-07 01:15:58 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-07 08:54:54 -0500 |
| commit | e23a1b33b53d25510320b26d9f154e19c6c99725 (patch) | |
| tree | 2c0c5b9ac463c9e9ed745d1ea1837892cac139f3 /hw/musicpal.c | |
| parent | 33e66b86d89040f0a9e99aa53deb74ce8936a649 (diff) | |
| download | qemu-e23a1b33b53d25510320b26d9f154e19c6c99725.tar.gz qemu-e23a1b33b53d25510320b26d9f154e19c6c99725.tar.bz2 qemu-e23a1b33b53d25510320b26d9f154e19c6c99725.zip | |
New qdev_init_nofail()
Like qdev_init(), but terminate program via hw_error() instead of
returning an error value.
Use it instead of qdev_init() where terminating the program on failure
is okay, either because it's during machine construction, or because
we know that failure can't happen.
Because relying in the latter is somewhat unclean, and the former is
not always obvious, it would be nice to go back to qdev_init() in the
not-so-obvious cases, only with proper error handling. I'm leaving
that for another day, because it involves making sure that error
values are properly checked by all callers.
Patchworks-ID: 35168
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/musicpal.c')
| -rw-r--r-- | hw/musicpal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c index 1fad36f2e4..02d4c70ba5 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1551,7 +1551,7 @@ static void musicpal_init(ram_addr_t ram_size, qemu_check_nic_model(&nd_table[0], "mv88w8618"); dev = qdev_create(NULL, "mv88w8618_eth"); dev->nd = &nd_table[0]; - qdev_init(dev); + qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, MP_ETH_BASE); sysbus_connect_irq(sysbus_from_qdev(dev), 0, pic[MP_ETH_IRQ]); @@ -1589,7 +1589,7 @@ static void musicpal_init(ram_addr_t ram_size, dev = qdev_create(NULL, "mv88w8618_audio"); s = sysbus_from_qdev(dev); qdev_prop_set_ptr(dev, "wm8750", wm8750_dev); - qdev_init(dev); + qdev_init_nofail(dev); sysbus_mmio_map(s, 0, MP_AUDIO_BASE); sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]); #endif |