[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 16/19] target/i386: Restrict CpuClass::get_crash_info() to syst
From: |
Laurent Vivier |
Subject: |
[PULL v2 16/19] target/i386: Restrict CpuClass::get_crash_info() to system-mode |
Date: |
Sat, 6 Jun 2020 15:16:04 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Tested-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200522172510.25784-11-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/i386/cpu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 7a4a8e3847f0..dd31c1de5f2b 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -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;
--
2.26.2
- Re: [PULL v2 00/19] Linux user for 5.1 patches, (continued)
- Re: [PULL v2 00/19] Linux user for 5.1 patches, Laurent Vivier, 2020/06/06
- [PULL v2 00/19] Linux user for 5.1 patches, Laurent Vivier, 2020/06/06
- [PULL v2 01/19] linux-user, alpha: fix oldumount syscall, Laurent Vivier, 2020/06/06
- [PULL v2 02/19] linux-user: return target error codes for socket() and prctl(), Laurent Vivier, 2020/06/06
- [PULL v2 07/19] Makefile: Only build virtiofsd if system-mode is enabled, Laurent Vivier, 2020/06/06
- [PULL v2 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform, Laurent Vivier, 2020/06/06
- [PULL v2 05/19] linux-user/mmap.c: fix integer underflow in target_mremap, Laurent Vivier, 2020/06/06
- [PULL v2 12/19] stubs/Makefile: Reduce the user-mode object list, Laurent Vivier, 2020/06/06
- [PULL v2 11/19] util/Makefile: Reduce the user-mode object list, Laurent Vivier, 2020/06/06
- [PULL v2 16/19] target/i386: Restrict CpuClass::get_crash_info() to system-mode,
Laurent Vivier <=
- [PULL v2 04/19] linux-user/strace.list: fix epoll_create{, 1} -strace output, Laurent Vivier, 2020/06/06
- [PULL v2 06/19] linux-user: implement OFD locks, Laurent Vivier, 2020/06/06
- [PULL v2 18/19] hw/core: Restrict CpuClass::get_crash_info() to system-mode, Laurent Vivier, 2020/06/06
- [PULL v2 10/19] tests/Makefile: Restrict some softmmu-only tests, Laurent Vivier, 2020/06/06
- [PULL v2 17/19] target/s390x: Restrict CpuClass::get_crash_info() to system-mode, Laurent Vivier, 2020/06/06
- [PULL v2 08/19] configure: Avoid building TCG when not needed, Laurent Vivier, 2020/06/06
- [PULL v2 09/19] tests/Makefile: Only display TCG-related tests when TCG is available, Laurent Vivier, 2020/06/06
- [PULL v2 15/19] arch_init: Remove unused 'qapi-commands-misc.h' include, Laurent Vivier, 2020/06/06
- [PULL v2 19/19] stubs: Restrict ui/win32-kbd-hook to system-mode, Laurent Vivier, 2020/06/06
- [PULL v2 13/19] target/riscv/cpu: Restrict CPU migration to system-mode, Laurent Vivier, 2020/06/06