On Tue, Mar 23, 2021 at 9:57 PM Lukas Straub <lukasstra...@web.de> wrote:
> Yank now only depends on util and can be always linked in. Also remove
> the stubs as they are not needed anymore.
>
> Signed-off-by: Lukas Straub <lukasstra...@web.de>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
> MAINTAINERS | 1 -
> stubs/meson.build | 1 -
> stubs/yank.c | 23 -----------------------
> util/meson.build | 2 +-
> 4 files changed, 1 insertion(+), 26 deletions(-)
> delete mode 100644 stubs/yank.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 455775c4a3..77259c031d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2820,7 +2820,6 @@ Yank feature
> M: Lukas Straub <lukasstra...@web.de>
> S: Odd fixes
> F: util/yank.c
> -F: stubs/yank.c
> F: migration/yank_functions*
> F: include/qemu/yank.h
> F: qapi/yank.json
> diff --git a/stubs/meson.build b/stubs/meson.build
> index 8a3e804cf0..be6f6d609e 100644
> --- a/stubs/meson.build
> +++ b/stubs/meson.build
> @@ -46,7 +46,6 @@ stub_ss.add(files('vm-stop.c'))
> stub_ss.add(files('win32-kbd-hook.c'))
> stub_ss.add(files('cpu-synchronize-state.c'))
> if have_block
> - stub_ss.add(files('yank.c'))
> stub_ss.add(files('replay-tools.c'))
> endif
> if have_system
> diff --git a/stubs/yank.c b/stubs/yank.c
> deleted file mode 100644
> index 11b24fc057..0000000000
> --- a/stubs/yank.c
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -#include "qemu/osdep.h"
> -#include "qemu/yank.h"
> -
> -bool yank_register_instance(const YankInstance *instance, Error **errp)
> -{
> - return true;
> -}
> -
> -void yank_unregister_instance(const YankInstance *instance)
> -{
> -}
> -
> -void yank_register_function(const YankInstance *instance,
> - YankFn *func,
> - void *opaque)
> -{
> -}
> -
> -void yank_unregister_function(const YankInstance *instance,
> - YankFn *func,
> - void *opaque)
> -{
> -}
> diff --git a/util/meson.build b/util/meson.build
> index 984fba965f..510765cde4 100644
> --- a/util/meson.build
> +++ b/util/meson.build
> @@ -43,6 +43,7 @@ util_ss.add(files('stats64.c'))
> util_ss.add(files('systemd.c'))
> util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c'))
> util_ss.add(files('guest-random.c'))
> +util_ss.add(files('yank.c'))
>
> if have_user
> util_ss.add(files('selfmap.c'))
> @@ -51,7 +52,6 @@ endif
> if have_system
> util_ss.add(files('crc-ccitt.c'))
> util_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus.c'), gio])
> - util_ss.add(files('yank.c'))
> util_ss.add(when: 'CONFIG_LINUX', if_true: files('userfaultfd.c'))
> endif
>
> --
> 2.30.2
>
--
Marc-André Lureau
