pc: Parse CPU features only once

[qemu.git] / qom / cpu.c

diff --git a/qom/cpu.c b/qom/cpu.c
index 108bfa205a21fabddce3f1e0f9121d533b15541d..a9727a1e64ea2dd9c3ce505ac943b0f6497bcc0c 100644 (file)
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -18,13 +18,17 @@
  * <http://www.gnu.org/licenses/gpl-2.0.html>
  */
 
  * <http://www.gnu.org/licenses/gpl-2.0.html>
  */
 

+#include "qemu/osdep.h"
+#include "qapi/error.h"

 #include "qemu-common.h"
 #include "qom/cpu.h"
 #include "sysemu/kvm.h"
 #include "qemu/notify.h"
 #include "qemu/log.h"
 #include "qemu-common.h"
 #include "qom/cpu.h"
 #include "sysemu/kvm.h"
 #include "qemu/notify.h"
 #include "qemu/log.h"

+#include "exec/log.h"

 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"

+#include "hw/qdev-properties.h"

 
 bool cpu_exists(int64_t id)
 {
 
 bool cpu_exists(int64_t id)
 {


@@ -43,7 +47,7 @@ bool cpu_exists(int64_t id)
 CPUState *cpu_generic_init(const char *typename, const char *cpu_model)
 {
     char *str, *name, *featurestr;
 CPUState *cpu_generic_init(const char *typename, const char *cpu_model)
 {
     char *str, *name, *featurestr;

-    CPUState *cpu;
+    CPUState *cpu = NULL;

     ObjectClass *oc;
     CPUClass *cc;
     Error *err = NULL;
     ObjectClass *oc;
     CPUClass *cc;
     Error *err = NULL;


@@ -57,16 +61,18 @@ CPUState *cpu_generic_init(const char *typename, const char *cpu_model)
         return NULL;
     }
 
         return NULL;
     }
 

-    cpu = CPU(object_new(object_class_get_name(oc)));
-    cc = CPU_GET_CLASS(cpu);
-
+    cc = CPU_CLASS(oc);

     featurestr = strtok(NULL, ",");
     featurestr = strtok(NULL, ",");

-    cc->parse_features(cpu, featurestr, &err);
+    /* TODO: all callers of cpu_generic_init() need to be converted to
+     * call parse_features() only once, before calling cpu_generic_init().
+     */
+    cc->parse_features(object_class_get_name(oc), featurestr, &err);

     g_free(str);
     if (err != NULL) {
         goto out;
     }
 
     g_free(str);
     if (err != NULL) {
         goto out;
     }
 

+    cpu = CPU(object_new(object_class_get_name(oc)));

     object_property_set_bool(OBJECT(cpu), true, "realized", &err);
 
 out:
     object_property_set_bool(OBJECT(cpu), true, "realized", &err);
 
 out:


@@ -114,6 +120,8 @@ void cpu_reset_interrupt(CPUState *cpu, int mask)
 void cpu_exit(CPUState *cpu)
 {
     cpu->exit_request = 1;
 void cpu_exit(CPUState *cpu)
 {
     cpu->exit_request = 1;

+    /* Ensure cpu_exec will see the exit request after TCG has exited.  */
+    smp_wmb();

     cpu->tcg_exit_req = 1;
 }
 
     cpu->tcg_exit_req = 1;
 }
 


@@ -128,7 +136,7 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
 static int cpu_common_write_elf32_qemunote(WriteCoreDumpFunction f,
                                            CPUState *cpu, void *opaque)
 {
 static int cpu_common_write_elf32_qemunote(WriteCoreDumpFunction f,
                                            CPUState *cpu, void *opaque)
 {

-    return -1;
+    return 0;

 }
 
 int cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cpu,
 }
 
 int cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cpu,


@@ -157,7 +165,7 @@ int cpu_write_elf64_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
 static int cpu_common_write_elf64_qemunote(WriteCoreDumpFunction f,
                                            CPUState *cpu, void *opaque)
 {
 static int cpu_common_write_elf64_qemunote(WriteCoreDumpFunction f,
                                            CPUState *cpu, void *opaque)
 {

-    return -1;
+    return 0;

 }
 
 int cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cpu,
 }
 
 int cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cpu,


@@ -186,6 +194,14 @@ static int cpu_common_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg)
     return 0;
 }
 
     return 0;
 }
 

+static bool cpu_common_debug_check_watchpoint(CPUState *cpu, CPUWatchpoint *wp)
+{
+    /* If no extra check is required, QEMU watchpoint match can be considered
+     * as an architectural match.
+     */
+    return true;
+}
+

 bool target_words_bigendian(void);
 static bool cpu_common_virtio_is_big_endian(CPUState *cpu)
 {
 bool target_words_bigendian(void);
 static bool cpu_common_virtio_is_big_endian(CPUState *cpu)
 {


@@ -241,14 +257,14 @@ static void cpu_common_reset(CPUState *cpu)
     }
 
     cpu->interrupt_request = 0;
     }
 
     cpu->interrupt_request = 0;

-    cpu->current_tb = NULL;

     cpu->halted = 0;
     cpu->mem_io_pc = 0;
     cpu->mem_io_vaddr = 0;
     cpu->icount_extra = 0;
     cpu->icount_decr.u32 = 0;
     cpu->halted = 0;
     cpu->mem_io_pc = 0;
     cpu->mem_io_vaddr = 0;
     cpu->icount_extra = 0;
     cpu->icount_decr.u32 = 0;

-    cpu->can_do_io = 0;
+    cpu->can_do_io = 1;

     cpu->exception_index = -1;
     cpu->exception_index = -1;

+    cpu->crash_occurred = false;

     memset(cpu->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof(void *));
 }
 
     memset(cpu->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof(void *));
 }
 


@@ -269,25 +285,37 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model)
     return NULL;
 }
 
     return NULL;
 }
 

-static void cpu_common_parse_features(CPUState *cpu, char *features,
+static void cpu_common_parse_features(const char *typename, char *features,

                                       Error **errp)
 {
     char *featurestr; /* Single "key=value" string being parsed */
     char *val;
                                       Error **errp)
 {
     char *featurestr; /* Single "key=value" string being parsed */
     char *val;

-    Error *err = NULL;
+    static bool cpu_globals_initialized;
+
+    /* TODO: all callers of ->parse_features() need to be changed to
+     * call it only once, so we can remove this check (or change it
+     * to assert(!cpu_globals_initialized).
+     * Current callers of ->parse_features() are:
+     * - cpu_generic_init()
+     */
+    if (cpu_globals_initialized) {
+        return;
+    }
+    cpu_globals_initialized = true;

 
     featurestr = features ? strtok(features, ",") : NULL;
 
     while (featurestr) {
         val = strchr(featurestr, '=');
         if (val) {
 
     featurestr = features ? strtok(features, ",") : NULL;
 
     while (featurestr) {
         val = strchr(featurestr, '=');
         if (val) {

+            GlobalProperty *prop = g_new0(typeof(*prop), 1);

             *val = 0;
             val++;
             *val = 0;
             val++;

-            object_property_parse(OBJECT(cpu), val, featurestr, &err);
-            if (err) {
-                error_propagate(errp, err);
-                return;
-            }
+            prop->driver = typename;
+            prop->property = g_strdup(featurestr);
+            prop->value = g_strdup(val);
+            prop->errp = &error_fatal;
+            qdev_prop_register_global(prop);

         } else {
             error_setg(errp, "Expected key=value format, found %s.",
                        featurestr);
         } else {
             error_setg(errp, "Expected key=value format, found %s.",
                        featurestr);


@@ -312,7 +340,16 @@ static void cpu_common_initfn(Object *obj)
     CPUState *cpu = CPU(obj);
     CPUClass *cc = CPU_GET_CLASS(obj);
 
     CPUState *cpu = CPU(obj);
     CPUClass *cc = CPU_GET_CLASS(obj);
 

+    cpu->cpu_index = -1;

     cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs;
     cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs;

+    qemu_mutex_init(&cpu->work_mutex);
+    QTAILQ_INIT(&cpu->breakpoints);
+    QTAILQ_INIT(&cpu->watchpoints);
+}
+
+static void cpu_common_finalize(Object *obj)
+{
+    cpu_exec_exit(CPU(obj));

 }
 
 static int64_t cpu_common_get_arch_id(CPUState *cpu)
 }
 
 static int64_t cpu_common_get_arch_id(CPUState *cpu)


@@ -340,6 +377,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)
     k->gdb_write_register = cpu_common_gdb_write_register;
     k->virtio_is_big_endian = cpu_common_virtio_is_big_endian;
     k->debug_excp_handler = cpu_common_noop;
     k->gdb_write_register = cpu_common_gdb_write_register;
     k->virtio_is_big_endian = cpu_common_virtio_is_big_endian;
     k->debug_excp_handler = cpu_common_noop;

+    k->debug_check_watchpoint = cpu_common_debug_check_watchpoint;

     k->cpu_exec_enter = cpu_common_noop;
     k->cpu_exec_exit = cpu_common_noop;
     k->cpu_exec_interrupt = cpu_common_exec_interrupt;
     k->cpu_exec_enter = cpu_common_noop;
     k->cpu_exec_exit = cpu_common_noop;
     k->cpu_exec_interrupt = cpu_common_exec_interrupt;


@@ -356,6 +394,7 @@ static const TypeInfo cpu_type_info = {
     .parent = TYPE_DEVICE,
     .instance_size = sizeof(CPUState),
     .instance_init = cpu_common_initfn,
     .parent = TYPE_DEVICE,
     .instance_size = sizeof(CPUState),
     .instance_init = cpu_common_initfn,

+    .instance_finalize = cpu_common_finalize,

     .abstract = true,
     .class_size = sizeof(CPUClass),
     .class_init = cpu_class_init,
     .abstract = true,
     .class_size = sizeof(CPUClass),
     .class_init = cpu_class_init,