[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [RFC 1/3] machine: call machine init from wrapper
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [RFC 1/3] machine: call machine init from wrapper |
Date: |
Fri, 17 Feb 2017 19:56:33 +0100 |
add machine_run_board_init() wrapper that calls
machine init for now but in follow up patches
it will be used to run generic code that should run
before machine init.
Signed-off-by: Igor Mammedov <address@hidden>
---
include/hw/boards.h | 1 +
hw/core/machine.c | 6 ++++++
vl.c | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 269d0ba..04f5352 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -32,6 +32,7 @@ void memory_region_allocate_system_memory(MemoryRegion *mr,
Object *owner,
MachineClass *find_default_machine(void);
extern MachineState *current_machine;
+void machine_run_board_init(MachineState *machine);
bool machine_usb(MachineState *machine);
bool machine_kernel_irqchip_allowed(MachineState *machine);
bool machine_kernel_irqchip_required(MachineState *machine);
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 0699750..fe82529 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -575,6 +575,12 @@ bool machine_mem_merge(MachineState *machine)
return machine->mem_merge;
}
+void machine_run_board_init(MachineState *machine)
+{
+ MachineClass *machine_class = MACHINE_GET_CLASS(machine);
+ machine_class->init(machine);
+}
+
static void machine_class_finalize(ObjectClass *klass, void *data)
{
MachineClass *mc = MACHINE_CLASS(klass);
diff --git a/vl.c b/vl.c
index 93406ba..9af4462 100644
--- a/vl.c
+++ b/vl.c
@@ -4484,7 +4484,7 @@ int main(int argc, char **argv, char **envp)
current_machine->boot_order = boot_order;
current_machine->cpu_model = cpu_model;
- machine_class->init(current_machine);
+ machine_run_board_init(current_machine);
realtime_init();
--
2.7.4
- [Qemu-ppc] [RFC 0/3] generalize parsing of cpu_model, Igor Mammedov, 2017/02/17
- [Qemu-ppc] [RFC 1/3] machine: call machine init from wrapper,
Igor Mammedov <=
- [Qemu-ppc] [RFC 2/3] machine: generalize handling of default cpu_model, Igor Mammedov, 2017/02/17
- [Qemu-ppc] [RFC 3/3] machine: generilize cpu_model parsing, Igor Mammedov, 2017/02/17
- Re: [Qemu-ppc] [RFC 0/3] generalize parsing of cpu_model, Peter Maydell, 2017/02/17
- Re: [Qemu-ppc] [RFC 0/3] generalize parsing of cpu_model, Igor Mammedov, 2017/02/20
- Re: [Qemu-ppc] [RFC 0/3] generalize parsing of cpu_model, Peter Maydell, 2017/02/20
- Re: [Qemu-ppc] [Qemu-devel] [RFC 0/3] generalize parsing of cpu_model, Igor Mammedov, 2017/02/21
- Re: [Qemu-ppc] [Qemu-devel] [RFC 0/3] generalize parsing of cpu_model, Peter Maydell, 2017/02/21
- Re: [Qemu-ppc] [Qemu-devel] [RFC 0/3] generalize parsing of cpu_model, Markus Armbruster, 2017/02/21
- Re: [Qemu-ppc] [Qemu-devel] [RFC 0/3] generalize parsing of cpu_model, Peter Maydell, 2017/02/21
- Re: [Qemu-ppc] [Qemu-devel] [RFC 0/3] generalize parsing of cpu_model, Markus Armbruster, 2017/02/21