hw/hppa: Move static variable lasi_dev into MachineState
Avoid static variables, so move lasi_dev into the MachineState struct. Signed-off-by: Helge Deller <deller@gmx.de> Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Helge Deller committed
Apr 1, 2026 at 21:12 UTC
cf05a5c52716fae63a1792a67b94b0612cb800b8
1 file changed
+10
-5
hw/hppa/machine.c
+10
-5
@@ -44,6 +44,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(HppaMachineState, HPPA_COMMON_MACHINE)
44
struct HppaMachineState {
45
MachineState parent_obj;
46
47
+ DeviceState *lasi_dev;
48
uint64_t memsplit_addr;
49
};
50
@@ -52,8 +53,6 @@ struct HppaMachineState {
53
#define HPA_POWER_BUTTON (FIRMWARE_END - 0x10)
54
static hwaddr soft_power_reg;
55
55
-static DeviceState *lasi_dev;
56
-
56
static void hppa_powerdown_req(Notifier *n, void *opaque)
57
{
58
uint32_t val;
@@ -399,7 +398,8 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
398
{
399
const char *kernel_filename = machine->kernel_filename;
400
MachineClass *mc = MACHINE_GET_CLASS(machine);
402
- DeviceState *dev;
401
+ HppaMachineState *hpm = HPPA_COMMON_MACHINE(machine);
402
+ DeviceState *dev, *lasi_dev;
403
PCIDevice *pci_dev;
404
long size;
405
uint64_t kernel_entry = 0;
@@ -408,6 +408,7 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
408
SysBusDevice *s;
409
410
/* Graphics setup. */
411
+ lasi_dev = hpm->lasi_dev;
412
if (lasi_dev && machine->enable_graphics &&
413
vga_interface_type != VGA_NONE) {
414
dev = qdev_new("artist");
@@ -576,7 +577,8 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
577
*/
578
static void machine_HP_715_init(MachineState *machine)
579
{
579
- DeviceState *dev;
580
+ HppaMachineState *hpm = HPPA_COMMON_MACHINE(machine);
581
+ DeviceState *dev, *lasi_dev;
582
MemoryRegion *addr_space = get_system_memory();
583
TranslateFn *translate;
584
ISABus *isa_bus;
@@ -596,6 +598,7 @@ static void machine_HP_715_init(MachineState *machine)
598
599
/* Init Lasi chip */
600
lasi_dev = DEVICE(lasi_init());
601
+ hpm->lasi_dev = lasi_dev;
602
memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA_715),
603
sysbus_mmio_get_region(
604
SYS_BUS_DEVICE(lasi_dev), 0));
@@ -652,7 +655,8 @@ static void machine_HP_715_init(MachineState *machine)
655
*/
656
static void machine_HP_B160L_init(MachineState *machine)
657
{
655
- DeviceState *dev, *dino_dev;
658
+ HppaMachineState *hpm = HPPA_COMMON_MACHINE(machine);
659
+ DeviceState *dev, *dino_dev, *lasi_dev;
660
MemoryRegion *addr_space = get_system_memory();
661
TranslateFn *translate;
662
ISABus *isa_bus;
@@ -669,6 +673,7 @@ static void machine_HP_B160L_init(MachineState *machine)
673
674
/* Init Lasi chip */
675
lasi_dev = DEVICE(lasi_init());
676
+ hpm->lasi_dev = lasi_dev;
677
memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA),
678
sysbus_mmio_get_region(
679
SYS_BUS_DEVICE(lasi_dev), 0));