[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 49/50] hppa: fold machine_hppa_machine_init() into machine_hpp
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 49/50] hppa: fold machine_hppa_machine_init() into machine_hppa_machine_init_class_init() |
Date: |
Wed, 4 May 2022 10:25:59 +0100 |
There is no need for a separate function to set the machine class properties
separately from the others.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/hppa/machine.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 2393335a64..724ee24795 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -446,8 +446,11 @@ static void hppa_nmi(NMIState *n, int cpu_index, Error
**errp)
}
}
-static void machine_hppa_machine_init(MachineClass *mc)
+static void machine_hppa_machine_init_class_init(ObjectClass *oc, void *data)
{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ NMIClass *nc = NMI_CLASS(oc);
+
mc->desc = "HPPA B160L machine";
mc->default_cpu_type = TYPE_HPPA_CPU;
mc->init = machine_hppa_init;
@@ -459,14 +462,7 @@ static void machine_hppa_machine_init(MachineClass *mc)
mc->default_ram_size = 512 * MiB;
mc->default_boot_order = "cd";
mc->default_ram_id = "ram";
-}
-static void machine_hppa_machine_init_class_init(ObjectClass *oc, void *data)
-{
- MachineClass *mc = MACHINE_CLASS(oc);
- machine_hppa_machine_init(mc);
-
- NMIClass *nc = NMI_CLASS(oc);
nc->nmi_monitor_handler = hppa_nmi;
}
--
2.20.1
- [PATCH v2 43/50] hppa: move hppa_pci_ignore_ops from pci.c to machine.c, (continued)
- [PATCH v2 43/50] hppa: move hppa_pci_ignore_ops from pci.c to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 44/50] hppa: remove hw/hppa/pci.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 46/50] hppa: move enable_lan() define from hppa_sys.h to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 45/50] hppa: remove unused trace-events from from hw/hppa, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 47/50] hppa: remove the empty hppa_sys.h file, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 49/50] hppa: fold machine_hppa_machine_init() into machine_hppa_machine_init_class_init(),
Mark Cave-Ayland <=
- [PATCH v2 48/50] hppa: use MACHINE QOM macros for defining the hppa machine, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 50/50] hppa: simplify machine function names in machine.c, Mark Cave-Ayland, 2022/05/04
- Re: [PATCH v2 00/50] hppa: general improvements and tidy-ups, Mark Cave-Ayland, 2022/05/08