Commit 46f5abc0 authored by Peter Maydell's avatar Peter Maydell
Browse files

gdbstub: Simplify gdb_get_cpu_pid() to use cpu->cluster_index 



Now we're keeping the cluster index in the CPUState, we don't
need to jump through hoops in gdb_get_cpu_pid() to find the
associated cluster object.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarLuc Michel <luc.michel@greensocs.com>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 20190121152218.9592-5-peter.maydell@linaro.org
parent f7b78602

gdbstub.c

+4 −42
Original line number Diff line number Diff line
@@ -644,50 +644,12 @@ static int memtox(char *buf, const char *mem, int len) 


static uint32_t gdb_get_cpu_pid(const GDBState *s, CPUState *cpu)

{

#ifndef CONFIG_USER_ONLY

    gchar *path, *name = NULL;

    Object *obj;

    CPUClusterState *cluster;

    uint32_t ret;



    path = object_get_canonical_path(OBJECT(cpu));



    if (path == NULL) {

        /* Return the default process' PID */

        ret = s->processes[s->process_num - 1].pid;

        goto out;

    }



    name = object_get_canonical_path_component(OBJECT(cpu));

    assert(name != NULL);



    /*

     * Retrieve the CPU parent path by removing the last '/' and the CPU name

     * from the CPU canonical path.

     */

    path[strlen(path) - strlen(name) - 1] = '\0';



    obj = object_resolve_path_type(path, TYPE_CPU_CLUSTER, NULL);



    if (obj == NULL) {

        /* Return the default process' PID */

        ret = s->processes[s->process_num - 1].pid;

        goto out;

    }



    cluster = CPU_CLUSTER(obj);

    ret = cluster->cluster_id + 1;



out:

    g_free(name);

    g_free(path);



    return ret;



#else

    /* TODO: In user mode, we should use the task state PID */

    if (cpu->cluster_index == UNASSIGNED_CLUSTER_INDEX) {

        /* Return the default process' PID */

        return s->processes[s->process_num - 1].pid;

#endif

    }

    return cpu->cluster_index + 1;

}



static GDBProcess *gdb_get_process(const GDBState *s, uint32_t pid)