Commit b75c9900 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Laurent Vivier
Browse files

target/i386: Restrict CpuClass::get_crash_info() to system-mode 



Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Tested-by: default avatarLaurent Vivier <laurent@vivier.eu>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200522172510.25784-11-philmd@redhat.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 32f5b7e5

target/i386/cpu.c

+5 −1
Original line number Diff line number Diff line
@@ -6843,6 +6843,7 @@ static void x86_cpu_register_feature_bit_props(X86CPU *cpu, 
    x86_cpu_register_bit_prop(cpu, name, w, bitnr);

}



#if !defined(CONFIG_USER_ONLY)

static GuestPanicInformation *x86_cpu_get_crash_info(CPUState *cs)

{

    X86CPU *cpu = X86_CPU(cs);
@@ -6886,6 +6887,7 @@ static void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v, 
                                     errp);

    qapi_free_GuestPanicInformation(panic_info);

}

#endif /* !CONFIG_USER_ONLY */



static void x86_cpu_initfn(Object *obj)

{
@@ -6932,8 +6934,10 @@ static void x86_cpu_initfn(Object *obj) 
                        x86_cpu_get_unavailable_features,

                        NULL, NULL, NULL);



#if !defined(CONFIG_USER_ONLY)

    object_property_add(obj, "crash-information", "GuestPanicInformation",

                        x86_cpu_get_crash_info_qom, NULL, NULL, NULL);

#endif



    for (w = 0; w < FEATURE_WORDS; w++) {

        int bitnr;
@@ -7245,7 +7249,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) 
    cc->cpu_exec_interrupt = x86_cpu_exec_interrupt;

#endif

    cc->dump_state = x86_cpu_dump_state;

    cc->get_crash_info = x86_cpu_get_crash_info;

    cc->set_pc = x86_cpu_set_pc;

    cc->synchronize_from_tb = x86_cpu_synchronize_from_tb;

    cc->gdb_read_register = x86_cpu_gdb_read_register;
@@ -7256,6 +7259,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) 
    cc->asidx_from_attrs = x86_asidx_from_attrs;

    cc->get_memory_mapping = x86_cpu_get_memory_mapping;

    cc->get_phys_page_attrs_debug = x86_cpu_get_phys_page_attrs_debug;

    cc->get_crash_info = x86_cpu_get_crash_info;

    cc->write_elf64_note = x86_cpu_write_elf64_note;

    cc->write_elf64_qemunote = x86_cpu_write_elf64_qemunote;

    cc->write_elf32_note = x86_cpu_write_elf32_note;