Commit 267f685b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

cpus-common: move CPU list management to common code 



Add a mutex for the CPU list to system emulation, as it will be used to
manage safe work.  Abstract manipulation of the CPU list in new functions
cpu_list_add and cpu_list_remove.

Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 178f9429

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ endif 


#######################################################################

# Target-independent parts used in system and user emulation

common-obj-y += tcg-runtime.o

common-obj-y += tcg-runtime.o cpus-common.o

common-obj-y += hw/

common-obj-y += qom/

common-obj-y += disas/

bsd-user/main.c

+1 −8
Original line number Diff line number Diff line
@@ -95,14 +95,6 @@ void fork_end(int child) 
    }

}



void cpu_list_lock(void)

{

}



void cpu_list_unlock(void)

{

}



#ifdef TARGET_I386

/***********************************************************/

/* CPUX86 core interface */
@@ -748,6 +740,7 @@ int main(int argc, char **argv) 
    if (argc <= 1)

        usage();



    qemu_init_cpu_list();

    module_call_init(MODULE_INIT_QOM);



    if ((envlist = envlist_create()) == NULL) {

cpus-common.c

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/*

 * CPU thread main loop - common bits for user and system mode emulation

 *

 *  Copyright (c) 2003-2005 Fabrice Bellard

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */



#include "qemu/osdep.h"

#include "exec/cpu-common.h"

#include "qom/cpu.h"

#include "sysemu/cpus.h"



static QemuMutex qemu_cpu_list_lock;



void qemu_init_cpu_list(void)

{

    qemu_mutex_init(&qemu_cpu_list_lock);

}



void cpu_list_lock(void)

{

    qemu_mutex_lock(&qemu_cpu_list_lock);

}



void cpu_list_unlock(void)

{

    qemu_mutex_unlock(&qemu_cpu_list_lock);

}



static bool cpu_index_auto_assigned;



static int cpu_get_free_index(void)

{

    CPUState *some_cpu;

    int cpu_index = 0;



    cpu_index_auto_assigned = true;

    CPU_FOREACH(some_cpu) {

        cpu_index++;

    }

    return cpu_index;

}



void cpu_list_add(CPUState *cpu)

{

    qemu_mutex_lock(&qemu_cpu_list_lock);

    if (cpu->cpu_index == UNASSIGNED_CPU_INDEX) {

        cpu->cpu_index = cpu_get_free_index();

        assert(cpu->cpu_index != UNASSIGNED_CPU_INDEX);

    } else {

        assert(!cpu_index_auto_assigned);

    }

    QTAILQ_INSERT_TAIL(&cpus, cpu, node);

    qemu_mutex_unlock(&qemu_cpu_list_lock);

}



void cpu_list_remove(CPUState *cpu)

{

    qemu_mutex_lock(&qemu_cpu_list_lock);

    if (!QTAILQ_IN_USE(cpu, node)) {

        /* there is nothing to undo since cpu_exec_init() hasn't been called */

        qemu_mutex_unlock(&qemu_cpu_list_lock);

        return;

    }



    assert(!(cpu_index_auto_assigned && cpu != QTAILQ_LAST(&cpus, CPUTailQ)));



    QTAILQ_REMOVE(&cpus, cpu, node);

    cpu->cpu_index = UNASSIGNED_CPU_INDEX;

    qemu_mutex_unlock(&qemu_cpu_list_lock);

}

exec.c

+2 −35
Original line number Diff line number Diff line
@@ -598,36 +598,11 @@ AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx) 
}

#endif



static bool cpu_index_auto_assigned;



static int cpu_get_free_index(void)

{

    CPUState *some_cpu;

    int cpu_index = 0;



    cpu_index_auto_assigned = true;

    CPU_FOREACH(some_cpu) {

        cpu_index++;

    }

    return cpu_index;

}



void cpu_exec_exit(CPUState *cpu)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);



    cpu_list_lock();

    if (!QTAILQ_IN_USE(cpu, node)) {

        /* there is nothing to undo since cpu_exec_init() hasn't been called */

        cpu_list_unlock();

        return;

    }



    assert(!(cpu_index_auto_assigned && cpu != QTAILQ_LAST(&cpus, CPUTailQ)));



    QTAILQ_REMOVE(&cpus, cpu, node);

    cpu->cpu_index = UNASSIGNED_CPU_INDEX;

    cpu_list_unlock();

    cpu_list_remove(cpu);



    if (cc->vmsd != NULL) {

        vmstate_unregister(NULL, cc->vmsd, cpu);
@@ -663,15 +638,7 @@ void cpu_exec_init(CPUState *cpu, Error **errp) 
    object_ref(OBJECT(cpu->memory));

#endif



    cpu_list_lock();

    if (cpu->cpu_index == UNASSIGNED_CPU_INDEX) {

        cpu->cpu_index = cpu_get_free_index();

        assert(cpu->cpu_index != UNASSIGNED_CPU_INDEX);

    } else {

        assert(!cpu_index_auto_assigned);

    }

    QTAILQ_INSERT_TAIL(&cpus, cpu, node);

    cpu_list_unlock();

    cpu_list_add(cpu);



#ifndef CONFIG_USER_ONLY

    if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {

include/exec/cpu-common.h

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ typedef struct CPUListState { 
    FILE *file;

} CPUListState;



/* The CPU list lock nests outside tb_lock/tb_unlock.  */

void qemu_init_cpu_list(void);

void cpu_list_lock(void);

void cpu_list_unlock(void);



#if !defined(CONFIG_USER_ONLY)



enum device_endian {