Commit 0e11fc69 authored by Like Xu's avatar Like Xu Committed by Eduardo Habkost
Browse files

hw/i386: Replace global smp variables with machine smp properties 



The global smp variables in i386 are replaced with smp machine properties.
To avoid calling qdev_get_machine() as much as possible, some related funtions
for acpi data generations are refactored. No semantic changes.

A local variable of the same name would be introduced in the declaration
phase if it's used widely in the context OR replace it on the spot if it's
only used once. No semantic changes.

Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Message-Id: <20190518205428.90532-8-like.xu@linux.intel.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent ae71ed86

hw/i386/acpi-build.c

+7 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "sysemu/tpm.h"

#include "hw/acpi/tpm.h"

#include "hw/acpi/vmgenid.h"

#include "hw/boards.h"

#include "sysemu/tpm_backend.h"

#include "hw/timer/mc146818rtc_regs.h"

#include "hw/mem/memory-device.h"
@@ -123,7 +124,8 @@ typedef struct FwCfgTPMConfig { 


static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg);



static void init_common_fadt_data(Object *o, AcpiFadtData *data)

static void init_common_fadt_data(MachineState *ms, Object *o,

                                  AcpiFadtData *data)

{

    uint32_t io = object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, NULL);

    AmlAddressSpace as = AML_AS_SYSTEM_IO;
@@ -139,7 +141,8 @@ static void init_common_fadt_data(Object *o, AcpiFadtData *data) 
             * CPUs for more than 8 CPUs, "Clustered Logical" mode has to be

             * used

             */

            ((max_cpus > 8) ? (1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL) : 0),

            ((ms->smp.max_cpus > 8) ?

                        (1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL) : 0),

        .int_model = 1 /* Multiple APIC */,

        .rtc_century = RTC_CENTURY,

        .plvl2_lat = 0xfff /* C2 state not supported */,
@@ -173,7 +176,7 @@ static Object *object_resolve_type_unambiguous(const char *typename) 
    return o;

}



static void acpi_get_pm_info(AcpiPmInfo *pm)

static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)

{

    Object *piix = object_resolve_type_unambiguous(TYPE_PIIX4_PM);

    Object *lpc = object_resolve_type_unambiguous(TYPE_ICH9_LPC_DEVICE);
@@ -2612,7 +2615,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 
    AcpiSlicOem slic_oem = { .id = NULL, .table_id = NULL };

    Object *vmgenid_dev;



    acpi_get_pm_info(&pm);

    acpi_get_pm_info(machine, &pm);

    acpi_get_misc_info(&misc);

    acpi_get_pci_holes(&pci_hole, &pci_hole64);

    acpi_get_slic_oem(&slic_oem);

hw/i386/kvmvapic.c

+5 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "sysemu/kvm.h"

#include "hw/i386/apic_internal.h"

#include "hw/sysbus.h"

#include "hw/boards.h"

#include "tcg/tcg.h"



#define VAPIC_IO_PORT           0x7e
@@ -442,11 +443,12 @@ static void do_patch_instruction(CPUState *cs, run_on_cpu_data data) 


static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    CPUState *cs = CPU(cpu);

    VAPICHandlers *handlers;

    PatchInfo *info;



    if (smp_cpus == 1) {

    if (ms->smp.cpus == 1) {

        handlers = &s->rom_state.up;

    } else {

        handlers = &s->rom_state.mp;
@@ -747,6 +749,7 @@ static void do_vapic_enable(CPUState *cs, run_on_cpu_data data) 
static void kvmvapic_vm_state_change(void *opaque, int running,

                                     RunState state)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    VAPICROMState *s = opaque;

    uint8_t *zero;
@@ -755,7 +758,7 @@ static void kvmvapic_vm_state_change(void *opaque, int running, 
    }



    if (s->state == VAPIC_ACTIVE) {

        if (smp_cpus == 1) {

        if (ms->smp.cpus == 1) {

            run_on_cpu(first_cpu, do_vapic_enable, RUN_ON_CPU_HOST_PTR(s));

        } else {

            zero = g_malloc0(s->rom_state.vapic_size);

hw/i386/pc.c

+12 −6
Original line number Diff line number Diff line
@@ -925,11 +925,13 @@ bool e820_get_entry(int idx, uint32_t type, uint64_t *address, uint64_t *length) 
static uint32_t x86_cpu_apic_id_from_index(PCMachineState *pcms,

                                           unsigned int cpu_index)

{

    MachineState *ms = MACHINE(pcms);

    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);

    correct_id = x86_apicid_from_cpu_idx(ms->smp.cores,

                                         ms->smp.threads, cpu_index);

    if (pcmc->compat_apic_id_mode) {

        if (cpu_index != correct_id && !warned && !qtest_enabled()) {

            error_report("APIC IDs set in compatibility mode, "
@@ -1565,9 +1567,10 @@ 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(pcms, max_cpus - 1) + 1;

    pcms->apic_id_limit = x86_cpu_apic_id_from_index(pcms,

                                                     ms->smp.max_cpus - 1) + 1;

    possible_cpus = mc->possible_cpu_arch_ids(ms);

    for (i = 0; i < smp_cpus; i++) {

    for (i = 0; i < ms->smp.cpus; i++) {

        pc_new_cpu(possible_cpus->cpus[i].type, possible_cpus->cpus[i].arch_id,

                   &error_fatal);

    }
@@ -2291,6 +2294,8 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 
    X86CPU *cpu = X86_CPU(dev);

    MachineState *ms = MACHINE(hotplug_dev);

    PCMachineState *pcms = PC_MACHINE(hotplug_dev);

    unsigned int smp_cores = ms->smp.cores;

    unsigned int smp_threads = ms->smp.threads;



    if(!object_dynamic_cast(OBJECT(cpu), ms->cpu_type)) {

        error_setg(errp, "Invalid CPU type, expected cpu type: '%s'",
@@ -2300,7 +2305,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 


    /* if APIC ID is not set, set it based on socket/core/thread properties */

    if (cpu->apic_id == UNASSIGNED_APIC_ID) {

        int max_socket = (max_cpus - 1) / smp_threads / smp_cores;

        int max_socket = (ms->smp.max_cpus - 1) / smp_threads / smp_cores;



        if (cpu->socket_id < 0) {

            error_setg(errp, "CPU socket-id is not set");
@@ -2718,7 +2723,7 @@ static int64_t pc_get_default_cpu_node_id(const MachineState *ms, int idx) 


   assert(idx < ms->possible_cpus->len);

   x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id,

                            smp_cores, smp_threads, &topo);

                            ms->smp.cores, ms->smp.threads, &topo);

   return topo.pkg_id % nb_numa_nodes;

}
@@ -2726,6 +2731,7 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) 
{

    PCMachineState *pcms = PC_MACHINE(ms);

    int i;

    unsigned int max_cpus = ms->smp.max_cpus;



    if (ms->possible_cpus) {

        /*
@@ -2746,7 +2752,7 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) 
        ms->possible_cpus->cpus[i].vcpus_count = 1;

        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->smp.cores, ms->smp.threads, &topo);

        ms->possible_cpus->cpus[i].props.has_socket_id = true;

        ms->possible_cpus->cpus[i].props.socket_id = topo.pkg_id;

        ms->possible_cpus->cpus[i].props.has_core_id = true;

hw/i386/xen/xen-hvm.c

+4 −0
Original line number Diff line number Diff line
@@ -756,6 +756,8 @@ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu) 
/* retval--the number of ioreq packet */

static ioreq_t *cpu_get_ioreq(XenIOState *state)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    unsigned int max_cpus = ms->smp.max_cpus;

    int i;

    evtchn_port_t port;
@@ -1383,6 +1385,8 @@ static int xen_map_ioreq_server(XenIOState *state) 


void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)

{

    MachineState *ms = MACHINE(pcms);

    unsigned int max_cpus = ms->smp.max_cpus;

    int i, rc;

    xen_pfn_t ioreq_pfn;

    XenIOState *state;

target/i386/cpu.c

+3 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "hw/hw.h"

#include "hw/xen/xen.h"

#include "hw/i386/apic_internal.h"

#include "hw/boards.h"

#endif



#include "disas/capstone.h"
@@ -5384,9 +5385,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) 
    }



#ifndef CONFIG_USER_ONLY

    MachineState *ms = MACHINE(qdev_get_machine());

    qemu_register_reset(x86_cpu_machine_reset_cb, cpu);



    if (cpu->env.features[FEAT_1_EDX] & CPUID_APIC || smp_cpus > 1) {

    if (cpu->env.features[FEAT_1_EDX] & CPUID_APIC || ms->smp.cpus > 1) {

        x86_cpu_apic_create(cpu, &local_err);

        if (local_err != NULL) {

            goto out;