On 6/28/19 10:02 PM, Eduardo Habkost wrote:
> Replace the static variable with a PCMachineClass field. This
> will help us eventually get rid of the pc_compat_*() init
> functions.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> include/hw/i386/pc.h | 3 +++
> hw/i386/pc.c | 22 +++++++++-------------
> hw/i386/pc_piix.c | 3 ++-
> 3 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index c54cc54a47..853502f277 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -134,6 +134,9 @@ typedef struct PCMachineClass {
>
> /* use PVH to load kernels that support this feature */
> bool pvh_enabled;
> +
> + /* Enables contiguous-apic-ID mode */
> + bool compat_apic_id_mode;
> } PCMachineClass;
>
> #define TYPE_PC_MACHINE "generic-pc-machine"
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index e96360b47a..3983621f1c 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -913,14 +913,6 @@ bool e820_get_entry(int idx, uint32_t type, uint64_t
> *address, uint64_t *length)
> return false;
> }
>
> -/* Enables contiguous-apic-ID mode, for compatibility */
> -static bool compat_apic_id_mode;
> -
> -void enable_compat_apic_id_mode(void)
> -{
> - compat_apic_id_mode = true;
> -}
> -
> /* Calculates initial APIC ID for a specific CPU index
> *
> * Currently we need to be able to calculate the APIC ID from the CPU index
> @@ -928,13 +920,15 @@ void enable_compat_apic_id_mode(void)
> * no concept of "CPU index", and the NUMA tables on fw_cfg need the APIC ID
> of
> * all CPUs up to max_cpus.
> */
> -static uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index)
> +static uint32_t x86_cpu_apic_id_from_index(PCMachineState *pcms,
> + unsigned int cpu_index)
> {
> + PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
> uint32_t correct_id;
> static bool warned;
>
> correct_id = x86_apicid_from_cpu_idx(smp_cores, smp_threads, cpu_index);
> - if (compat_apic_id_mode) {
> + if (pcmc->compat_apic_id_mode) {
> if (cpu_index != correct_id && !warned && !qtest_enabled()) {
> error_report("APIC IDs set in compatibility mode, "
> "CPU topology won't match the configuration");
> @@ -1533,7 +1527,8 @@ static void pc_new_cpu(const char *typename, int64_t
> apic_id, Error **errp)
> void pc_hot_add_cpu(const int64_t id, Error **errp)
> {
> MachineState *ms = MACHINE(qdev_get_machine());
> - int64_t apic_id = x86_cpu_apic_id_from_index(id);
> + PCMachineState *pcms = PC_MACHINE(ms);
> + int64_t apic_id = x86_cpu_apic_id_from_index(pcms, id);
> Error *local_err = NULL;
>
> if (id < 0) {
> @@ -1569,7 +1564,7 @@ void pc_cpus_init(PCMachineState *pcms)
> *
> * This is used for FW_CFG_MAX_CPUS. See comments on bochs_bios_init().
> */
> - pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1;
> + pcms->apic_id_limit = x86_cpu_apic_id_from_index(pcms, max_cpus - 1) + 1;
> possible_cpus = mc->possible_cpu_arch_ids(ms);
> for (i = 0; i < smp_cpus; i++) {
> pc_new_cpu(possible_cpus->cpus[i].type,
> possible_cpus->cpus[i].arch_id,
> @@ -2660,6 +2655,7 @@ static int64_t pc_get_default_cpu_node_id(const
> MachineState *ms, int idx)
>
> static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms)
> {
> + PCMachineState *pcms = PC_MACHINE(ms);
> int i;
>
> if (ms->possible_cpus) {
> @@ -2679,7 +2675,7 @@ static const CPUArchIdList
> *pc_possible_cpu_arch_ids(MachineState *ms)
>
> ms->possible_cpus->cpus[i].type = ms->cpu_type;
> ms->possible_cpus->cpus[i].vcpus_count = 1;
> - ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(i);
> + ms->possible_cpus->cpus[i].arch_id =
> x86_cpu_apic_id_from_index(pcms, i);
> x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id,
> smp_cores, smp_threads, &topo);
> ms->possible_cpus->cpus[i].props.has_socket_id = true;
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index c07c4a5b38..f29de58636 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -358,7 +358,6 @@ static void pc_compat_1_4_fn(MachineState *machine)
> static void pc_compat_1_3(MachineState *machine)
> {
> pc_compat_1_4_fn(machine);
> - enable_compat_apic_id_mode();
> }
>
> /* PC compat function for pc-0.14 to pc-1.2 */
> @@ -708,6 +707,7 @@ DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4",
> pc_compat_1_4_fn,
>
> static void pc_i440fx_1_3_machine_options(MachineClass *m)
> {
> + PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> static GlobalProperty compat[] = {
> PC_CPU_MODEL_IDS("1.3.0")
> { "usb-tablet", "usb_version", "1" },
> @@ -718,6 +718,7 @@ static void pc_i440fx_1_3_machine_options(MachineClass *m)
>
> pc_i440fx_1_4_machine_options(m);
> m->hw_version = "1.3.0";
> + pcmc->compat_apic_id_mode = true;
> compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> }
>
>
Reviewed-by: Philippe Mathieu-Daude <phi...@redhat.com>
