| Message ID | 20190405064121.23662-2-richardw.yang@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | cleanup select_machine | expand |
Wei Yang <richardw.yang@linux.intel.com> writes: > Function find_default_machine() is introduced by commit 2c8cffa599b7 > "vl: make find_default_machine externally visible", and it was used > outside of vl.c until commit a904410af5f1 "pc_sysfw: remove the rom_only > property". > > Commit a904410af5f1 "pc_sysfw: remove the rom_only property" removed the > only user of find_default_machine() outside vl.c, but neglected to make > it static. Do that now. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/include/hw/boards.h b/include/hw/boards.h index 21212f0859..e911d56c28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -57,7 +57,6 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, #define MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) -MachineClass *find_default_machine(void); extern MachineState *current_machine; void machine_run_board_init(MachineState *machine); diff --git a/vl.c b/vl.c index 502857a176..8a874e81a3 100644 --- a/vl.c +++ b/vl.c @@ -1441,7 +1441,7 @@ static MachineClass *find_machine(const char *name) return mc; } -MachineClass *find_default_machine(void) +static MachineClass *find_default_machine(void) { GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false); MachineClass *mc = NULL;
Function find_default_machine() is introduced by commit 2c8cffa599b7 "vl: make find_default_machine externally visible", and it was used outside of vl.c until commit a904410af5f1 "pc_sysfw: remove the rom_only property". Commit a904410af5f1 "pc_sysfw: remove the rom_only property" removed the only user of find_default_machine() outside vl.c, but neglected to make it static. Do that now. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- v2: * refactor changelog as suggested by Markus * move one not related change to patch 2 --- include/hw/boards.h | 1 - vl.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)