From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
Claudio Fontana <cfontana@suse.de>
Subject: [PULL 11/37] cpus: remove checks for non-NULL cpus_accel
Date: Tue, 6 Oct 2020 09:29:21 +0200 [thread overview]
Message-ID: <20201006072947.487729-12-pbonzini@redhat.com> (raw)
In-Reply-To: <20201006072947.487729-1-pbonzini@redhat.com>
From: Claudio Fontana <cfontana@suse.de>
now that all accelerators support the CpusAccel interface,
we can remove most checks for non-NULL cpus_accel,
we just add a sanity check/assert at vcpu creation.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/cpus.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index 1180103ede..99f418437b 100644
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -166,34 +166,46 @@ void cpu_synchronize_all_pre_loadvm(void)
void cpu_synchronize_state(CPUState *cpu)
{
- if (cpus_accel && cpus_accel->synchronize_state) {
+ if (cpus_accel->synchronize_state) {
cpus_accel->synchronize_state(cpu);
}
}
void cpu_synchronize_post_reset(CPUState *cpu)
{
- if (cpus_accel && cpus_accel->synchronize_post_reset) {
+ if (cpus_accel->synchronize_post_reset) {
cpus_accel->synchronize_post_reset(cpu);
}
}
void cpu_synchronize_post_init(CPUState *cpu)
{
- if (cpus_accel && cpus_accel->synchronize_post_init) {
+ if (cpus_accel->synchronize_post_init) {
cpus_accel->synchronize_post_init(cpu);
}
}
void cpu_synchronize_pre_loadvm(CPUState *cpu)
{
- if (cpus_accel && cpus_accel->synchronize_pre_loadvm) {
+ if (cpus_accel->synchronize_pre_loadvm) {
cpus_accel->synchronize_pre_loadvm(cpu);
}
}
int64_t cpus_get_virtual_clock(void)
{
+ /*
+ * XXX
+ *
+ * need to check that cpus_accel is not NULL, because qcow2 calls
+ * qemu_get_clock_ns(CLOCK_VIRTUAL) without any accel initialized and
+ * with ticks disabled in some io-tests:
+ * 030 040 041 060 099 120 127 140 156 161 172 181 191 192 195 203 229 249 256 267
+ *
+ * is this expected?
+ *
+ * XXX
+ */
if (cpus_accel && cpus_accel->get_virtual_clock) {
return cpus_accel->get_virtual_clock();
}
@@ -207,7 +219,7 @@ int64_t cpus_get_virtual_clock(void)
*/
int64_t cpus_get_elapsed_ticks(void)
{
- if (cpus_accel && cpus_accel->get_elapsed_ticks) {
+ if (cpus_accel->get_elapsed_ticks) {
return cpus_accel->get_elapsed_ticks();
}
return cpu_get_ticks();
@@ -399,7 +411,7 @@ void cpus_kick_thread(CPUState *cpu)
void qemu_cpu_kick(CPUState *cpu)
{
qemu_cond_broadcast(cpu->halt_cond);
- if (cpus_accel && cpus_accel->kick_vcpu_thread) {
+ if (cpus_accel->kick_vcpu_thread) {
cpus_accel->kick_vcpu_thread(cpu);
} else { /* default */
cpus_kick_thread(cpu);
@@ -573,12 +585,9 @@ void qemu_init_vcpu(CPUState *cpu)
cpu_address_space_init(cpu, 0, "cpu-memory", cpu->memory);
}
- if (cpus_accel) {
- /* accelerator already implements the CpusAccel interface */
- cpus_accel->create_vcpu_thread(cpu);
- } else {
- g_assert_not_reached();
- }
+ /* accelerators all implement the CpusAccel interface */
+ g_assert(cpus_accel != NULL && cpus_accel->create_vcpu_thread != NULL);
+ cpus_accel->create_vcpu_thread(cpu);
while (!cpu->created) {
qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);
--
2.26.2
next prev parent reply other threads:[~2020-10-06 7:39 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 7:29 [PULL 00/37] Build system + accel + record/replay patches for 2020-10-06 Paolo Bonzini
2020-10-06 7:29 ` [PULL 01/37] cpu-timers, icount: new modules Paolo Bonzini
2020-10-06 7:29 ` [PULL 02/37] icount: rename functions to be consistent with the module name Paolo Bonzini
2020-10-06 7:29 ` [PULL 03/37] cpus: prepare new CpusAccel cpu accelerator interface Paolo Bonzini
2020-10-06 7:29 ` [PULL 04/37] cpus: extract out TCG-specific code to accel/tcg Paolo Bonzini
2020-10-06 7:29 ` [PULL 05/37] cpus: extract out qtest-specific code to accel/qtest Paolo Bonzini
2020-10-06 7:29 ` [PULL 06/37] cpus: extract out kvm-specific code to accel/kvm Paolo Bonzini
2020-10-06 7:29 ` [PULL 07/37] cpus: extract out hax-specific code to target/i386/ Paolo Bonzini
2020-10-16 6:48 ` Volker Rümelin
2020-10-16 8:00 ` Claudio Fontana
2020-10-17 7:17 ` Volker Rümelin
2020-10-06 7:29 ` [PULL 08/37] cpus: extract out whpx-specific " Paolo Bonzini
2020-10-06 7:29 ` [PULL 09/37] cpus: extract out hvf-specific code to target/i386/hvf/ Paolo Bonzini
2020-10-06 7:29 ` [PULL 10/37] cpus: cleanup now unneeded includes Paolo Bonzini
2020-10-06 7:29 ` Paolo Bonzini [this message]
2020-10-06 7:29 ` [PULL 12/37] cpus: add handle_interrupt to the CpusAccel interface Paolo Bonzini
2020-10-06 7:29 ` [PULL 13/37] hvf: remove hvf specific functions from global includes Paolo Bonzini
2020-10-06 7:29 ` [PULL 14/37] whpx: remove whpx " Paolo Bonzini
2020-10-06 7:29 ` [PULL 15/37] hax: remove hax " Paolo Bonzini
2020-10-06 7:29 ` [PULL 16/37] kvm: remove kvm " Paolo Bonzini
2020-10-06 7:29 ` [PULL 17/37] kvm: kvm_init_vcpu take Error pointer Paolo Bonzini
2020-10-06 7:29 ` [PULL 18/37] accel/tcg: use current_machine as it is always set for softmmu Paolo Bonzini
2020-10-06 7:29 ` [PULL 19/37] slirp: Convert Makefile bits to meson bits Paolo Bonzini
2020-10-06 7:29 ` [PULL 20/37] dtc: " Paolo Bonzini
2020-10-06 7:29 ` [PULL 21/37] configure: do not clobber environment CFLAGS/CXXFLAGS/LDFLAGS Paolo Bonzini
2020-10-06 7:29 ` [PULL 22/37] configure: consistently pass CFLAGS/CXXFLAGS/LDFLAGS to meson Paolo Bonzini
2020-10-06 7:29 ` [PULL 23/37] configure: don't enable ASLR for --enable-debug Windows builds Paolo Bonzini
2020-10-06 7:29 ` [PULL 24/37] replay: don't record interrupt poll Paolo Bonzini
2020-10-06 7:29 ` [PULL 25/37] replay: provide an accessor for rr filename Paolo Bonzini
2020-10-06 7:29 ` [PULL 26/37] qcow2: introduce icount field for snapshots Paolo Bonzini
2020-10-06 7:29 ` [PULL 27/37] migration: " Paolo Bonzini
2020-10-06 13:44 ` Eric Blake
2020-10-06 7:29 ` [PULL 28/37] qapi: introduce replay.json for record/replay-related stuff Paolo Bonzini
2020-10-06 7:29 ` [PULL 29/37] replay: introduce info hmp/qmp command Paolo Bonzini
2020-10-06 7:29 ` [PULL 30/37] replay: introduce breakpoint at the specified step Paolo Bonzini
2020-10-06 7:29 ` [PULL 31/37] replay: implement replay-seek command Paolo Bonzini
2020-10-06 7:29 ` [PULL 32/37] replay: flush rr queue before loading the vmstate Paolo Bonzini
2020-10-06 7:29 ` [PULL 33/37] gdbstub: add reverse step support in replay mode Paolo Bonzini
2020-10-06 7:29 ` [PULL 34/37] gdbstub: add reverse continue " Paolo Bonzini
2020-10-30 15:15 ` Philippe Mathieu-Daudé
2020-10-06 7:29 ` [PULL 35/37] replay: describe reverse debugging in docs/replay.txt Paolo Bonzini
2020-10-06 7:29 ` [PULL 36/37] replay: create temporary snapshot at debugger connection Paolo Bonzini
2020-10-06 7:29 ` [PULL 37/37] tests/acceptance: add reverse debugging test Paolo Bonzini
2020-10-06 20:13 ` [PULL 00/37] Build system + accel + record/replay patches for 2020-10-06 Peter Maydell
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=20201006072947.487729-12-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=cfontana@suse.de \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).