On Fri, 6 Mar 2026 at 18:13, Helge Deller <[email protected]> wrote: > Background: During development of the various machines it was > easier for me to just disable/enable the Diva card from the command > line via the "disable" property. > Commit 16786eb7bf86 ("hw/hppa: Add BMC on 64-bit machines only") now > simply disables diva on B160L, and for the C3700, although it never > had Diva boards, we will use Diva until we get SuperIO implemented. > > The patch below should address this. > Maybe you can review? > > Thanks! > Helge > > > From: Helge Deller <[email protected]> > Subject: [PATCH] hw/hppa: Avoid leaking a diva-gsp device > > Create a Diva-gsp unconditionally on all 64-bit PCI machines. > The A400 usually comes with a Diva card. The C3700 has a built-in > SUPERIO chip, which we haven't implemented yet, so running with an > emulated Diva is the best we can do for now. > > Signed-off-by: Helge Deller <[email protected]> > Noticed-by: Peter Maydell <[email protected]> > > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c > index f55e84529f..50ace81528 100644 > --- a/hw/hppa/machine.c > +++ b/hw/hppa/machine.c > @@ -380,18 +380,15 @@ static void machine_HP_common_init_tail(MachineState > *machine, PCIBus *pci_bus, > > if (pci_bus && hppa_is_pa20(&cpu[0]->env)) { > /* BMC board: HP Diva GSP PCI card */ > - dev = qdev_new("diva-gsp"); > - if (dev && !object_property_get_bool(OBJECT(dev), "disable", NULL)) { > - pci_dev = pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); > - if (!lasi_dev) { > - /* bind default keyboard/serial to Diva card */ > - qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0)); > - qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1)); > - qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2)); > - qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3)); > - } > - pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); > + pci_dev = pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); > + if (!lasi_dev) { > + /* bind default keyboard/serial to Diva card */ > + qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0)); > + qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1)); > + qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2)); > + qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3)); > } > + pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); > } > > /* create USB OHCI controller for USB keyboard & mouse on Astro machines > */
Yes, that looks good to me, so Reviewed-by: Peter Maydell <[email protected]> I think we can also now delete the "disable" property in the diva-gsp device itself, right? thanks -- PMM
