replay: Extract core API to 'exec/replay-core.h'

replay API is used deeply within TCG common code (common to user
and system emulation). Unfortunately "sysemu/replay.h" requires
some QAPI headers for few system-specific declarations, example:

  void replay_input_event(QemuConsole *src, InputEvent *evt);

Since commit c2651c0eaa ("qapi/meson: Restrict UI module to system
emulation and tools") the QAPI header defining the InputEvent is
not generated anymore.
To keep it simple, extract the 'core' replay prototypes to a new
"exec/replay-core.h" header which we include in the TCG code that
doesn't need the rest of the replay API.

Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Message-Id: <20221219170806.60580-5-philmd@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2022-12-19 18:09:43 +01:00
parent 5db2dac462
commit 5b5968c477
13 changed files with 95 additions and 73 deletions

View File

@ -3237,6 +3237,7 @@ S: Supported
F: replay/* F: replay/*
F: block/blkreplay.c F: block/blkreplay.c
F: net/filter-replay.c F: net/filter-replay.c
F: include/exec/replay-core.h
F: include/sysemu/replay.h F: include/sysemu/replay.h
F: docs/devel/replay.rst F: docs/devel/replay.rst
F: docs/system/replay.rst F: docs/system/replay.rst

View File

@ -36,7 +36,7 @@
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "exec/cpu-all.h" #include "exec/cpu-all.h"
#include "sysemu/cpu-timers.h" #include "sysemu/cpu-timers.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
#include "sysemu/tcg.h" #include "sysemu/tcg.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "tb-jmp-cache.h" #include "tb-jmp-cache.h"

View File

@ -25,7 +25,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "sysemu/tcg.h" #include "sysemu/tcg.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
#include "sysemu/cpu-timers.h" #include "sysemu/cpu-timers.h"
#include "tcg/tcg.h" #include "tcg/tcg.h"
#include "qapi/error.h" #include "qapi/error.h"

View File

@ -16,7 +16,7 @@
#include "exec/log.h" #include "exec/log.h"
#include "exec/translator.h" #include "exec/translator.h"
#include "exec/plugin-gen.h" #include "exec/plugin-gen.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
/* Pairs with tcg_clear_temp_count. /* Pairs with tcg_clear_temp_count.
To be called by #TranslatorOps.{translate_insn,tb_stop} if To be called by #TranslatorOps.{translate_insn,tb_stop} if

View File

@ -1,6 +1,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/core/cpu.h" #include "hw/core/cpu.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
bool enable_cpu_pm = false; bool enable_cpu_pm = false;

2
cpu.c
View File

@ -33,7 +33,7 @@
#endif #endif
#include "sysemu/tcg.h" #include "sysemu/tcg.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "exec/translate-all.h" #include "exec/translate-all.h"

View File

@ -48,7 +48,7 @@
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "semihosting/semihost.h" #include "semihosting/semihost.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
#include "internals.h" #include "internals.h"

View File

@ -10,7 +10,7 @@
#include "hw/ptimer.h" #include "hw/ptimer.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
#include "sysemu/cpu-timers.h" #include "sysemu/cpu-timers.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "block/aio.h" #include "block/aio.h"

View File

@ -0,0 +1,80 @@
/*
* QEMU replay core API
*
* Copyright (c) 2010-2015 Institute for System Programming
* of the Russian Academy of Sciences.
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef EXEC_REPLAY_H
#define EXEC_REPLAY_H
#include "qapi/qapi-types-replay.h"
extern ReplayMode replay_mode;
/* Replay process control functions */
/* Enables recording or saving event log with specified parameters */
void replay_configure(struct QemuOpts *opts);
/* Initializes timers used for snapshotting and enables events recording */
void replay_start(void);
/* Closes replay log file and frees other resources. */
void replay_finish(void);
/* Adds replay blocker with the specified error description */
void replay_add_blocker(const char *feature);
/* Returns name of the replay log file */
const char *replay_get_filename(void);
/*
* Start making one step in backward direction.
* Used by gdbstub for backwards debugging.
* Returns true on success.
*/
bool replay_reverse_step(void);
/*
* Start searching the last breakpoint/watchpoint.
* Used by gdbstub for backwards debugging.
* Returns true if the process successfully started.
*/
bool replay_reverse_continue(void);
/*
* Returns true if replay module is processing
* reverse_continue or reverse_step request
*/
bool replay_running_debug(void);
/* Called in reverse debugging mode to collect breakpoint information */
void replay_breakpoint(void);
/* Called when gdb is attached to gdbstub */
void replay_gdb_attached(void);
/* Interrupts and exceptions */
/* Called by exception handler to write or read exception processing events */
bool replay_exception(void);
/*
* Used to determine that exception is pending.
* Does not proceed to the next event in the log.
*/
bool replay_has_exception(void);
/*
* Called by interrupt handlers to write or read interrupt processing events.
* Returns true if interrupt should be processed.
*/
bool replay_interrupt(void);
/*
* Tries to read interrupt event from the file.
* Returns true, when interrupt request is pending.
*/
bool replay_has_interrupt(void);
/* Processing data from random generators */
/* Saves the values from the random number generator */
void replay_save_random(int ret, void *buf, size_t len);
/* Loads the saved values for the random number generator */
int replay_read_random(void *buf, size_t len);
#endif

View File

@ -1,8 +1,8 @@
#ifndef REPLAY_H #ifndef SYSEMU_REPLAY_H
#define REPLAY_H #define SYSEMU_REPLAY_H
/* /*
* replay.h * QEMU replay (system interface)
* *
* Copyright (c) 2010-2015 Institute for System Programming * Copyright (c) 2010-2015 Institute for System Programming
* of the Russian Academy of Sciences. * of the Russian Academy of Sciences.
@ -12,9 +12,9 @@
* *
*/ */
#include "exec/replay-core.h"
#include "qapi/qapi-types-misc.h" #include "qapi/qapi-types-misc.h"
#include "qapi/qapi-types-run-state.h" #include "qapi/qapi-types-run-state.h"
#include "qapi/qapi-types-replay.h"
#include "qapi/qapi-types-ui.h" #include "qapi/qapi-types-ui.h"
#include "block/aio.h" #include "block/aio.h"
@ -45,8 +45,6 @@ typedef enum ReplayCheckpoint ReplayCheckpoint;
typedef struct ReplayNetState ReplayNetState; typedef struct ReplayNetState ReplayNetState;
extern ReplayMode replay_mode;
/* Name of the initial VM snapshot */ /* Name of the initial VM snapshot */
extern char *replay_snapshot; extern char *replay_snapshot;
@ -63,40 +61,6 @@ extern char *replay_snapshot;
void replay_mutex_lock(void); void replay_mutex_lock(void);
void replay_mutex_unlock(void); void replay_mutex_unlock(void);
/* Replay process control functions */
/*! Enables recording or saving event log with specified parameters */
void replay_configure(struct QemuOpts *opts);
/*! Initializes timers used for snapshotting and enables events recording */
void replay_start(void);
/*! Closes replay log file and frees other resources. */
void replay_finish(void);
/*! Adds replay blocker with the specified error description */
void replay_add_blocker(const char *feature);
/* Returns name of the replay log file */
const char *replay_get_filename(void);
/*
* Start making one step in backward direction.
* Used by gdbstub for backwards debugging.
* Returns true on success.
*/
bool replay_reverse_step(void);
/*
* Start searching the last breakpoint/watchpoint.
* Used by gdbstub for backwards debugging.
* Returns true if the process successfully started.
*/
bool replay_reverse_continue(void);
/*
* Returns true if replay module is processing
* reverse_continue or reverse_step request
*/
bool replay_running_debug(void);
/* Called in reverse debugging mode to collect breakpoint information */
void replay_breakpoint(void);
/* Called when gdb is attached to gdbstub */
void replay_gdb_attached(void);
/* Processing the instructions */ /* Processing the instructions */
/*! Returns number of executed instructions. */ /*! Returns number of executed instructions. */
@ -106,22 +70,6 @@ int replay_get_instructions(void);
/*! Updates instructions counter in replay mode. */ /*! Updates instructions counter in replay mode. */
void replay_account_executed_instructions(void); void replay_account_executed_instructions(void);
/* Interrupts and exceptions */
/*! Called by exception handler to write or read
exception processing events. */
bool replay_exception(void);
/*! Used to determine that exception is pending.
Does not proceed to the next event in the log. */
bool replay_has_exception(void);
/*! Called by interrupt handlers to write or read
interrupt processing events.
\return true if interrupt should be processed */
bool replay_interrupt(void);
/*! Tries to read interrupt event from the file.
Returns true, when interrupt request is pending */
bool replay_has_interrupt(void);
/* Processing clocks and other time sources */ /* Processing clocks and other time sources */
/*! Save the specified clock */ /*! Save the specified clock */
@ -143,13 +91,6 @@ int64_t replay_read_clock(ReplayClockKind kind, int64_t raw_icount);
? replay_save_clock((clock), (value), icount_get_raw_locked()) \ ? replay_save_clock((clock), (value), icount_get_raw_locked()) \
: (value)) : (value))
/* Processing data from random generators */
/* Saves the values from the random number generator */
void replay_save_random(int ret, void *buf, size_t len);
/* Loads the saved values for the random number generator */
int replay_read_random(void *buf, size_t len);
/* Events */ /* Events */
/*! Called when qemu shutdown is requested. */ /*! Called when qemu shutdown is requested. */

View File

@ -1,5 +1,5 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
ReplayMode replay_mode; ReplayMode replay_mode;

View File

@ -10,7 +10,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "ptimer-test.h" #include "ptimer-test.h"

View File

@ -14,7 +14,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/guest-random.h" #include "qemu/guest-random.h"
#include "crypto/random.h" #include "crypto/random.h"
#include "sysemu/replay.h" #include "exec/replay-core.h"
static __thread GRand *thread_rand; static __thread GRand *thread_rand;