Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Dr. David Alan Gilbert" <dave@treblig.org>, Hailiang Zhang <zhanghailiang@xfusion.com>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Jason Wang <jasowang@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>
block/meson.build | 2 +-
hmp-commands.hx | 2 +
include/migration/colo.h | 18 +++++-
meson_options.txt | 2 +
migration/colo.c | 100 +++++++++++++++++++--------------
migration/meson.build | 6 +-
migration/migration-hmp-cmds.c | 2 +
migration/migration.c | 51 +++++++----------
migration/migration.h | 11 +++-
migration/options.c | 6 +-
net/meson.build | 13 ++++-
qapi/migration.json | 9 ++-
scripts/meson-buildoptions.sh | 3 +
stubs/colo-compare.c | 7 +++
stubs/colo.c | 37 ++++++++++++
stubs/meson.build | 2 +
16 files changed, 181 insertions(+), 90 deletions(-)
create mode 100644 stubs/colo-compare.c
create mode 100644 stubs/colo.c