qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-riscv@nongnu.org, "Eduardo Habkost" <ehabkost@redhat.com>,
	"Sagar Karandikar" <sagark@eecs.berkeley.edu>,
	"David Hildenbrand" <david@redhat.com>,
	"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Laurent Vivier" <laurent@vivier.eu>,
	qemu-s390x@nongnu.org,
	"Alistair Francis" <Alistair.Francis@wdc.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Palmer Dabbelt" <palmer@dabbelt.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v4 10/13] target/i386: Restrict CpuClass::get_crash_info() to system-mode
Date: Fri, 22 May 2020 19:25:07 +0200	[thread overview]
Message-ID: <20200522172510.25784-11-philmd@redhat.com> (raw)
In-Reply-To: <20200522172510.25784-1-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>
---
 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 7a4a8e3847..dd31c1de5f 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.21.3



  parent reply	other threads:[~2020-05-22 17:33 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-22 17:24 [PATCH v4 00/13] user-mode: Prune build dependencies (part 1) Philippe Mathieu-Daudé
2020-05-22 17:24 ` [PATCH v4 01/13] Makefile: Only build virtiofsd if system-mode is enabled Philippe Mathieu-Daudé
2020-05-22 17:24 ` [PATCH v4 02/13] configure: Avoid building TCG when not needed Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 03/13] tests/Makefile: Only display TCG-related tests when TCG is available Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 04/13] tests/Makefile: Restrict some softmmu-only tests Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 05/13] util/Makefile: Reduce the user-mode object list Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 06/13] stubs/Makefile: " Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 07/13] target/riscv/cpu: Restrict CPU migration to system-mode Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 08/13] exec: Assert CPU migration is not used on user-only build Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 09/13] arch_init: Remove unused 'qapi-commands-misc.h' include Philippe Mathieu-Daudé
2020-05-22 17:25 ` Philippe Mathieu-Daudé [this message]
2020-05-22 17:25 ` [PATCH v4 11/13] target/s390x: Restrict CpuClass::get_crash_info() to system-mode Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 12/13] hw/core: " Philippe Mathieu-Daudé
2020-05-22 17:25 ` [PATCH v4 13/13] stubs: Restrict ui/win32-kbd-hook " Philippe Mathieu-Daudé
2020-06-01 23:01   ` Richard Henderson
2020-06-02 14:46 ` [PATCH v4 00/13] user-mode: Prune build dependencies (part 1) Philippe Mathieu-Daudé
2020-06-02 15:55   ` Laurent Vivier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200522172510.25784-11-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=Alistair.Francis@wdc.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=kbastian@mail.uni-paderborn.de \
    --cc=laurent@vivier.eu \
    --cc=palmer@dabbelt.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=rth@twiddle.net \
    --cc=sagark@eecs.berkeley.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).