From 7c39163e389e6e6e16965606fb5a26abcdb6ad73 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Mon, 27 Apr 2015 17:00:32 -0300 Subject: [PATCH] cpu: Initialize breakpoint/watchpoint lists in cpu_common_initfn() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One small step in the simplification of cpu_exec_init(). Reviewed-by: Igor Mammedov Signed-off-by: Eduardo Habkost Signed-off-by: Andreas Färber --- exec.c | 2 -- qom/cpu.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 44bebe9ee1..e2caee98b6 100644 --- a/exec.c +++ b/exec.c @@ -541,8 +541,6 @@ void cpu_exec_init(CPUArchState *env) cpu_index++; } cpu->cpu_index = cpu_index; - QTAILQ_INIT(&cpu->breakpoints); - QTAILQ_INIT(&cpu->watchpoints); #ifndef CONFIG_USER_ONLY cpu->as = &address_space_memory; cpu->thread_id = qemu_get_thread_id(); diff --git a/qom/cpu.c b/qom/cpu.c index 108bfa205a..56c53a809f 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -313,6 +313,8 @@ static void cpu_common_initfn(Object *obj) CPUClass *cc = CPU_GET_CLASS(obj); cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs; + QTAILQ_INIT(&cpu->breakpoints); + QTAILQ_INIT(&cpu->watchpoints); } static int64_t cpu_common_get_arch_id(CPUState *cpu)