diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-08 17:53:27 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-18 11:17:27 +0200 |
| commit | 857f504cf279a063e375c32e88d5cf3312d6b30c (patch) | |
| tree | 70f66c3b884dc10d720ab872369a611cb003e50b | |
| parent | 2c888febdfa0290a9e1d1f2133b2a24de47f6120 (diff) | |
| download | qemu-857f504cf279a063e375c32e88d5cf3312d6b30c.zip qemu-857f504cf279a063e375c32e88d5cf3312d6b30c.tar.gz qemu-857f504cf279a063e375c32e88d5cf3312d6b30c.tar.bz2 | |
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 <pbonzini@redhat.com>
Message-ID: <20240408155330.522792-16-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | migration/colo-stubs.c (renamed from stubs/colo.c) | 0 | ||||
| -rw-r--r-- | migration/meson.build | 2 | ||||
| -rw-r--r-- | net/colo-stubs.c (renamed from stubs/colo-compare.c) | 0 | ||||
| -rw-r--r-- | net/meson.build | 2 | ||||
| -rw-r--r-- | stubs/meson.build | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/stubs/colo.c b/migration/colo-stubs.c index f8c069b..f8c069b 100644 --- a/stubs/colo.c +++ b/migration/colo-stubs.c diff --git a/migration/meson.build b/migration/meson.build index 1eeb915..f76b1ba 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/stubs/colo-compare.c b/net/colo-stubs.c index ec72666..ec72666 100644 --- a/stubs/colo-compare.c +++ b/net/colo-stubs.c diff --git a/net/meson.build b/net/meson.build index 9432a58..e0cd714 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 a4404e7..a252bff 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')) |