Commit 5cc8767d authored by Like Xu's avatar Like Xu Committed by Eduardo Habkost
Browse files

general: Replace global smp variables with smp machine properties 



Basically, the context could get the MachineState reference via call
chains or unrecommended qdev_get_machine() in !CONFIG_USER_ONLY mode.

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

Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-Id: <20190518205428.90532-4-like.xu@linux.intel.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent a0628599

accel/kvm/kvm-all.c

+2 −2
Original line number Diff line number Diff line
@@ -1542,8 +1542,8 @@ static int kvm_init(MachineState *ms) 
        const char *name;

        int num;

    } num_cpus[] = {

        { "SMP",          smp_cpus },

        { "hotpluggable", max_cpus },

        { "SMP",          ms->smp.cpus },

        { "hotpluggable", ms->smp.max_cpus },

        { NULL, }

    }, *nc = num_cpus;

    int soft_vcpus_limit, hard_vcpus_limit;

backends/hostmem.c

+4 −2
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static void host_memory_backend_set_prealloc(Object *obj, bool value, 
{

    Error *local_err = NULL;

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    MachineState *ms = MACHINE(qdev_get_machine());



    if (backend->force_prealloc) {

        if (value) {
@@ -241,7 +242,7 @@ static void host_memory_backend_set_prealloc(Object *obj, bool value, 
        void *ptr = memory_region_get_ram_ptr(&backend->mr);

        uint64_t sz = memory_region_size(&backend->mr);



        os_mem_prealloc(fd, ptr, sz, smp_cpus, &local_err);

        os_mem_prealloc(fd, ptr, sz, ms->smp.cpus, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;
@@ -311,6 +312,7 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) 
{

    HostMemoryBackend *backend = MEMORY_BACKEND(uc);

    HostMemoryBackendClass *bc = MEMORY_BACKEND_GET_CLASS(uc);

    MachineState *ms = MACHINE(qdev_get_machine());

    Error *local_err = NULL;

    void *ptr;

    uint64_t sz;
@@ -375,7 +377,7 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) 
         */

        if (backend->prealloc) {

            os_mem_prealloc(memory_region_get_fd(&backend->mr), ptr, sz,

                            smp_cpus, &local_err);

                            ms->smp.cpus, &local_err);

            if (local_err) {

                goto out;

            }

cpus.c

+5 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include "tcg.h"

#include "hw/nmi.h"

#include "sysemu/replay.h"

#include "hw/boards.h"



#ifdef CONFIG_LINUX
@@ -2075,8 +2076,10 @@ static void qemu_dummy_start_vcpu(CPUState *cpu) 


void qemu_init_vcpu(CPUState *cpu)

{

    cpu->nr_cores = smp_cores;

    cpu->nr_threads = smp_threads;

    MachineState *ms = MACHINE(qdev_get_machine());



    cpu->nr_cores = ms->smp.cores;

    cpu->nr_threads =  ms->smp.threads;

    cpu->stopped = true;

    cpu->random_seed = qemu_guest_random_seed_thread_part1();

exec.c

+2 −1
Original line number Diff line number Diff line
@@ -1874,6 +1874,7 @@ static void *file_ram_alloc(RAMBlock *block, 
                            bool truncate,

                            Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    void *area;



    block->page_size = qemu_fd_getpagesize(fd);
@@ -1930,7 +1931,7 @@ static void *file_ram_alloc(RAMBlock *block, 
    }



    if (mem_prealloc) {

        os_mem_prealloc(fd, area, memory, smp_cpus, errp);

        os_mem_prealloc(fd, area, memory, ms->smp.cpus, errp);

        if (errp && *errp) {

            qemu_ram_munmap(fd, area, memory);

            return NULL;

gdbstub.c

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

#include "exec/gdbstub.h"

#include "hw/cpu/cluster.h"

#include "hw/boards.h"

#endif



#define MAX_PACKET_LENGTH 4096
@@ -1171,6 +1172,9 @@ static int gdb_handle_vcont(GDBState *s, const char *p) 
    CPU_FOREACH(cpu) {

        max_cpus = max_cpus <= cpu->cpu_index ? cpu->cpu_index + 1 : max_cpus;

    }

#else

    MachineState *ms = MACHINE(qdev_get_machine());

    unsigned int max_cpus = ms->smp.max_cpus;

#endif

    /* uninitialised CPUs stay 0 */

    newstates = g_new0(char, max_cpus);