Skip to content

Commit 857f504

Browse files
committed
colo: move stubs out of stubs/
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 <[email protected]> Message-ID: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 2c888fe commit 857f504

File tree

5 files changed

+4
-2
lines changed

5 files changed

+4
-2
lines changed
File renamed without changes.

migration/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ system_ss.add(files(
3434

3535
if get_option('replication').allowed()
3636
system_ss.add(files('colo-failover.c', 'colo.c'))
37+
else
38+
system_ss.add(files('colo-stubs.c'))
3739
endif
3840

3941
system_ss.add(when: rdma, if_true: files('rdma.c'))
File renamed without changes.

net/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ if get_option('replication').allowed() or \
2020
get_option('colo_proxy').allowed()
2121
system_ss.add(files('colo-compare.c'))
2222
system_ss.add(files('colo.c'))
23+
else
24+
system_ss.add(files('colo-stubs.c'))
2325
endif
2426

2527
if get_option('colo_proxy').allowed()

stubs/meson.build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ stub_ss.add(files('target-get-monitor-def.c'))
4242
stub_ss.add(files('target-monitor-defs.c'))
4343
stub_ss.add(files('trace-control.c'))
4444
stub_ss.add(files('uuid.c'))
45-
stub_ss.add(files('colo.c'))
46-
stub_ss.add(files('colo-compare.c'))
4745
stub_ss.add(files('vmstate.c'))
4846
stub_ss.add(files('vm-stop.c'))
4947
stub_ss.add(files('win32-kbd-hook.c'))

0 commit comments

Comments
 (0)