On Wed, May 17, 2017 at 05:47:48PM +0200, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Peter Xu <pet...@redhat.com> > --- > include/migration/migration.h | 4 ---- > migration/ram.c | 1 + > migration/xbzrle.c | 2 +- > migration/xbzrle.h | 21 +++++++++++++++++++++ > tests/test-xbzrle.c | 2 +- > 5 files changed, 24 insertions(+), 6 deletions(-) > create mode 100644 migration/xbzrle.h > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index b80a6ed..7d1eef7 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -251,10 +251,6 @@ bool migrate_zero_blocks(void); > > bool migrate_auto_converge(void); > > -int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, > - uint8_t *dst, int dlen); > -int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); > - > int migrate_use_xbzrle(void); > int64_t migrate_xbzrle_cache_size(void); > bool migrate_colo_enabled(void); > diff --git a/migration/ram.c b/migration/ram.c > index 76c118c..2564c00 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -35,6 +35,7 @@ > #include "qemu/bitmap.h" > #include "qemu/timer.h" > #include "qemu/main-loop.h" > +#include "xbzrle.h" > #include "migration/migration.h" > #include "postcopy-ram.h" > #include "exec/address-spaces.h" > diff --git a/migration/xbzrle.c b/migration/xbzrle.c > index c858339..1ba482d 100644 > --- a/migration/xbzrle.c > +++ b/migration/xbzrle.c > @@ -12,7 +12,7 @@ > */ > #include "qemu/osdep.h" > #include "qemu/cutils.h" > -#include "include/migration/migration.h" > +#include "xbzrle.h" > > /* > page = zrun nzrun > diff --git a/migration/xbzrle.h b/migration/xbzrle.h > new file mode 100644 > index 0000000..a0db507 > --- /dev/null > +++ b/migration/xbzrle.h > @@ -0,0 +1,21 @@ > +/* > + * QEMU live migration > + * > + * Copyright IBM, Corp. 2008 > + * > + * Authors: > + * Anthony Liguori <aligu...@us.ibm.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See > + * the COPYING file in the top-level directory. > + * > + */ > + > +#ifndef QEMU_MIGRATION_XBZRLE_H > +#define QEMU_MIGRATION_XBZRLE_H > + > +int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, > + uint8_t *dst, int dlen); > + > +int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); > +#endif > diff --git a/tests/test-xbzrle.c b/tests/test-xbzrle.c > index 49f6419..f5e08de 100644 > --- a/tests/test-xbzrle.c > +++ b/tests/test-xbzrle.c > @@ -13,7 +13,7 @@ > #include "qemu/osdep.h" > #include "qemu-common.h" > #include "qemu/cutils.h" > -#include "include/migration/migration.h" > +#include "../migration/xbzrle.h" > > #define PAGE_SIZE 4096 > > -- > 2.9.3 > -- Peter Xu
