motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

cpu: Rename parse_cpu_model() to parse_cpu_option()

Browse source 
The "model[,option...]" string parsed by the function is not just
a CPU model.  Rename the function and its argument to indicate it
expects the full "-cpu" option to be provided.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20190417025944.16154-2-ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2019-04-16 23:59:40 -03:00
parent 12cb82fdf0
commit c1c8cfe5f9
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vl.c
View file

@ -2989,7 +2989,7 @@ int main(int argc, char **argv, char **envp)
const char *optarg;
const char *loadvm = NULL;
MachineClass *machine_class;
const char *cpu_model;
const char *cpu_option;
const char *vga_model = NULL;
const char *qtest_chrdev = NULL;
const char *qtest_log = NULL;
@ -3068,7 +3068,7 @@ int main(int argc, char **argv, char **envp)
QLIST_INIT (&vm_change_state_head);
os_setup_early_signal_handling();
cpu_model = NULL;
cpu_option = NULL;
snapshot = 0;
nb_nics = 0;
@ -3120,7 +3120,7 @@ int main(int argc, char **argv, char **envp)
switch(popt->index) {
case QEMU_OPTION_cpu:
/* hw initialization will check this */
cpu_model = optarg;
cpu_option = optarg;
break;
case QEMU_OPTION_hda:
case QEMU_OPTION_hdb:
@ -4037,8 +4037,8 @@ int main(int argc, char **argv, char **envp)
qemu_set_hw_version(machine_class->hw_version);
}
if (cpu_model && is_help_option(cpu_model)) {
list_cpus(cpu_model);
if (cpu_option && is_help_option(cpu_option)) {
list_cpus(cpu_option);
exit(0);
}
@ -4286,9 +4286,9 @@ int main(int argc, char **argv, char **envp)
* Global properties get set up by qdev_prop_register_global(),
* called from user_register_global_props(), and certain option
* desugaring. Also in CPU feature desugaring (buried in
* parse_cpu_model()), which happens below this point, but may
* parse_cpu_option()), which happens below this point, but may
* only target the CPU type, which can only be created after
* parse_cpu_model() returned the type.
* parse_cpu_option() returned the type.
*
* Machine compat properties: object_set_machine_compat_props().
* Accelerator compat props: object_set_accelerator_compat_props(),
@ -4452,8 +4452,8 @@ int main(int argc, char **argv, char **envp)
/* parse features once if machine provides default cpu_type */
current_machine->cpu_type = machine_class->default_cpu_type;
if (cpu_model) {
current_machine->cpu_type = parse_cpu_model(cpu_model);
if (cpu_option) {
current_machine->cpu_type = parse_cpu_option(cpu_option);
}
parse_numa_opts(current_machine);