Disable a lot of code that I can't be bothered to convert right now. Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- tests/unit/meson.build | 2 +- tests/unit/test-coroutine.c | 6 ++++++ util/meson.build | 10 +++++----- util/qemu-coroutine-lock.c | 2 ++ util/qemu-coroutine-sleep.c | 2 ++ 5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 96b295263e..4ca5fdb699 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -61,7 +61,7 @@ endif if have_block tests += { - 'test-coroutine': [testblock], + 'test-coroutine': [], 'test-aio': [testblock], 'test-aio-multithread': [testblock], 'test-throttle': [testblock], diff --git a/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c index 82e22db070..c230c2fa6e 100644 --- a/tests/unit/test-coroutine.c +++ b/tests/unit/test-coroutine.c @@ -16,6 +16,7 @@ #include "qemu/coroutine_int.h" #include "qemu/lockable.h" +#if 0 /* * Check that qemu_in_coroutine() works */ @@ -638,11 +639,13 @@ static void perf_cost(void) duration, ops, (unsigned long)(1000000000.0 * duration / maxcycles)); } +#endif int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); +#if 0 /* This test assumes there is a freelist and marks freed coroutine memory * with a sentinel value. If there is no freelist this would legitimately * crash, so skip it. @@ -650,7 +653,9 @@ int main(int argc, char **argv) if (CONFIG_COROUTINE_POOL) { g_test_add_func("/basic/no-dangling-access", test_no_dangling_access); } +#endif +#if 0 g_test_add_func("/basic/lifecycle", test_lifecycle); g_test_add_func("/basic/yield", test_yield); g_test_add_func("/basic/nesting", test_nesting); @@ -669,5 +674,6 @@ int main(int argc, char **argv) g_test_add_func("/perf/function-call", perf_baseline); g_test_add_func("/perf/cost", perf_cost); } +#endif return g_test_run(); } diff --git a/util/meson.build b/util/meson.build index f6ee74ad0c..30949cd481 100644 --- a/util/meson.build +++ b/util/meson.build @@ -76,13 +76,13 @@ if have_block util_ss.add(files('lockcnt.c')) util_ss.add(files('main-loop.c')) util_ss.add(files('nvdimm-utils.c')) - util_ss.add(files('qemu-coroutine.c', 'qemu-coroutine-lock.c', 'qemu-coroutine-io.c')) - util_ss.add(when: 'CONFIG_LINUX', if_true: [ - files('vhost-user-server.c'), vhost_user - ]) + util_ss.add(files('qemu-coroutine.c', 'qemu-coroutine-lock.c')) # 'qemu-coroutine-io.c' +# util_ss.add(when: 'CONFIG_LINUX', if_true: [ +# files('vhost-user-server.c'), vhost_user +# ]) util_ss.add(files('block-helpers.c')) util_ss.add(files('qemu-coroutine-sleep.c')) - util_ss.add(files('qemu-co-shared-resource.c')) +# util_ss.add(files('qemu-co-shared-resource.c')) util_ss.add(files('thread-pool.c', 'qemu-timer.c')) util_ss.add(files('readline.c')) util_ss.add(files('throttle.c')) diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c index 3f12b53a31..d6c0565ba5 100644 --- a/util/qemu-coroutine-lock.c +++ b/util/qemu-coroutine-lock.c @@ -34,6 +34,7 @@ #include "block/aio.h" #include "trace.h" +#if 0 void qemu_co_queue_init(CoQueue *queue) { QSIMPLEQ_INIT(&queue->entries); @@ -465,3 +466,4 @@ void qemu_co_rwlock_upgrade(CoRwlock *lock) assert(lock->owners == -1); } } +#endif diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c index 571ab521ff..b5bfb4ad18 100644 --- a/util/qemu-coroutine-sleep.c +++ b/util/qemu-coroutine-sleep.c @@ -17,6 +17,7 @@ #include "qemu/timer.h" #include "block/aio.h" +#if 0 static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns"; void qemu_co_sleep_wake(QemuCoSleep *w) @@ -78,3 +79,4 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w, qemu_co_sleep(w); timer_del(&ts); } +#endif -- 2.35.1