Skip to contentSkip to conversation

unbreak non-tcg builds

PATCH In review Claudio Fontana 3 participants 9 messages Oct 13, 2020 – Oct 19, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v4 cover unbreak non-tcg builds

This series now unbreaks current non-tcg builds (!CONFIG_TCG).

tests Makefiles need to avoid relying on all non-native archs binaries to be present,

bios-tables-test needs to skip tests that are tcg-only,

and notably the replay framework needs to consider that it might not be functional (or its code present at all) without TCG.

Tested ok target x86_64-softmmu on x86_64 host with:

./configure --enable-tcg --disable-kvm
./configure --enable-kvm --disable-tcg
./configure --enable-tcg --enable-kvm

running make check-qtest

v3 => v4:
* abandon attempts to avoid the code duplication and functional code in stubs, just providing the minimal changes to get things working.

v2 => v3:

* do not alter the replay api, provide a block wrapper instead to call into replay events handling
or the normal call flow depending on whether replay events are enabled.

v1: initial RFC

Claudio Fontana (2):
qtest: unbreak non-TCG builds in bios-tables-test
replay: do not build if TCG is not available

Paolo Bonzini (1):
tests/Makefile.include: unbreak non-tcg builds

 block/meson.build              |  3 +-
 migration/savevm.c             | 11 ++--
 net/meson.build                |  3 +-
 replay/meson.build             |  2 +-
 replay/replay-input.c          |  4 +-
 stubs/meson.build              |  1 -
 stubs/replay-user.c            |  9 ----
 stubs/replay.c                 | 98 ++++++++++++++++++++++++++++++++++
 tests/Makefile.include         |  2 +-
 tests/ptimer-test-stubs.c      |  5 --
 tests/qtest/bios-tables-test.c | 10 ++++
 tests/qtest/qmp-cmd-test.c     |  3 ++
 ui/input.c                     | 12 ++++-
 13 files changed, 136 insertions(+), 27 deletions(-)
 delete mode 100644 stubs/replay-user.c
Signature · 1 line
2.26.2
#1 lore raw

PATCH v4 1/3 tests/Makefile.include: unbreak non-tcg builds

From: Paolo Bonzini <[email protected]>

remove dependency of check-block from non-native archs

---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +1 -1
index 5aca98e60c..4037490b69 100644
@@ -140,7 +140,7 @@ QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXE
 check: check-block
 check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \
 		qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
-		$(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS)))
+		$(filter qemu-system-%, $(ninja-targets-c_LINKER) $(ninja-targets-cpp_LINKER))
 	@$<
 endif
 
Signature · 1 line
2.26.2
#2 lore raw

PATCH v4 2/3 qtest: unbreak non-TCG builds in bios-tables-test

In reply to Claudio Fontana

the tests assume TCG is available, thus breaking for TCG-only tests, where only the TCG accelerator option is passed to the QEMU binary.

---
 tests/qtest/bios-tables-test.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tests/qtest/bios-tables-test.c +10 -0
index 5647624492..18f535d4e8 100644
@@ -127,6 +127,9 @@ static void free_test_data(test_data *data)
 {
     int i;
 
+    if (!data->tables) {
+        return;
+    }
     for (i = 0; i < data->tables->len; ++i) {
         cleanup_table_descriptor(&g_array_index(data->tables, AcpiSdtTable, i));
     }
@@ -656,6 +659,13 @@ static void test_acpi_one(const char *params, test_data *data)
     char *args;
     bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
 
+#ifndef CONFIG_TCG
+    if (data->tcg_only) {
+        g_test_skip("TCG disabled, skipping ACPI tcg_only test");
+        return;
+    }
+#endif /* CONFIG_TCG */
+
     if (use_uefi) {
         /*
          * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
Signature · 1 line
2.26.2
#3 lore raw

PATCH v4 3/3 replay: do not build if TCG is not available

In reply to Claudio Fontana

this fixes non-TCG builds broken recently by replay reverse debugging.

stub the needed functions in stub/, including errors for hmp and qmp. This includes duplicating some code in replay/, and puts the logic for non-replay related events in the replay/ module (+ the stubs), so this should be revisited in the future.

Surprisingly, only _one_ qtest was affected by this, ide-test.c, which resulted in a buzz as the bh events were never delivered, and the bh never executed.

Many other subsystems _should_ have been affected.

This fixes the immediate issue, however a better way to group replay functionality to TCG-only code could be developed in the long term.

---
 block/meson.build          |  3 +-
 migration/savevm.c         | 11 +++--
 net/meson.build            |  3 +-
 replay/meson.build         |  2 +-
 replay/replay-input.c      |  4 +-
 stubs/meson.build          |  1 -
 stubs/replay-user.c        |  9 ----
 stubs/replay.c             | 98 ++++++++++++++++++++++++++++++++++++++
 tests/ptimer-test-stubs.c  |  5 --
 tests/qtest/qmp-cmd-test.c |  3 ++
 ui/input.c                 | 12 ++++-
 11 files changed, 125 insertions(+), 26 deletions(-)
 delete mode 100644 stubs/replay-user.c
block/meson.build +2 -1
index 78e8b25232..01fe6f84d2 100644
@@ -7,7 +7,6 @@ block_ss.add(files(
   'backup-top.c',
   'blkdebug.c',
   'blklogwrites.c',
-  'blkreplay.c',
   'blkverify.c',
   'block-backend.c',
   'block-copy.c',
@@ -42,6 +41,8 @@ block_ss.add(files(
   'write-threshold.c',
 ), zstd, zlib)
 
+block_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
+
 block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c'))
 block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c'))
 block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c'))
migration/savevm.c +7 -4
index d2e141f7b1..d9181ca520 100644
@@ -63,6 +63,7 @@
 #include "migration/colo.h"
 #include "qemu/bitmap.h"
 #include "net/announce.h"
+#include "sysemu/tcg.h"
 
 const unsigned int postcopy_ram_discard_version = 0;
 
@@ -2674,10 +2675,12 @@ int save_snapshot(const char *name, Error **errp)
         return ret;
     }
 
-    if (!replay_can_snapshot()) {
-        error_setg(errp, "Record/replay does not allow making snapshot "
-                   "right now. Try once more later.");
-        return ret;
+    if (tcg_enabled()) {
+        if (!replay_can_snapshot()) {
+            error_setg(errp, "Record/replay does not allow making snapshot "
+                       "right now. Try once more later.");
+            return ret;
+        }
     }
 
     if (!bdrv_all_can_snapshot(&bs)) {
net/meson.build +2 -1
index 1c7e3a3cb9..1076b0a7ab 100644
@@ -7,7 +7,6 @@ softmmu_ss.add(files(
   'eth.c',
   'filter-buffer.c',
   'filter-mirror.c',
-  'filter-replay.c',
   'filter-rewriter.c',
   'filter.c',
   'hub.c',
@@ -17,6 +16,8 @@ softmmu_ss.add(files(
   'util.c',
 ))
 
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
+
 softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c'))
 softmmu_ss.add(when: slirp, if_true: files('slirp.c'))
 softmmu_ss.add(when: ['CONFIG_VDE', vde], if_true: files('vde.c'))
replay/meson.build +1 -1
index f91163fb1e..cb3207740a 100644
@@ -1,4 +1,4 @@
-softmmu_ss.add(files(
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
   'replay.c',
   'replay-internal.c',
   'replay-events.c',
replay/replay-input.c +2 -2
index 1147e3d34e..5d1fd92e79 100644
@@ -124,7 +124,7 @@ void replay_input_event(QemuConsole *src, InputEvent *evt)
     } else if (replay_mode == REPLAY_MODE_RECORD) {
         replay_add_input_event(QAPI_CLONE(InputEvent, evt));
     } else {
-        qemu_input_event_send_impl(src, evt);
+        g_assert_not_reached();
     }
 }
 
@@ -135,6 +135,6 @@ void replay_input_sync_event(void)
     } else if (replay_mode == REPLAY_MODE_RECORD) {
         replay_add_input_sync_event();
     } else {
-        qemu_input_event_sync_impl();
+        g_assert_not_reached();
     }
 }
stubs/meson.build +0 -1
index 67f2a8c069..bbd2230d69 100644
@@ -32,7 +32,6 @@ stub_ss.add(files('qtest.c'))
 stub_ss.add(files('ram-block.c'))
 stub_ss.add(files('ramfb.c'))
 stub_ss.add(files('replay.c'))
-stub_ss.add(files('replay-user.c'))
 stub_ss.add(files('runstate-check.c'))
 stub_ss.add(files('set-fd-handler.c'))
 stub_ss.add(files('sysbus.c'))
stubs/replay-user.c deleted +0 -9
deleted file mode 100644
index 2ad9e27203..0000000000
@@ -1,9 +0,0 @@
-#include "qemu/osdep.h"
-#include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
-
-void replay_bh_schedule_oneshot_event(AioContext *ctx,
-    QEMUBHFunc *cb, void *opaque)
-{
-    aio_bh_schedule_oneshot(ctx, cb, opaque);
-}
stubs/replay.c +98 -0

101 lines not on this page · raw message

tests/ptimer-test-stubs.c +0 -5
index e935a1395e..7f801a4d09 100644
@@ -122,8 +122,3 @@ void qemu_bh_delete(QEMUBH *bh)
 {
     g_free(bh);
 }
-
-void replay_bh_schedule_event(QEMUBH *bh)
-{
-    bh->cb(bh->opaque);
-}
tests/qtest/qmp-cmd-test.c +3 -0
index 8a4c570e83..1c7186e53c 100644
@@ -31,6 +31,9 @@ static int query_error_class(const char *cmd)
 #ifndef CONFIG_SPICE
         { "query-spice", ERROR_CLASS_COMMAND_NOT_FOUND },
 #endif
+#ifndef CONFIG_TCG
+        { "query-replay", ERROR_CLASS_COMMAND_NOT_FOUND },
+#endif
 #ifndef CONFIG_VNC
         { "query-vnc", ERROR_CLASS_GENERIC_ERROR },
         { "query-vnc-servers", ERROR_CLASS_GENERIC_ERROR },
ui/input.c +10 -2
index 4791b089c7..8675e8ad09 100644
@@ -375,7 +375,11 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
         return;
     }
 
-    replay_input_event(src, evt);
+    if (replay_events_enabled()) {
+        replay_input_event(src, evt);
+    } else {
+        qemu_input_event_send_impl(src, evt);
+    }
 }
 
 void qemu_input_event_sync_impl(void)
@@ -401,7 +405,11 @@ void qemu_input_event_sync(void)
         return;
     }
 
-    replay_input_sync_event();
+    if (replay_events_enabled()) {
+        replay_input_sync_event();
+    } else {
+        qemu_input_event_sync_impl();
+    }
 }
 
 static InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)
Signature · 1 line
2.26.2
#4 lore raw

Re: [PATCH v4 3/3] replay: do not build if TCG is not available

Quoted 191 lines · Claudio Fontana

this fixes non-TCG builds broken recently by replay reverse debugging.

stub the needed functions in stub/, including errors for hmp and qmp. This includes duplicating some code in replay/, and puts the logic for non-replay related events in the replay/ module (+ the stubs), so this should be revisited in the future.

Surprisingly, only _one_ qtest was affected by this, ide-test.c, which resulted in a buzz as the bh events were never delivered, and the bh never executed.

Many other subsystems _should_ have been affected.

This fixes the immediate issue, however a better way to group replay functionality to TCG-only code could be developed in the long term.

---
  block/meson.build          |  3 +-
  migration/savevm.c         | 11 +++--
  net/meson.build            |  3 +-
  replay/meson.build         |  2 +-
  replay/replay-input.c      |  4 +-
  stubs/meson.build          |  1 -
  stubs/replay-user.c        |  9 ----
  stubs/replay.c             | 98 ++++++++++++++++++++++++++++++++++++++
  tests/ptimer-test-stubs.c  |  5 --
  tests/qtest/qmp-cmd-test.c |  3 ++
  ui/input.c                 | 12 ++++-
  11 files changed, 125 insertions(+), 26 deletions(-)

delete mode 100644 stubs/replay-user.c

block/meson.build +2 -1
index 78e8b25232..01fe6f84d2 100644
@@ -7,7 +7,6 @@ block_ss.add(files(
    'backup-top.c',
    'blkdebug.c',
    'blklogwrites.c',
-  'blkreplay.c',
    'blkverify.c',
    'block-backend.c',
    'block-copy.c',
@@ -42,6 +41,8 @@ block_ss.add(files(
    'write-threshold.c',
  ), zstd, zlib)
 
+block_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
+
  block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c'))
  block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c'))
  block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c'))
migration/savevm.c +7 -4
index d2e141f7b1..d9181ca520 100644
@@ -63,6 +63,7 @@
  #include "migration/colo.h"
  #include "qemu/bitmap.h"
  #include "net/announce.h"
+#include "sysemu/tcg.h"
 
  const unsigned int postcopy_ram_discard_version = 0;
 
@@ -2674,10 +2675,12 @@ int save_snapshot(const char *name, Error **errp)
          return ret;
      }
 
-    if (!replay_can_snapshot()) {
-        error_setg(errp, "Record/replay does not allow making snapshot "
-                   "right now. Try once more later.");
-        return ret;
+    if (tcg_enabled()) {
+        if (!replay_can_snapshot()) {
+            error_setg(errp, "Record/replay does not allow making snapshot "
+                       "right now. Try once more later.");
+            return ret;
+        }
      }
 
      if (!bdrv_all_can_snapshot(&bs)) {
net/meson.build +2 -1
index 1c7e3a3cb9..1076b0a7ab 100644
@@ -7,7 +7,6 @@ softmmu_ss.add(files(
    'eth.c',
    'filter-buffer.c',
    'filter-mirror.c',
-  'filter-replay.c',
    'filter-rewriter.c',
    'filter.c',
    'hub.c',
@@ -17,6 +16,8 @@ softmmu_ss.add(files(
    'util.c',
  ))
 
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
+
  softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c'))
  softmmu_ss.add(when: slirp, if_true: files('slirp.c'))
  softmmu_ss.add(when: ['CONFIG_VDE', vde], if_true: files('vde.c'))
replay/meson.build +1 -1
index f91163fb1e..cb3207740a 100644
@@ -1,4 +1,4 @@
-softmmu_ss.add(files(
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
    'replay.c',
    'replay-internal.c',
    'replay-events.c',
replay/replay-input.c +2 -2
index 1147e3d34e..5d1fd92e79 100644
@@ -124,7 +124,7 @@ void replay_input_event(QemuConsole *src, InputEvent *evt)
      } else if (replay_mode == REPLAY_MODE_RECORD) {
          replay_add_input_event(QAPI_CLONE(InputEvent, evt));
      } else {
-        qemu_input_event_send_impl(src, evt);
+        g_assert_not_reached();
      }
  }
 
@@ -135,6 +135,6 @@ void replay_input_sync_event(void)
      } else if (replay_mode == REPLAY_MODE_RECORD) {
          replay_add_input_sync_event();
      } else {
-        qemu_input_event_sync_impl();
+        g_assert_not_reached();
      }
  }
stubs/meson.build +0 -1
index 67f2a8c069..bbd2230d69 100644
@@ -32,7 +32,6 @@ stub_ss.add(files('qtest.c'))
  stub_ss.add(files('ram-block.c'))
  stub_ss.add(files('ramfb.c'))
  stub_ss.add(files('replay.c'))
-stub_ss.add(files('replay-user.c'))
  stub_ss.add(files('runstate-check.c'))
  stub_ss.add(files('set-fd-handler.c'))
  stub_ss.add(files('sysbus.c'))
stubs/replay-user.c deleted +0 -9
deleted file mode 100644
index 2ad9e27203..0000000000
@@ -1,9 +0,0 @@
-#include "qemu/osdep.h"
-#include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
-
-void replay_bh_schedule_oneshot_event(AioContext *ctx,
-    QEMUBHFunc *cb, void *opaque)
-{
-    aio_bh_schedule_oneshot(ctx, cb, opaque);
-}
stubs/replay.c +22 -0
index 45ebe77fb9..34b7975b2d 100644
@@ -103,3 +103,101 @@ bool replay_reverse_continue(void)
  {
      return false;
  }
+
+void replay_input_event(QemuConsole *src, InputEvent *evt)
+{
+}
+void replay_input_sync_event(void)
+{
+}
+void replay_bh_schedule_event(QEMUBH *bh)
+{
+    qemu_bh_schedule(bh);
+}
+void replay_bh_schedule_oneshot_event(AioContext *ctx,
+     QEMUBHFunc *cb, void *opaque)
+{
+    aio_bh_schedule_oneshot(ctx, cb, opaque);
+}
+void replay_add_blocker(Error *reason)
+{
+}
+void replay_audio_in(size_t *recorded, void *samples, size_t *wpos, size_t size)
+{
+}

stubs/replay.c bool replay_reverse_continue(void) · line 137

Quoted 10 lines
stubs/replay.c +10 -0
+void replay_audio_out(size_t *played)
+{
+}
+void replay_breakpoint(void)
+{
+}
+bool replay_can_snapshot(void)
+{
+    return false;
+}

Shouldn't this one return true to enable snapshotting?

Quoted 124 lines
stubs/replay.c +66 -0
+void replay_configure(struct QemuOpts *opts)
+{
+}
+void replay_flush_events(void)
+{
+}
+void replay_gdb_attached(void)
+{
+}
+bool replay_running_debug(void)
+{
+    return false;
+}
+void replay_shutdown_request(ShutdownCause cause)
+{
+}
+void replay_start(void)
+{
+}
+void replay_vmstate_init(void)
+{
+}
+
+#include "monitor/monitor.h"
+#include "monitor/hmp.h"
+#include "qapi/qapi-commands-replay.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+
+void hmp_info_replay(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+void hmp_replay_break(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+void hmp_replay_delete_break(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+void hmp_replay_seek(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+ReplayInfo *qmp_query_replay(Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+    return NULL;
+}
+void qmp_replay_break(int64_t icount, Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+}
+void qmp_replay_delete_break(Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+}
+void qmp_replay_seek(int64_t icount, Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+}
tests/ptimer-test-stubs.c +0 -5
index e935a1395e..7f801a4d09 100644
@@ -122,8 +122,3 @@ void qemu_bh_delete(QEMUBH *bh)
  {
      g_free(bh);
  }
-
-void replay_bh_schedule_event(QEMUBH *bh)
-{
-    bh->cb(bh->opaque);
-}
tests/qtest/qmp-cmd-test.c +3 -0
index 8a4c570e83..1c7186e53c 100644
@@ -31,6 +31,9 @@ static int query_error_class(const char *cmd)
  #ifndef CONFIG_SPICE
          { "query-spice", ERROR_CLASS_COMMAND_NOT_FOUND },
  #endif
+#ifndef CONFIG_TCG
+        { "query-replay", ERROR_CLASS_COMMAND_NOT_FOUND },
+#endif
  #ifndef CONFIG_VNC
          { "query-vnc", ERROR_CLASS_GENERIC_ERROR },
          { "query-vnc-servers", ERROR_CLASS_GENERIC_ERROR },
ui/input.c +10 -2
index 4791b089c7..8675e8ad09 100644
@@ -375,7 +375,11 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
          return;
      }
 
-    replay_input_event(src, evt);
+    if (replay_events_enabled()) {
+        replay_input_event(src, evt);
+    } else {
+        qemu_input_event_send_impl(src, evt);
+    }
  }
 
  void qemu_input_event_sync_impl(void)
@@ -401,7 +405,11 @@ void qemu_input_event_sync(void)
          return;
      }
 
-    replay_input_sync_event();
+    if (replay_events_enabled()) {
+        replay_input_sync_event();
+    } else {
+        qemu_input_event_sync_impl();
+    }
  }
 
  static InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)
#5 lore raw

Re: [PATCH v4 3/3] replay: do not build if TCG is not available

привет Pavel!

Quoted 127 lines · Pavel Dovgalyuk
Quoted 126 lines · Claudio Fontana

this fixes non-TCG builds broken recently by replay reverse debugging.

stub the needed functions in stub/, including errors for hmp and qmp. This includes duplicating some code in replay/, and puts the logic for non-replay related events in the replay/ module (+ the stubs), so this should be revisited in the future.

Surprisingly, only _one_ qtest was affected by this, ide-test.c, which resulted in a buzz as the bh events were never delivered, and the bh never executed.

Many other subsystems _should_ have been affected.

This fixes the immediate issue, however a better way to group replay functionality to TCG-only code could be developed in the long term.

---
  block/meson.build          |  3 +-
  migration/savevm.c         | 11 +++--
  net/meson.build            |  3 +-
  replay/meson.build         |  2 +-
  replay/replay-input.c      |  4 +-
  stubs/meson.build          |  1 -
  stubs/replay-user.c        |  9 ----
  stubs/replay.c             | 98 ++++++++++++++++++++++++++++++++++++++
  tests/ptimer-test-stubs.c  |  5 --
  tests/qtest/qmp-cmd-test.c |  3 ++
  ui/input.c                 | 12 ++++-
  11 files changed, 125 insertions(+), 26 deletions(-)

delete mode 100644 stubs/replay-user.c

block/meson.build +2 -1
index 78e8b25232..01fe6f84d2 100644
@@ -7,7 +7,6 @@ block_ss.add(files(
    'backup-top.c',
    'blkdebug.c',
    'blklogwrites.c',
-  'blkreplay.c',
    'blkverify.c',
    'block-backend.c',
    'block-copy.c',
@@ -42,6 +41,8 @@ block_ss.add(files(
    'write-threshold.c',
  ), zstd, zlib)
 
+block_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
+
  block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c'))
  block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c'))
  block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c'))
migration/savevm.c +7 -4
index d2e141f7b1..d9181ca520 100644
@@ -63,6 +63,7 @@
  #include "migration/colo.h"
  #include "qemu/bitmap.h"
  #include "net/announce.h"
+#include "sysemu/tcg.h"
 
  const unsigned int postcopy_ram_discard_version = 0;
 
@@ -2674,10 +2675,12 @@ int save_snapshot(const char *name, Error **errp)
          return ret;
      }
 
-    if (!replay_can_snapshot()) {
-        error_setg(errp, "Record/replay does not allow making snapshot "
-                   "right now. Try once more later.");
-        return ret;
+    if (tcg_enabled()) {
+        if (!replay_can_snapshot()) {
+            error_setg(errp, "Record/replay does not allow making snapshot "
+                       "right now. Try once more later.");
+            return ret;
+        }
      }
 
      if (!bdrv_all_can_snapshot(&bs)) {
net/meson.build +2 -1
index 1c7e3a3cb9..1076b0a7ab 100644
@@ -7,7 +7,6 @@ softmmu_ss.add(files(
    'eth.c',
    'filter-buffer.c',
    'filter-mirror.c',
-  'filter-replay.c',
    'filter-rewriter.c',
    'filter.c',
    'hub.c',
@@ -17,6 +16,8 @@ softmmu_ss.add(files(
    'util.c',
  ))
 
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
+
  softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c'))
  softmmu_ss.add(when: slirp, if_true: files('slirp.c'))
  softmmu_ss.add(when: ['CONFIG_VDE', vde], if_true: files('vde.c'))
replay/meson.build +1 -1
index f91163fb1e..cb3207740a 100644
@@ -1,4 +1,4 @@
-softmmu_ss.add(files(
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
    'replay.c',
    'replay-internal.c',
    'replay-events.c',
replay/replay-input.c +1 -1
index 1147e3d34e..5d1fd92e79 100644
@@ -124,7 +124,7 @@ void replay_input_event(QemuConsole *src, InputEvent *evt)
      } else if (replay_mode == REPLAY_MODE_RECORD) {
          replay_add_input_event(QAPI_CLONE(InputEvent, evt));
      } else {
-        qemu_input_event_send_impl(src, evt);
+        g_assert_not_reached();
      }
  }
 
Quoted 8 lines

replay/replay-input.c void replay_input_sync_event(void) · line 140

Quoted 8 lines
replay/replay-input.c +1 -1
@@ -135,6 +135,6 @@ void replay_input_sync_event(void)
      } else if (replay_mode == REPLAY_MODE_RECORD) {
          replay_add_input_sync_event();
      } else {
-        qemu_input_event_sync_impl();
+        g_assert_not_reached();
      }
  }

incidentally Pavel, is this ok when replay is enabled, can you give it a spin?
I used the if (replay_events_enabled()) in the ui/input.c code to only call these when events are enabled.

Quoted 61 lines
Quoted 61 lines
stubs/meson.build +0 -1
index 67f2a8c069..bbd2230d69 100644
@@ -32,7 +32,6 @@ stub_ss.add(files('qtest.c'))
  stub_ss.add(files('ram-block.c'))
  stub_ss.add(files('ramfb.c'))
  stub_ss.add(files('replay.c'))
-stub_ss.add(files('replay-user.c'))
  stub_ss.add(files('runstate-check.c'))
  stub_ss.add(files('set-fd-handler.c'))
  stub_ss.add(files('sysbus.c'))
stubs/replay-user.c deleted +0 -9
deleted file mode 100644
index 2ad9e27203..0000000000
@@ -1,9 +0,0 @@
-#include "qemu/osdep.h"
-#include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
-
-void replay_bh_schedule_oneshot_event(AioContext *ctx,
-    QEMUBHFunc *cb, void *opaque)
-{
-    aio_bh_schedule_oneshot(ctx, cb, opaque);
-}
stubs/replay.c +26 -0
index 45ebe77fb9..34b7975b2d 100644
@@ -103,3 +103,101 @@ bool replay_reverse_continue(void)
  {
      return false;
  }
+
+void replay_input_event(QemuConsole *src, InputEvent *evt)
+{
+}
+void replay_input_sync_event(void)
+{
+}
+void replay_bh_schedule_event(QEMUBH *bh)
+{
+    qemu_bh_schedule(bh);
+}
+void replay_bh_schedule_oneshot_event(AioContext *ctx,
+     QEMUBHFunc *cb, void *opaque)
+{
+    aio_bh_schedule_oneshot(ctx, cb, opaque);
+}
+void replay_add_blocker(Error *reason)
+{
+}
+void replay_audio_in(size_t *recorded, void *samples, size_t *wpos, size_t size)
+{
+}
+void replay_audio_out(size_t *played)
+{
+}
+void replay_breakpoint(void)
Quoted 8 lines

stubs/replay.c bool replay_reverse_continue(void) · line 137

Quoted 6 lines
stubs/replay.c +6 -0
+{
+}
+bool replay_can_snapshot(void)
+{
+    return false;
+}

Shouldn't this one return true to enable snapshotting?

The check for replay_can_snapshot is wrapped by a

if (tcg_enabled()) {
}

so it should be fine.

Logically, reading a naked:

if (!replay_can_snapshot()) { fail; }

is surprising I think for a reader that compiled the code without replay.

Quoted 124 lines
Quoted 124 lines
stubs/replay.c +66 -0
+void replay_configure(struct QemuOpts *opts)
+{
+}
+void replay_flush_events(void)
+{
+}
+void replay_gdb_attached(void)
+{
+}
+bool replay_running_debug(void)
+{
+    return false;
+}
+void replay_shutdown_request(ShutdownCause cause)
+{
+}
+void replay_start(void)
+{
+}
+void replay_vmstate_init(void)
+{
+}
+
+#include "monitor/monitor.h"
+#include "monitor/hmp.h"
+#include "qapi/qapi-commands-replay.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+
+void hmp_info_replay(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+void hmp_replay_break(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+void hmp_replay_delete_break(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+void hmp_replay_seek(Monitor *mon, const QDict *qdict)
+{
+    error_report("replay support not available");
+}
+ReplayInfo *qmp_query_replay(Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+    return NULL;
+}
+void qmp_replay_break(int64_t icount, Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+}
+void qmp_replay_delete_break(Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+}
+void qmp_replay_seek(int64_t icount, Error **errp)
+{
+    error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+              "replay support not available");
+}
tests/ptimer-test-stubs.c +0 -5
index e935a1395e..7f801a4d09 100644
@@ -122,8 +122,3 @@ void qemu_bh_delete(QEMUBH *bh)
  {
      g_free(bh);
  }
-
-void replay_bh_schedule_event(QEMUBH *bh)
-{
-    bh->cb(bh->opaque);
-}
tests/qtest/qmp-cmd-test.c +3 -0
index 8a4c570e83..1c7186e53c 100644
@@ -31,6 +31,9 @@ static int query_error_class(const char *cmd)
  #ifndef CONFIG_SPICE
          { "query-spice", ERROR_CLASS_COMMAND_NOT_FOUND },
  #endif
+#ifndef CONFIG_TCG
+        { "query-replay", ERROR_CLASS_COMMAND_NOT_FOUND },
+#endif
  #ifndef CONFIG_VNC
          { "query-vnc", ERROR_CLASS_GENERIC_ERROR },
          { "query-vnc-servers", ERROR_CLASS_GENERIC_ERROR },
ui/input.c +10 -2
index 4791b089c7..8675e8ad09 100644
@@ -375,7 +375,11 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
          return;
      }
 
-    replay_input_event(src, evt);
+    if (replay_events_enabled()) {
+        replay_input_event(src, evt);
+    } else {
+        qemu_input_event_send_impl(src, evt);
+    }
  }
 
  void qemu_input_event_sync_impl(void)
@@ -401,7 +405,11 @@ void qemu_input_event_sync(void)
          return;
      }
 
-    replay_input_sync_event();
+    if (replay_events_enabled()) {
+        replay_input_sync_event();
+    } else {
+        qemu_input_event_sync_impl();
+    }
  }
 
Quoted 3 lines

ui/input.c void qemu_input_event_sync(void) · line 415

Quoted 2 lines
ui/input.c +0 -0
  static InputEvent *qemu_input_event_new_key(KeyValue *key, bool down)

Thanks!

Ciao,

Claudio

#6 lore raw

Re: [PATCH v4 3/3] replay: do not build if TCG is not available

Quoted 130 lines · Claudio Fontana

привет Pavel!

Quoted 127 lines · Pavel Dovgalyuk
Quoted 126 lines · Claudio Fontana

this fixes non-TCG builds broken recently by replay reverse debugging.

stub the needed functions in stub/, including errors for hmp and qmp. This includes duplicating some code in replay/, and puts the logic for non-replay related events in the replay/ module (+ the stubs), so this should be revisited in the future.

Surprisingly, only _one_ qtest was affected by this, ide-test.c, which resulted in a buzz as the bh events were never delivered, and the bh never executed.

Many other subsystems _should_ have been affected.

This fixes the immediate issue, however a better way to group replay functionality to TCG-only code could be developed in the long term.

---
   block/meson.build          |  3 +-
   migration/savevm.c         | 11 +++--
   net/meson.build            |  3 +-
   replay/meson.build         |  2 +-
   replay/replay-input.c      |  4 +-
   stubs/meson.build          |  1 -
   stubs/replay-user.c        |  9 ----
   stubs/replay.c             | 98 ++++++++++++++++++++++++++++++++++++++
   tests/ptimer-test-stubs.c  |  5 --
   tests/qtest/qmp-cmd-test.c |  3 ++
   ui/input.c                 | 12 ++++-
   11 files changed, 125 insertions(+), 26 deletions(-)

delete mode 100644 stubs/replay-user.c

block/meson.build +2 -1
index 78e8b25232..01fe6f84d2 100644
@@ -7,7 +7,6 @@ block_ss.add(files(
     'backup-top.c',
     'blkdebug.c',
     'blklogwrites.c',
-  'blkreplay.c',
     'blkverify.c',
     'block-backend.c',
     'block-copy.c',
@@ -42,6 +41,8 @@ block_ss.add(files(
     'write-threshold.c',
   ), zstd, zlib)
 
+block_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
+
   block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c'))
   block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c'))
   block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c'))
migration/savevm.c +7 -4
index d2e141f7b1..d9181ca520 100644
@@ -63,6 +63,7 @@
   #include "migration/colo.h"
   #include "qemu/bitmap.h"
   #include "net/announce.h"
+#include "sysemu/tcg.h"
 
   const unsigned int postcopy_ram_discard_version = 0;
 
@@ -2674,10 +2675,12 @@ int save_snapshot(const char *name, Error **errp)
           return ret;
       }
 
-    if (!replay_can_snapshot()) {
-        error_setg(errp, "Record/replay does not allow making snapshot "
-                   "right now. Try once more later.");
-        return ret;
+    if (tcg_enabled()) {
+        if (!replay_can_snapshot()) {
+            error_setg(errp, "Record/replay does not allow making snapshot "
+                       "right now. Try once more later.");
+            return ret;
+        }
       }
 
       if (!bdrv_all_can_snapshot(&bs)) {
net/meson.build +2 -1
index 1c7e3a3cb9..1076b0a7ab 100644
@@ -7,7 +7,6 @@ softmmu_ss.add(files(
     'eth.c',
     'filter-buffer.c',
     'filter-mirror.c',
-  'filter-replay.c',
     'filter-rewriter.c',
     'filter.c',
     'hub.c',
@@ -17,6 +16,8 @@ softmmu_ss.add(files(
     'util.c',
   ))
 
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
+
   softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c'))
   softmmu_ss.add(when: slirp, if_true: files('slirp.c'))
   softmmu_ss.add(when: ['CONFIG_VDE', vde], if_true: files('vde.c'))
replay/meson.build +1 -1
index f91163fb1e..cb3207740a 100644
@@ -1,4 +1,4 @@
-softmmu_ss.add(files(
+softmmu_ss.add(when: 'CONFIG_TCG', if_true: files(
     'replay.c',
     'replay-internal.c',
     'replay-events.c',
replay/replay-input.c +1 -1
index 1147e3d34e..5d1fd92e79 100644
@@ -124,7 +124,7 @@ void replay_input_event(QemuConsole *src, InputEvent *evt)
       } else if (replay_mode == REPLAY_MODE_RECORD) {
           replay_add_input_event(QAPI_CLONE(InputEvent, evt));
       } else {
-        qemu_input_event_send_impl(src, evt);
+        g_assert_not_reached();
       }
   }
 
Quoted 12 lines
Quoted 8 lines

replay/replay-input.c void replay_input_sync_event(void) · line 140

Quoted 8 lines
replay/replay-input.c +1 -1
@@ -135,6 +135,6 @@ void replay_input_sync_event(void)
       } else if (replay_mode == REPLAY_MODE_RECORD) {
           replay_add_input_sync_event();
       } else {
-        qemu_input_event_sync_impl();
+        g_assert_not_reached();
       }
   }

incidentally Pavel, is this ok when replay is enabled, can you give it a spin?
I used the if (replay_events_enabled()) in the ui/input.c code to only call these when events are enabled.

I think this is ok to use this function for checking that replay is on.

Quoted 79 lines
Quoted 64 lines
Quoted 64 lines
stubs/meson.build +0 -1
index 67f2a8c069..bbd2230d69 100644
@@ -32,7 +32,6 @@ stub_ss.add(files('qtest.c'))
   stub_ss.add(files('ram-block.c'))
   stub_ss.add(files('ramfb.c'))
   stub_ss.add(files('replay.c'))
-stub_ss.add(files('replay-user.c'))
   stub_ss.add(files('runstate-check.c'))
   stub_ss.add(files('set-fd-handler.c'))
   stub_ss.add(files('sysbus.c'))
stubs/replay-user.c deleted +0 -9
deleted file mode 100644
index 2ad9e27203..0000000000
@@ -1,9 +0,0 @@
-#include "qemu/osdep.h"
-#include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
-
-void replay_bh_schedule_oneshot_event(AioContext *ctx,
-    QEMUBHFunc *cb, void *opaque)
-{
-    aio_bh_schedule_oneshot(ctx, cb, opaque);
-}
stubs/replay.c +26 -0
index 45ebe77fb9..34b7975b2d 100644
@@ -103,3 +103,101 @@ bool replay_reverse_continue(void)
   {
       return false;
   }
+
+void replay_input_event(QemuConsole *src, InputEvent *evt)
+{
+}
+void replay_input_sync_event(void)
+{
+}
+void replay_bh_schedule_event(QEMUBH *bh)
+{
+    qemu_bh_schedule(bh);
+}
+void replay_bh_schedule_oneshot_event(AioContext *ctx,
+     QEMUBHFunc *cb, void *opaque)
+{
+    aio_bh_schedule_oneshot(ctx, cb, opaque);
+}
+void replay_add_blocker(Error *reason)
+{
+}
+void replay_audio_in(size_t *recorded, void *samples, size_t *wpos, size_t size)
+{
+}
+void replay_audio_out(size_t *played)
+{
+}
+void replay_breakpoint(void)
Quoted 8 lines

stubs/replay.c bool replay_reverse_continue(void) · line 137

Quoted 6 lines
stubs/replay.c +6 -0
+{
+}
+bool replay_can_snapshot(void)
+{
+    return false;
+}

Shouldn't this one return true to enable snapshotting?

The check for replay_can_snapshot is wrapped by a

if (tcg_enabled()) {
}

Quoted 7 lines

so it should be fine.

Logically, reading a naked:

if (!replay_can_snapshot()) { fail; }

is surprising I think for a reader that compiled the code without replay.

Ok

#7 lore raw
In reply to Claudio Fontana

Hi all,

anything more for me to do here?

Quoted 18 lines · Claudio Fontana

This series now unbreaks current non-tcg builds (!CONFIG_TCG).

tests Makefiles need to avoid relying on all non-native archs binaries to be present,

bios-tables-test needs to skip tests that are tcg-only,

and notably the replay framework needs to consider that it might not be functional (or its code present at all) without TCG.

Tested ok target x86_64-softmmu on x86_64 host with:

./configure --enable-tcg --disable-kvm
./configure --enable-kvm --disable-tcg
./configure --enable-tcg --enable-kvm

Quoted 5 lines

running make check-qtest

v3 => v4:
* abandon attempts to avoid the code duplication and functional code in stubs, just providing the minimal changes to get things working.

Paolo, is the latest respin ok for you?

Thanks,

Claudio

Quoted 32 lines

v2 => v3:

* do not alter the replay api, provide a block wrapper instead to call into replay events handling
or the normal call flow depending on whether replay events are enabled.

v1: initial RFC

Claudio Fontana (2):
qtest: unbreak non-TCG builds in bios-tables-test
replay: do not build if TCG is not available

Paolo Bonzini (1):
tests/Makefile.include: unbreak non-tcg builds

 block/meson.build              |  3 +-
 migration/savevm.c             | 11 ++--
 net/meson.build                |  3 +-
 replay/meson.build             |  2 +-
 replay/replay-input.c          |  4 +-
 stubs/meson.build              |  1 -
 stubs/replay-user.c            |  9 ----
 stubs/replay.c                 | 98 ++++++++++++++++++++++++++++++++++
 tests/Makefile.include         |  2 +-
 tests/ptimer-test-stubs.c      |  5 --
 tests/qtest/bios-tables-test.c | 10 ++++
 tests/qtest/qmp-cmd-test.c     |  3 ++
 ui/input.c                     | 12 ++++-
 13 files changed, 136 insertions(+), 27 deletions(-)
 delete mode 100644 stubs/replay-user.c
#8 lore raw
Quoted 3 lines · Claudio Fontana

Hi all,

anything more for me to do here?

I think nothing, I picked up patch 1 due to conflicts but I was waiting for comments from Richard. I have now picked them up.

Paolo

Quoted 64 lines · Claudio Fontana
Quoted 18 lines

This series now unbreaks current non-tcg builds (!CONFIG_TCG).

tests Makefiles need to avoid relying on all non-native archs binaries to be present,

bios-tables-test needs to skip tests that are tcg-only,

and notably the replay framework needs to consider that it might not be functional (or its code present at all) without TCG.

Tested ok target x86_64-softmmu on x86_64 host with:

./configure --enable-tcg --disable-kvm
./configure --enable-kvm --disable-tcg
./configure --enable-tcg --enable-kvm

Quoted 5 lines

running make check-qtest

v3 => v4:
* abandon attempts to avoid the code duplication and functional code in stubs, just providing the minimal changes to get things working.

Paolo, is the latest respin ok for you?

Thanks,

Claudio

Quoted 32 lines

v2 => v3:

* do not alter the replay api, provide a block wrapper instead to call into replay events handling
or the normal call flow depending on whether replay events are enabled.

v1: initial RFC

Claudio Fontana (2):
qtest: unbreak non-TCG builds in bios-tables-test
replay: do not build if TCG is not available

Paolo Bonzini (1):
tests/Makefile.include: unbreak non-tcg builds

 block/meson.build              |  3 +-
 migration/savevm.c             | 11 ++--
 net/meson.build                |  3 +-
 replay/meson.build             |  2 +-
 replay/replay-input.c          |  4 +-
 stubs/meson.build              |  1 -
 stubs/replay-user.c            |  9 ----
 stubs/replay.c                 | 98 ++++++++++++++++++++++++++++++++++
 tests/Makefile.include         |  2 +-
 tests/ptimer-test-stubs.c      |  5 --
 tests/qtest/bios-tables-test.c | 10 ++++
 tests/qtest/qmp-cmd-test.c     |  3 ++
 ui/input.c                     | 12 ++++-
 13 files changed, 136 insertions(+), 27 deletions(-)
 delete mode 100644 stubs/replay-user.c