[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 15/18] colo: move stubs out of stubs/
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 15/18] colo: move stubs out of stubs/ |
Date: |
Mon, 8 Apr 2024 17:53:27 +0200 |
Since the colo stubs are needed exactly when the build options are not
enabled, move them together with the code they stub.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
stubs/colo.c => migration/colo-stubs.c | 0
stubs/colo-compare.c => net/colo-stubs.c | 0
migration/meson.build | 2 ++
net/meson.build | 2 ++
stubs/meson.build | 2 --
5 files changed, 4 insertions(+), 2 deletions(-)
rename stubs/colo.c => migration/colo-stubs.c (100%)
rename stubs/colo-compare.c => net/colo-stubs.c (100%)
diff --git a/stubs/colo.c b/migration/colo-stubs.c
similarity index 100%
rename from stubs/colo.c
rename to migration/colo-stubs.c
diff --git a/stubs/colo-compare.c b/net/colo-stubs.c
similarity index 100%
rename from stubs/colo-compare.c
rename to net/colo-stubs.c
diff --git a/migration/meson.build b/migration/meson.build
index 1eeb915ff63..f76b1ba3289 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -34,6 +34,8 @@ system_ss.add(files(
if get_option('replication').allowed()
system_ss.add(files('colo-failover.c', 'colo.c'))
+else
+ system_ss.add(files('colo-stubs.c'))
endif
system_ss.add(when: rdma, if_true: files('rdma.c'))
diff --git a/net/meson.build b/net/meson.build
index 9432a588e4e..e0cd71470e0 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -20,6 +20,8 @@ if get_option('replication').allowed() or \
get_option('colo_proxy').allowed()
system_ss.add(files('colo-compare.c'))
system_ss.add(files('colo.c'))
+else
+ system_ss.add(files('colo-stubs.c'))
endif
if get_option('colo_proxy').allowed()
diff --git a/stubs/meson.build b/stubs/meson.build
index a4404e765ab..a252bffad00 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -42,8 +42,6 @@ stub_ss.add(files('target-get-monitor-def.c'))
stub_ss.add(files('target-monitor-defs.c'))
stub_ss.add(files('trace-control.c'))
stub_ss.add(files('uuid.c'))
-stub_ss.add(files('colo.c'))
-stub_ss.add(files('colo-compare.c'))
stub_ss.add(files('vmstate.c'))
stub_ss.add(files('vm-stop.c'))
stub_ss.add(files('win32-kbd-hook.c'))
--
2.44.0
- [PATCH v2 11/18] hw/virtio: move stubs out of stubs/, (continued)
- [PATCH v2 11/18] hw/virtio: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 12/18] semihosting: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 13/18] ramfb: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 14/18] memory-device: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 15/18] colo: move stubs out of stubs/,
Paolo Bonzini <=
- [PATCH v2 17/18] stubs: include stubs only if needed, Paolo Bonzini, 2024/04/08
- [PATCH v2 16/18] stubs: split record/replay stubs further, Paolo Bonzini, 2024/04/08
- [PATCH v2 18/18] stubs: move monitor_fdsets_cleanup with other fdset stubs, Paolo Bonzini, 2024/04/08