From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 18/19] hw/core: Restrict CpuClass::get_crash_info() to system-mode
Date: Fri, 5 Jun 2020 13:46:59 +0200 [thread overview]
Message-ID: <20200605114700.1052050-19-laurent@vivier.eu> (raw)
In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu>
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-13-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/core/cpu.c | 2 ++
include/hw/core/cpu.h | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/core/cpu.c b/hw/core/cpu.c
index 5284d384fb6b..f31ec48ee61e 100644
--- a/hw/core/cpu.c
+++ b/hw/core/cpu.c
@@ -209,6 +209,7 @@ static bool cpu_common_exec_interrupt(CPUState *cpu, int int_req)
return false;
}
+#if !defined(CONFIG_USER_ONLY)
GuestPanicInformation *cpu_get_crash_info(CPUState *cpu)
{
CPUClass *cc = CPU_GET_CLASS(cpu);
@@ -219,6 +220,7 @@ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu)
}
return res;
}
+#endif
void cpu_dump_state(CPUState *cpu, FILE *f, int flags)
{
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 07f769815502..497600c49efa 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -490,6 +490,8 @@ bool cpu_paging_enabled(const CPUState *cpu);
void cpu_get_memory_mapping(CPUState *cpu, MemoryMappingList *list,
Error **errp);
+#if !defined(CONFIG_USER_ONLY)
+
/**
* cpu_write_elf64_note:
* @f: pointer to a function that writes memory to a file
@@ -539,6 +541,8 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
*/
GuestPanicInformation *cpu_get_crash_info(CPUState *cpu);
+#endif /* !CONFIG_USER_ONLY */
+
/**
* CPUDumpFlags:
* @CPU_DUMP_CODE:
@@ -632,7 +636,8 @@ static inline int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs)
}
return ret;
}
-#endif
+
+#endif /* CONFIG_USER_ONLY */
/**
* cpu_list_add:
--
2.26.2
next prev parent reply other threads:[~2020-06-05 11:52 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 11:46 [PULL 00/19] Linux user for 5.1 patches Laurent Vivier
2020-06-05 11:46 ` [PULL 01/19] linux-user, alpha: fix oldumount syscall Laurent Vivier
2020-06-05 11:46 ` [PULL 02/19] linux-user: return target error codes for socket() and prctl() Laurent Vivier
2020-06-05 11:46 ` [PULL 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform Laurent Vivier
2020-06-05 11:46 ` [PULL 04/19] linux-user/strace.list: fix epoll_create{, 1} -strace output Laurent Vivier
2020-06-05 11:46 ` [PULL 05/19] linux-user/mmap.c: fix integer underflow in target_mremap Laurent Vivier
2020-06-05 11:46 ` [PULL 06/19] linux-user: implement OFD locks Laurent Vivier
2020-06-05 11:46 ` [PULL 07/19] Makefile: Only build virtiofsd if system-mode is enabled Laurent Vivier
2020-06-05 11:46 ` [PULL 08/19] configure: Avoid building TCG when not needed Laurent Vivier
2020-06-05 11:46 ` [PULL 09/19] tests/Makefile: Only display TCG-related tests when TCG is available Laurent Vivier
2020-06-05 11:46 ` [PULL 10/19] tests/Makefile: Restrict some softmmu-only tests Laurent Vivier
2020-06-05 11:46 ` [PULL 11/19] util/Makefile: Reduce the user-mode object list Laurent Vivier
2020-06-05 11:46 ` [PULL 12/19] stubs/Makefile: " Laurent Vivier
2020-06-05 11:46 ` [PULL 13/19] target/riscv/cpu: Restrict CPU migration to system-mode Laurent Vivier
2020-06-05 11:46 ` [PULL 14/19] exec: Assert CPU migration is not used on user-only build Laurent Vivier
2020-06-05 11:46 ` [PULL 15/19] arch_init: Remove unused 'qapi-commands-misc.h' include Laurent Vivier
2020-06-05 11:46 ` [PULL 16/19] target/i386: Restrict CpuClass::get_crash_info() to system-mode Laurent Vivier
2020-06-05 11:46 ` [PULL 17/19] target/s390x: " Laurent Vivier
2020-06-05 11:46 ` Laurent Vivier [this message]
2020-06-05 11:47 ` [PULL 19/19] stubs: Restrict ui/win32-kbd-hook " Laurent Vivier
2020-06-05 16:45 ` [PULL 00/19] Linux user for 5.1 patches Peter Maydell
2020-06-05 19:20 ` Laurent Vivier
2020-06-05 20:32 ` Peter Maydell
2020-06-05 21:48 ` Richard Henderson
2020-06-08 5:05 ` Thomas Huth
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=20200605114700.1052050-19-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/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).