| Message ID | 20190108163008.7006-5-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tcg: support heterogenous CPU clusters | expand |
On 1/8/19 5:30 PM, Peter Maydell wrote: > 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. Aah better :-) > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Luc Michel <luc.michel@greensocs.com> > --- > gdbstub.c | 48 +++++------------------------------------------- > 1 file changed, 5 insertions(+), 43 deletions(-) > > diff --git a/gdbstub.c b/gdbstub.c > index bfc7afb5096..5d6cbea9d35 100644 > --- a/gdbstub.c > +++ b/gdbstub.c > @@ -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 */ > - return s->processes[s->process_num - 1].pid; > -#endif > + if (cpu->cluster_index == UNASSIGNED_CLUSTER_INDEX) { > + /* Return the default process' PID */ > + return s->processes[s->process_num - 1].pid; > + } > + return cpu->cluster_index + 1; > } > > static GDBProcess *gdb_get_process(const GDBState *s, uint32_t pid) >
diff --git a/gdbstub.c b/gdbstub.c index bfc7afb5096..5d6cbea9d35 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -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 */ - return s->processes[s->process_num - 1].pid; -#endif + if (cpu->cluster_index == UNASSIGNED_CLUSTER_INDEX) { + /* Return the default process' PID */ + return s->processes[s->process_num - 1].pid; + } + return cpu->cluster_index + 1; } static GDBProcess *gdb_get_process(const GDBState *s, uint32_t pid)
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: Peter Maydell <peter.maydell@linaro.org> --- gdbstub.c | 48 +++++------------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) -- 2.19.2