Re: [RFC PATCH 4/6] soundhw: unify initialization for ISA and PCI soundhw

[Martin Kletzander <mkletzan@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 2025 bytes --]

On Wed, Apr 27, 2022 at 01:32:23PM +0200, Paolo Bonzini wrote:
>Use qdev_new instead of distinguishing isa_create_simple/pci_create_simple.
>
>Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

By trying to rebase my series on top of this series I noticed this patch
breaks almost everything.

>---
> hw/audio/soundhw.c | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
>
>diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
>index 0fb64bdc8f..a9d8807b18 100644
>--- a/hw/audio/soundhw.c
>+++ b/hw/audio/soundhw.c
>@@ -114,25 +114,27 @@ void soundhw_init(void)
>     struct soundhw *c = selected;
>     ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);
>     PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
>+    BusState *bus;
>
>-    if (!c) {
>-        return;
>-    }

This can still happen if there is no -audio.  Without this check and
without any -audio parameter qemu obviously crashes.

>-    if (c->typename) {
>-        warn_report("'-soundhw %s' is deprecated, "
>-                    "please use '-device %s' instead",
>-                    c->name, c->typename);
>-        if (c->isa) {
>-            isa_create_simple(isa_bus, c->typename);
>-        } else {
>-            pci_create_simple(pci_bus, -1, c->typename);
>+    if (c->isa) {
>+        if (!isa_bus) {
>+            error_report("ISA bus not available for %s", c->name);
>+            exit(1);
>         }
>+        bus = BUS(isa_bus);
>     } else {
>-        assert(!c->isa);
>         if (!pci_bus) {
>             error_report("PCI bus not available for %s", c->name);
>             exit(1);
>         }
>+        bus = BUS(pci_bus);
>+    }
>+
>+    if (c->typename) {
>+        DeviceState *dev = qdev_new(c->typename);
>+        qdev_realize_and_unref(dev, bus, &error_fatal);
>+    } else {
>+        assert(!c->isa);
>         c->init_pci(pci_bus);
>     }
> }
>-- 
>2.35.1
>
>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]