diff mbox series

[4/5] replay: Extract core API to 'exec/replay-core.h'

Message ID 20221219170806.60580-5-philmd@linaro.org
State Superseded
Headers show
Series exec: QAPI housekeeping for user emulation | expand

Commit Message

Philippe Mathieu-Daudé Dec. 19, 2022, 5:08 p.m. UTC
From: Philippe Mathieu-Daude <philmd@linaro.org>

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.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS                    |  1 +
 accel/tcg/cpu-exec.c           |  2 +-
 accel/tcg/tcg-all.c            |  2 +-
 accel/tcg/translator.c         |  2 +-
 accel/tcg/user-exec-stub.c     |  2 +-
 cpu.c                          |  2 +-
 gdbstub/gdbstub.c              |  2 +-
 hw/core/ptimer.c               |  2 +-
 include/exec/replay-core.h     | 76 ++++++++++++++++++++++++++++++++++
 include/sysemu/replay.h        | 67 ++----------------------------
 stubs/replay.c                 |  2 +-
 tests/unit/ptimer-test-stubs.c |  2 +-
 util/guest-random.c            |  2 +-
 13 files changed, 91 insertions(+), 73 deletions(-)
 create mode 100644 include/exec/replay-core.h

Comments

Pavel Dovgalyuk Dec. 21, 2022, 10:55 a.m. UTC | #1
Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>

On 19.12.2022 20:08, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daude <philmd@linaro.org>
> 
> 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.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   MAINTAINERS                    |  1 +
>   accel/tcg/cpu-exec.c           |  2 +-
>   accel/tcg/tcg-all.c            |  2 +-
>   accel/tcg/translator.c         |  2 +-
>   accel/tcg/user-exec-stub.c     |  2 +-
>   cpu.c                          |  2 +-
>   gdbstub/gdbstub.c              |  2 +-
>   hw/core/ptimer.c               |  2 +-
>   include/exec/replay-core.h     | 76 ++++++++++++++++++++++++++++++++++
>   include/sysemu/replay.h        | 67 ++----------------------------
>   stubs/replay.c                 |  2 +-
>   tests/unit/ptimer-test-stubs.c |  2 +-
>   util/guest-random.c            |  2 +-
>   13 files changed, 91 insertions(+), 73 deletions(-)
>   create mode 100644 include/exec/replay-core.h
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3bd433b65a..04aa77fd37 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3206,6 +3206,7 @@ S: Supported
>   F: replay/*
>   F: block/blkreplay.c
>   F: net/filter-replay.c
> +F: include/exec/replay-core.h
>   F: include/sysemu/replay.h
>   F: docs/devel/replay.rst
>   F: docs/system/replay.rst
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 5a7825dce1..040de10440 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -37,7 +37,7 @@
>   #include "sysemu/cpus.h"
>   #include "exec/cpu-all.h"
>   #include "sysemu/cpu-timers.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   #include "sysemu/tcg.h"
>   #include "exec/helper-proto.h"
>   #include "tb-jmp-cache.h"
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index 30b503fb22..5dab1ae9dd 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -25,7 +25,7 @@
>   
>   #include "qemu/osdep.h"
>   #include "sysemu/tcg.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   #include "sysemu/cpu-timers.h"
>   #include "tcg/tcg.h"
>   #include "qapi/error.h"
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index 061519691f..3a40f9eaca 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -16,7 +16,7 @@
>   #include "exec/log.h"
>   #include "exec/translator.h"
>   #include "exec/plugin-gen.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   
>   /* Pairs with tcg_clear_temp_count.
>      To be called by #TranslatorOps.{translate_insn,tb_stop} if
> diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c
> index 968cd3ca60..874e1f1a20 100644
> --- a/accel/tcg/user-exec-stub.c
> +++ b/accel/tcg/user-exec-stub.c
> @@ -1,6 +1,6 @@
>   #include "qemu/osdep.h"
>   #include "hw/core/cpu.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   
>   bool enable_cpu_pm = false;
>   
> diff --git a/cpu.c b/cpu.c
> index 4a7d865427..5503e2ff12 100644
> --- a/cpu.c
> +++ b/cpu.c
> @@ -33,7 +33,7 @@
>   #endif
>   #include "sysemu/tcg.h"
>   #include "sysemu/kvm.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   #include "exec/cpu-common.h"
>   #include "exec/exec-all.h"
>   #include "exec/translate-all.h"
> diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
> index c3fbc31123..fb9c49e0fd 100644
> --- a/gdbstub/gdbstub.c
> +++ b/gdbstub/gdbstub.c
> @@ -48,7 +48,7 @@
>   #include "sysemu/runstate.h"
>   #include "semihosting/semihost.h"
>   #include "exec/exec-all.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   
>   #include "internals.h"
>   
> diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
> index eb5ba1aff7..e03165febf 100644
> --- a/hw/core/ptimer.c
> +++ b/hw/core/ptimer.c
> @@ -10,7 +10,7 @@
>   #include "hw/ptimer.h"
>   #include "migration/vmstate.h"
>   #include "qemu/host-utils.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   #include "sysemu/cpu-timers.h"
>   #include "sysemu/qtest.h"
>   #include "block/aio.h"
> diff --git a/include/exec/replay-core.h b/include/exec/replay-core.h
> new file mode 100644
> index 0000000000..9ec20cb124
> --- /dev/null
> +++ b/include/exec/replay-core.h
> @@ -0,0 +1,76 @@
> +/*
> + * 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(Error *reason);
> +/* 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.
> +    \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 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
> diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
> index 7ec0882b50..08aae5869f 100644
> --- a/include/sysemu/replay.h
> +++ b/include/sysemu/replay.h
> @@ -1,8 +1,8 @@
> -#ifndef REPLAY_H
> -#define REPLAY_H
> +#ifndef SYSEMU_REPLAY_H
> +#define SYSEMU_REPLAY_H
>   
>   /*
> - * replay.h
> + * QEMU replay (system interface)
>    *
>    * Copyright (c) 2010-2015 Institute for System Programming
>    *                         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-run-state.h"
> -#include "qapi/qapi-types-replay.h"
>   #include "qapi/qapi-types-ui.h"
>   #include "block/aio.h"
>   
> @@ -45,8 +45,6 @@ typedef enum ReplayCheckpoint ReplayCheckpoint;
>   
>   typedef struct ReplayNetState ReplayNetState;
>   
> -extern ReplayMode replay_mode;
> -
>   /* Name of the initial VM snapshot */
>   extern char *replay_snapshot;
>   
> @@ -63,40 +61,6 @@ extern char *replay_snapshot;
>   void replay_mutex_lock(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(Error *reason);
> -/* 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 */
>   
>   /*! Returns number of executed instructions. */
> @@ -106,22 +70,6 @@ int replay_get_instructions(void);
>   /*! Updates instructions counter in replay mode. */
>   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 */
>   
>   /*! 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()) \
>               : (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 */
>   
>   /*! Called when qemu shutdown is requested. */
> diff --git a/stubs/replay.c b/stubs/replay.c
> index 9d5b4be339..42c92e4acb 100644
> --- a/stubs/replay.c
> +++ b/stubs/replay.c
> @@ -1,5 +1,5 @@
>   #include "qemu/osdep.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   
>   ReplayMode replay_mode;
>   
> diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c
> index f5e75a96b6..f2bfcede93 100644
> --- a/tests/unit/ptimer-test-stubs.c
> +++ b/tests/unit/ptimer-test-stubs.c
> @@ -10,7 +10,7 @@
>   
>   #include "qemu/osdep.h"
>   #include "qemu/main-loop.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   #include "migration/vmstate.h"
>   
>   #include "ptimer-test.h"
> diff --git a/util/guest-random.c b/util/guest-random.c
> index 23643f86cc..a24d27624c 100644
> --- a/util/guest-random.c
> +++ b/util/guest-random.c
> @@ -14,7 +14,7 @@
>   #include "qapi/error.h"
>   #include "qemu/guest-random.h"
>   #include "crypto/random.h"
> -#include "sysemu/replay.h"
> +#include "exec/replay-core.h"
>   
>   
>   static __thread GRand *thread_rand;
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 3bd433b65a..04aa77fd37 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3206,6 +3206,7 @@  S: Supported
 F: replay/*
 F: block/blkreplay.c
 F: net/filter-replay.c
+F: include/exec/replay-core.h 
 F: include/sysemu/replay.h
 F: docs/devel/replay.rst
 F: docs/system/replay.rst
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 5a7825dce1..040de10440 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -37,7 +37,7 @@ 
 #include "sysemu/cpus.h"
 #include "exec/cpu-all.h"
 #include "sysemu/cpu-timers.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 #include "sysemu/tcg.h"
 #include "exec/helper-proto.h"
 #include "tb-jmp-cache.h"
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index 30b503fb22..5dab1ae9dd 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -25,7 +25,7 @@ 
 
 #include "qemu/osdep.h"
 #include "sysemu/tcg.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 #include "sysemu/cpu-timers.h"
 #include "tcg/tcg.h"
 #include "qapi/error.h"
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 061519691f..3a40f9eaca 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -16,7 +16,7 @@ 
 #include "exec/log.h"
 #include "exec/translator.h"
 #include "exec/plugin-gen.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 
 /* Pairs with tcg_clear_temp_count.
    To be called by #TranslatorOps.{translate_insn,tb_stop} if
diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c
index 968cd3ca60..874e1f1a20 100644
--- a/accel/tcg/user-exec-stub.c
+++ b/accel/tcg/user-exec-stub.c
@@ -1,6 +1,6 @@ 
 #include "qemu/osdep.h"
 #include "hw/core/cpu.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 
 bool enable_cpu_pm = false;
 
diff --git a/cpu.c b/cpu.c
index 4a7d865427..5503e2ff12 100644
--- a/cpu.c
+++ b/cpu.c
@@ -33,7 +33,7 @@ 
 #endif
 #include "sysemu/tcg.h"
 #include "sysemu/kvm.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 #include "exec/cpu-common.h"
 #include "exec/exec-all.h"
 #include "exec/translate-all.h"
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index c3fbc31123..fb9c49e0fd 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -48,7 +48,7 @@ 
 #include "sysemu/runstate.h"
 #include "semihosting/semihost.h"
 #include "exec/exec-all.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 
 #include "internals.h"
 
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index eb5ba1aff7..e03165febf 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -10,7 +10,7 @@ 
 #include "hw/ptimer.h"
 #include "migration/vmstate.h"
 #include "qemu/host-utils.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 #include "sysemu/cpu-timers.h"
 #include "sysemu/qtest.h"
 #include "block/aio.h"
diff --git a/include/exec/replay-core.h b/include/exec/replay-core.h
new file mode 100644
index 0000000000..9ec20cb124
--- /dev/null
+++ b/include/exec/replay-core.h
@@ -0,0 +1,76 @@ 
+/*
+ * 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(Error *reason);
+/* 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.
+    \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 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
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 7ec0882b50..08aae5869f 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -1,8 +1,8 @@ 
-#ifndef REPLAY_H
-#define REPLAY_H
+#ifndef SYSEMU_REPLAY_H
+#define SYSEMU_REPLAY_H
 
 /*
- * replay.h
+ * QEMU replay (system interface)
  *
  * Copyright (c) 2010-2015 Institute for System Programming
  *                         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-run-state.h"
-#include "qapi/qapi-types-replay.h"
 #include "qapi/qapi-types-ui.h"
 #include "block/aio.h"
 
@@ -45,8 +45,6 @@  typedef enum ReplayCheckpoint ReplayCheckpoint;
 
 typedef struct ReplayNetState ReplayNetState;
 
-extern ReplayMode replay_mode;
-
 /* Name of the initial VM snapshot */
 extern char *replay_snapshot;
 
@@ -63,40 +61,6 @@  extern char *replay_snapshot;
 void replay_mutex_lock(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(Error *reason);
-/* 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 */
 
 /*! Returns number of executed instructions. */
@@ -106,22 +70,6 @@  int replay_get_instructions(void);
 /*! Updates instructions counter in replay mode. */
 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 */
 
 /*! 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()) \
             : (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 */
 
 /*! Called when qemu shutdown is requested. */
diff --git a/stubs/replay.c b/stubs/replay.c
index 9d5b4be339..42c92e4acb 100644
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -1,5 +1,5 @@ 
 #include "qemu/osdep.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 
 ReplayMode replay_mode;
 
diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c
index f5e75a96b6..f2bfcede93 100644
--- a/tests/unit/ptimer-test-stubs.c
+++ b/tests/unit/ptimer-test-stubs.c
@@ -10,7 +10,7 @@ 
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 #include "migration/vmstate.h"
 
 #include "ptimer-test.h"
diff --git a/util/guest-random.c b/util/guest-random.c
index 23643f86cc..a24d27624c 100644
--- a/util/guest-random.c
+++ b/util/guest-random.c
@@ -14,7 +14,7 @@ 
 #include "qapi/error.h"
 #include "qemu/guest-random.h"
 #include "crypto/random.h"
-#include "sysemu/replay.h"
+#include "exec/replay-core.h"
 
 
 static __thread GRand *thread_rand;