Delete 16 *_cpu_class_by_name() functions
cover Delete 16 *_cpu_class_by_name() functions
This series adds a new CPUClass::class_name_format field, which allows us to delete 16 of the 21 *_cpu_class_by_name() functions that exist today.
Cornelia Huck (1):
hw: add compat machines for 4.1
Eduardo Habkost (9):
cpu: Rename parse_cpu_model() to parse_cpu_option()
cpu: Fix crash with empty -cpu option
cpu: Change return type of cpu_class_by_name() to CPUClass
riscv: Don't split CPU model string
arm: Don't split CPU model string
arm: Remove special case for "any" CPU model
cpu: Let architectures set CPU class name format
cpu: Set class name format for some architectures
cpu: Set fixed class name on some architectures
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
Zhang Yi (3):
util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap scripts/update-linux-headers: add linux/mman.h
linux-headers: add linux/mman.h.
include/hw/boards.h | 4 +- include/hw/i386/pc.h | 3 + include/qemu/mmap-alloc.h | 21 +++- include/qom/cpu.h | 20 +++- linux-headers/asm-arm/mman.h | 4 + linux-headers/asm-arm64/mman.h | 1 + linux-headers/asm-generic/hugetlb_encode.h | 36 +++++++ linux-headers/asm-generic/mman-common.h | 77 +++++++++++++++ linux-headers/asm-generic/mman.h | 24 +++++ linux-headers/asm-mips/mman.h | 108 +++++++++++++++++++++ linux-headers/asm-powerpc/mman.h | 39 ++++++++ linux-headers/asm-s390/mman.h | 1 + linux-headers/asm-x86/mman.h | 31 ++++++ linux-headers/linux/mman.h | 38 ++++++++ target/s390x/internal.h | 1 - bsd-user/main.c | 2 +- exec.c | 18 ++-- hw/arm/virt.c | 9 +- hw/core/machine.c | 3 + hw/i386/pc.c | 3 + hw/i386/pc_piix.c | 14 ++- hw/i386/pc_q35.c | 13 ++- hw/ppc/spapr.c | 15 ++- hw/s390x/s390-virtio-ccw.c | 14 ++- linux-user/main.c | 2 +- qom/cpu.c | 20 +++- target/arm/cpu.c | 30 +----- target/hppa/cpu.c | 8 +- target/i386/cpu.c | 11 +-- target/lm32/cpu.c | 17 +--- target/m68k/cpu.c | 17 +--- target/microblaze/cpu.c | 8 +- target/mips/cpu.c | 13 +-- target/moxie/cpu.c | 17 +--- target/nios2/cpu.c | 8 +- target/openrisc/cpu.c | 17 +--- target/riscv/cpu.c | 20 +--- target/s390x/cpu.c | 2 +- target/s390x/cpu_models.c | 20 +--- target/tilegx/cpu.c | 8 +- target/tricore/cpu.c | 17 +--- target/unicore32/cpu.c | 17 +--- target/xtensa/cpu.c | 17 +--- util/mmap-alloc.c | 6 +- util/oslib-posix.c | 2 +- vl.c | 87 +++++++---------- scripts/update-linux-headers.sh | 6 +- 47 files changed, 566 insertions(+), 303 deletions(-) create mode 100644 linux-headers/asm-arm/mman.h create mode 100644 linux-headers/asm-arm64/mman.h create mode 100644 linux-headers/asm-generic/hugetlb_encode.h create mode 100644 linux-headers/asm-generic/mman-common.h create mode 100644 linux-headers/asm-generic/mman.h create mode 100644 linux-headers/asm-mips/mman.h create mode 100644 linux-headers/asm-powerpc/mman.h create mode 100644 linux-headers/asm-s390/mman.h create mode 100644 linux-headers/asm-x86/mman.h create mode 100644 linux-headers/linux/mman.h
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
PATCH 1/17 hw: add compat machines for 4.1
From: Cornelia Huck <[email protected]>
Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
Message-Id: <[email protected]>
--- include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 14 +++++++++++++- hw/i386/pc_q35.c | 13 ++++++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- 9 files changed, 71 insertions(+), 6 deletions(-)
include/hw/boards.h +3 -0
@@ -293,6 +293,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_4_0[]; +extern const size_t hw_compat_4_0_len; +extern GlobalProperty hw_compat_3_1[];extern const size_t hw_compat_3_1_len;
include/hw/i386/pc.h +3 -0
@@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);int e820_get_num_entries (void );bool e820_get_entry (int ,uint32_t ,uint64_t *,uint64_t *); +extern GlobalProperty pc_compat_4_0[]; +extern const size_t pc_compat_4_0_len; +extern GlobalProperty pc_compat_3_1[];extern const size_t pc_compat_3_1_len;
hw/arm/virt.c +8 -1
@@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_4_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) +static void virt_machine_4_0_options (MachineClass *mc) { +virt_machine_4_1_options (mc); +compat_props_add (mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(4, 0) +DEFINE_VIRT_MACHINE(4, 0)static void virt_machine_3_1_options (MachineClass *mc) {
hw/core/machine.c +3 -0
@@ -24,6 +24,9 @@#include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" +GlobalProperty hw_compat_4_0[] = {}; +const size_t hw_compat_4_0_len =G_N_ELEMENTS (hw_compat_4_0); +GlobalProperty hw_compat_3_1[] = { {"pcie-root-port" ,"x-speed" ,"2_5" }, {"pcie-root-port" ,"x-width" ,"1" },
hw/i386/pc.c +3 -0
@@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};/* Physical Address of PVH entry point read from kernel ELF NOTE */ static size_t pvh_start_addr; +GlobalProperty pc_compat_4_0[] = {}; +const size_t pc_compat_4_0_len =G_N_ELEMENTS (pc_compat_4_0); +GlobalProperty pc_compat_3_1[] = { {"intel-iommu" ,"dma-drain" ,"off" }, {"Opteron_G3" "-" TYPE_X86_CPU ,"rdtscp" ,"off" },
hw/i386/pc_piix.c +13 -1
@@ -428,13 +428,25 @@ static void pc_i440fx_machine_options(MachineClass *m)machine_class_allow_dynamic_sysbus_dev (m,TYPE_RAMFB_DEVICE ); } -static void pc_i440fx_4_0_machine_options (MachineClass *m) +static void pc_i440fx_4_1_machine_options (MachineClass *m) {pc_i440fx_machine_options (m); m->alias ="pc" ; m->is_default =1 ; } +DEFINE_I440FX_MACHINE (v4_1,"pc-i440fx-4.1" ,NULL , + pc_i440fx_4_1_machine_options); + +static void pc_i440fx_4_0_machine_options (MachineClass *m) +{ +pc_i440fx_4_1_machine_options (m); + m->alias =NULL ; + m->is_default =0 ; +compat_props_add (m->compat_props, hw_compat_4_0, hw_compat_4_0_len); +compat_props_add (m->compat_props, pc_compat_4_0, pc_compat_4_0_len); +} +DEFINE_I440FX_MACHINE (v4_0,"pc-i440fx-4.0" ,NULL , pc_i440fx_4_0_machine_options);
hw/i386/pc_q35.c +12 -1
@@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus =288 ; } -static void pc_q35_4_0_machine_options (MachineClass *m) +static void pc_q35_4_1_machine_options (MachineClass *m) {pc_q35_machine_options (m); m->alias ="q35" ; } +DEFINE_Q35_MACHINE (v4_1,"pc-q35-4.1" ,NULL , + pc_q35_4_1_machine_options); + +static void pc_q35_4_0_machine_options (MachineClass *m) +{ +pc_q35_4_1_machine_options (m); + m->alias =NULL ; +compat_props_add (m->compat_props, hw_compat_4_0, hw_compat_4_0_len); +compat_props_add (m->compat_props, pc_compat_4_0, pc_compat_4_0_len); +} +DEFINE_Q35_MACHINE (v4_0,"pc-q35-4.0" ,NULL , pc_q35_4_0_machine_options);
hw/ppc/spapr.c +13 -2
@@ -4344,15 +4344,26 @@ static const TypeInfo spapr_machine_info = { } \ type_init(spapr_machine_register_##suffix) +/* +* pseries-4.1 +*/ +static void spapr_machine_4_1_class_options(MachineClass *mc) +{ +/* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(4_1, "4.1", true); +/* * pseries-4.0 */ static void spapr_machine_4_0_class_options (MachineClass *mc) { -/* Defaults for the latest behaviour inherited from the base class */ +spapr_machine_4_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); } -DEFINE_SPAPR_MACHINE(4_0, "4.0", true); +DEFINE_SPAPR_MACHINE(4_0, "4.0", false);/* * pseries-3.1
hw/s390x/s390-virtio-ccw.c +13 -1
@@ -646,14 +646,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_4_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_4_1_class_options (MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(4_1, "4.1", true); +static void ccw_machine_4_0_instance_options (MachineState *machine) { +ccw_machine_4_1_instance_options (machine); }static void ccw_machine_4_0_class_options (MachineClass *mc) { +ccw_machine_4_1_class_options (mc); +compat_props_add (mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); } -DEFINE_CCW_MACHINE(4_0, "4.0", true); +DEFINE_CCW_MACHINE(4_0, "4.0", false);static void ccw_machine_3_1_instance_options (MachineState *machine) {
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
PATCH 2/17 vl.c: make find_default_machine() local
In reply to Eduardo HabkostFrom: Wei Yang <[email protected]>
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.
Message-Id: <[email protected]>
--- 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
@@ -1488,7 +1488,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.18.0.rc1.1.g3f1ff2140
PATCH 3/17 vl.c: allocate TYPE_MACHINE list once during bootup
In reply to Eduardo HabkostFrom: Wei Yang <[email protected]>
Now 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.
Message-Id: <[email protected]>
--- vl.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
vl.c +11 -13
@@ -1465,9 +1465,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) {
@@ -1484,13 +1484,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) {
@@ -1502,7 +1501,6 @@ static MachineClass *find_default_machine(void) } } -g_slist_free (machines);return mc; }
@@ -2585,16 +2583,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)) {
@@ -2614,7 +2611,6 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) } } -g_slist_free (machines);exit (!name || !is_help_option (name)); }
@@ -2706,7 +2702,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;
@@ -2718,7 +2715,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) {
@@ -2728,6 +2725,7 @@ static MachineClass *select_machine(void) }loc_pop (&loc); +g_slist_free (machines);return machine_class; }
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
PATCH 4/17 vl: Clean up after previous commit
In reply to Eduardo HabkostFrom: 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.
Message-Id: <[email protected]>
--- vl.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)
vl.c +8 -17
@@ -1468,40 +1468,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.18.0.rc1.1.g3f1ff2140
PATCH 5/17 vl: Simplify machine_parse()
In reply to Eduardo HabkostFrom: 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".
Message-Id: <[email protected]>
--- vl.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
vl.c +10 -12
@@ -2576,19 +2576,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) {
@@ -2600,9 +2591,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.18.0.rc1.1.g3f1ff2140
PATCH 6/17 cpu: Rename parse_cpu_model() to parse_cpu_option()
In reply to Eduardo HabkostThe "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.
Message-Id: <[email protected]>
--- include/qom/cpu.h | 6 +++--- bsd-user/main.c | 2 +- exec.c | 4 ++-- linux-user/main.c | 2 +- vl.c | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-)
include/qom/cpu.h +3 -3
@@ -689,15 +689,15 @@ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model);CPUState *cpu_create (const char *typename);/** -* parse_cpu_model: -* @cpu_model: The model string including optional parameters. +* parse_cpu_option: +* @cpu_option: The -cpu option including optional parameters. * * processes optional parameters and registers them as global properties * * Returns: type of CPU to create or prints error and terminates process * if an error occurred. */ -const char *parse_cpu_model (const char *cpu_model); +const char *parse_cpu_option (const char *cpu_option);/** * cpu_has_work:
bsd-user/main.c +1 -1
@@ -903,7 +903,7 @@ int main(int argc, char **argv)/* init tcg before creating CPUs and to get qemu_host_page_size */ tcg_exec_init (0 ); - cpu_type =parse_cpu_model (cpu_model); + cpu_type =parse_cpu_option (cpu_model); cpu =cpu_create (cpu_type); env = cpu->env_ptr;#if defined(TARGET_SPARC ) || defined(TARGET_PPC )
exec.c +2 -2
@@ -982,14 +982,14 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)#endif } -const char *parse_cpu_model (const char *cpu_model) +const char *parse_cpu_option (const char *cpu_option) {ObjectClass *oc;CPUClass *cc;gchar **model_pieces;const char *cpu_type; - model_pieces =g_strsplit (cpu_model,"," ,2 ); + model_pieces =g_strsplit (cpu_option,"," ,2 ); oc =cpu_class_by_name (CPU_RESOLVING_TYPE , model_pieces[0 ]);if (oc ==NULL ) {
linux-user/main.c +1 -1
@@ -660,7 +660,7 @@ int main(int argc, char **argv, char **envp)if (cpu_model ==NULL ) { cpu_model =cpu_get_model (get_elf_eflags (execfd)); } - cpu_type =parse_cpu_model (cpu_model); + cpu_type =parse_cpu_option (cpu_model);/* init tcg before creating CPUs and to get qemu_host_page_size */ tcg_exec_init (0 );
vl.c +9 -9
@@ -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 (stdout, &fprintf, cpu_model); +if (cpu_option &&is_help_option (cpu_option)) { +list_cpus (stdout, &fprintf, 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);
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
Please ignore this series. I used master as base instead of machine-next by mistake and it included all the patches that were already in machine-next. I'm sending another series with just the 7 patches that I intended to submit.
Signature · 1 line
Eduardo