cleanup select_machine
v2 cover cleanup select_machine
Here is two simple change related to select_machine()
[1]: make find_default_machine() local since no one outside file use it [2]: allocate TYPE_MACHINE list only once to select machine type [3]: cleanup after previous commit
[4]: Simplify machine_parse()
---
v2:
* adjust changelog in [1]
* Markus provides [3-4]
Markus Armbruster (2):
vl: Clean up after previous commit
vl: Simplify machine_parse()
Wei Yang (2):
vl.c: make find_default_machine() local vl.c: allocate TYPE_MACHINE list once during bootup
include/hw/boards.h | 1 - vl.c | 69 ++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 42 deletions(-)
Signature · 1 line
2.19.1
PATCH v2 1/4 vl.c: make find_default_machine() local
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.
---
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(-)
include/hw/boards.h +0 -1
@@ -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);
vl.c +1 -1
@@ -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 ;
Signature · 1 line
2.19.1
Re: [Qemu-devel] [PATCH v2 1/4] vl.c: make find_default_machine() local
Quoted 10 lines · Wei Yang
Function
find_default_machine()is introduced by commit2c8cffa599b7"vl: makefind_default_machineexternally visible", and it was used outside ofvl.cuntil commita904410af5f1"pc_sysfw: remove therom_onlyproperty".Commit
a904410af5f1"pc_sysfw: remove therom_onlyproperty" removed the only user offind_default_machine()outsidevl.c, but neglected to make it static. Do that now.Signed-off-by Wei Yang <[email protected]>
PATCH v2 2/4 vl.c: allocate TYPE_MACHINE list once during bootup
In reply to Wei YangNow all the functions used to select machine is local and the call flow looks like below:
select_machine()
find_default_machine()
machine_parse()
find_machine()
All these related function will need a GSList for TYPE_MACHINE. Currently we allocate this list each time we use it, while this is not necessary to do so because we don't need to modify this.
This patch make the TYPE_MACHINE list allocation in select_machine and pass this to its child for use.
--- vl.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
vl.c +11 -13
@@ -1418,9 +1418,9 @@ static int usb_parse(const char *cmdline)MachineState *current_machine; -static MachineClass *find_machine (const char *name) +static MachineClass *find_machine (const char *name,GSList *machines) { -GSList *el, *machines =object_class_get_list (TYPE_MACHINE , false); +GSList *el;MachineClass *mc =NULL ;for (el = machines; el; el = el->next) {
@@ -1437,13 +1437,12 @@ static MachineClass *find_machine(const char *name) } } -g_slist_free (machines);return mc; } -static MachineClass *find_default_machine (void ) +static MachineClass *find_default_machine (GSList *machines) { -GSList *el, *machines =object_class_get_list (TYPE_MACHINE , false); +GSList *el;MachineClass *mc =NULL ;for (el = machines; el; el = el->next) {
@@ -1455,7 +1454,6 @@ static MachineClass *find_default_machine(void) } } -g_slist_free (machines);return mc; }
@@ -2538,16 +2536,15 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) object_class_get_name(OBJECT_CLASS(mc1))); } -static MachineClass *machine_parse (const char *name) +static MachineClass *machine_parse (const char *name,GSList *machines) {MachineClass *mc =NULL ; -GSList *el, *machines =object_class_get_list (TYPE_MACHINE , false); +GSList *el;if (name) { - mc =find_machine (name); + mc =find_machine (name, machines); }if (mc) { -g_slist_free (machines);return mc; }if (name && !is_help_option (name)) {
@@ -2567,7 +2564,6 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) } } -g_slist_free (machines);exit (!name || !is_help_option (name)); }
@@ -2659,7 +2655,8 @@ static const QEMUOption *lookup_opt(int argc, char **argv,static MachineClass *select_machine (void ) { -MachineClass *machine_class =find_default_machine (); +GSList *machines =object_class_get_list (TYPE_MACHINE , false); +MachineClass *machine_class =find_default_machine (machines);const char *optarg;QemuOpts *opts;Location loc;
@@ -2671,7 +2668,7 @@ static MachineClass *select_machine(void) optarg =qemu_opt_get (opts,"type" );if (optarg) { - machine_class =machine_parse (optarg); + machine_class =machine_parse (optarg, machines); }if (!machine_class) {
@@ -2681,6 +2678,7 @@ static MachineClass *select_machine(void) }loc_pop (&loc); +g_slist_free (machines);return machine_class; }
Signature · 1 line
2.19.1
PATCH v2 3/4 vl: Clean up after previous commit
In reply to Wei YangFrom: Markus Armbruster <[email protected]>
Since the previous commit, find_machine() and find_default_machine() don't have to deallocate on return. This permits further simplifications.
--- vl.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)
vl.c +8 -17
@@ -1421,40 +1421,31 @@ MachineState *current_machine;static MachineClass *find_machine (const char *name,GSList *machines) {GSList *el; -MachineClass *mc =NULL ;for (el = machines; el; el = el->next) { -MachineClass *temp = el->data; +MachineClass *mc = el->data; -if (!strcmp (temp->name, name)) { - mc = temp; -break ; - } -if (temp->alias && - !strcmp (temp->alias, name)) { - mc = temp; -break ; +if (!strcmp (mc->name, name) || !g_strcmp0 (mc->alias, name)) { +return mc; } } -return mc; +return NULL ; }static MachineClass *find_default_machine (GSList *machines) {GSList *el; -MachineClass *mc =NULL ;for (el = machines; el; el = el->next) { -MachineClass *temp = el->data; +MachineClass *mc = el->data; -if (temp->is_default) { - mc = temp; -break ; +if (mc->is_default) { +return mc; } } -return mc; +return NULL ; }MachineInfoList *qmp_query_machines (Error **errp)
Signature · 1 line
2.19.1
PATCH v2 4/4 vl: Simplify machine_parse()
In reply to Wei YangFrom: Markus Armbruster <[email protected]>
Exploit that argument @name is nerver null. Check is_help_option() first, because that's what we do elsewhere. If we (foolishly!) defined a machine named "help", -machine help would now print help instead of selecting the machine named "help".
--- vl.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
vl.c +10 -12
@@ -2529,19 +2529,10 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b)static MachineClass *machine_parse (const char *name,GSList *machines) { -MachineClass *mc =NULL ; +MachineClass *mc;GSList *el; -if (name) { - mc =find_machine (name, machines); - } -if (mc) { -return mc; - } -if (name && !is_help_option (name)) { -error_report ("unsupported machine type" ); -error_printf ("Use -machine help to list supported machines\n" ); - }else { +if (is_help_option (name)) {printf ("Supported machines are:\n" ); machines =g_slist_sort (machines, machine_class_cmp);for (el = machines; el; el = el->next) {
@@ -2553,9 +2544,16 @@ static MachineClass *machine_parse(const char *name, GSList *machines) mc->is_default ?" (default)" :"" , mc->deprecation_reason ? " (deprecated)" : ""); } +exit (0 ); } -exit (!name || !is_help_option (name)); + mc =find_machine (name, machines); +if (!mc) { +error_report ("unsupported machine type" ); +error_printf ("Use -machine help to list supported machines\n" ); +exit (1 ); + } +return mc; }void qemu_add_exit_notifier (Notifier *notify)
Signature · 1 line
2.19.1
Quoted 6 lines · Wei Yang
Here is two simple change related to
select_machine()[1]: make
find_default_machine()local since no one outside file use it [2]: allocateTYPE_MACHINElist only once to select machine type [3]: cleanup after previous commit
[4]: Simplifymachine_parse()
Thanks! Queued on machine-next, for 4.1.
Quoted 22 lines
---
v2:
* adjust changelog in [1]
* Markus provides [3-4]Markus Armbruster (2):
vl: Clean up after previous commit
vl: Simplifymachine_parse()Wei Yang (2):
vl.c: makefind_default_machine()localvl.c: allocateTYPE_MACHINElist once during bootupinclude/hw/boards.h | 1 - vl.c | 69 ++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 42 deletions(-)Signature · 1 line
2.19.1
Signature · 1 line
Eduardo