| Message ID | 20190808150325.21939-2-marcandre.lureau@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add dbus-vmstate | expand |
* Marc-André Lureau (marcandre.lureau@redhat.com) wrote: > Move migration helpers for strings under include/, so they can be used > outside of migration/ > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Reviewed-by: Juan Quintela <quintela@redhat.com> I've queued this one (just 1/2) for the migration pull I'll do as soon as 4.2 opens. > --- > include/migration/qemu-file-types.h | 4 ++++ > migration/qemu-file.h | 4 ---- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/migration/qemu-file-types.h b/include/migration/qemu-file-types.h > index c0a1988155..2867e3da84 100644 > --- a/include/migration/qemu-file-types.h > +++ b/include/migration/qemu-file-types.h > @@ -161,6 +161,10 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv) > qemu_get_be64s(f, (uint64_t *)pv); > } > > +size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); > + > +void qemu_put_counted_string(QEMUFile *f, const char *name); > + > int qemu_file_rate_limit(QEMUFile *f); > > #endif > diff --git a/migration/qemu-file.h b/migration/qemu-file.h > index 13baf896bd..185d3de505 100644 > --- a/migration/qemu-file.h > +++ b/migration/qemu-file.h > @@ -155,8 +155,6 @@ QEMUFile *qemu_file_get_return_path(QEMUFile *f); > void qemu_fflush(QEMUFile *f); > void qemu_file_set_blocking(QEMUFile *f, bool block); > > -size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); > - > void ram_control_before_iterate(QEMUFile *f, uint64_t flags); > void ram_control_after_iterate(QEMUFile *f, uint64_t flags); > void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data); > @@ -175,6 +173,4 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, > ram_addr_t offset, size_t size, > uint64_t *bytes_sent); > > -void qemu_put_counted_string(QEMUFile *f, const char *name); > - > #endif > -- > 2.23.0.rc1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/qemu-file-types.h b/include/migration/qemu-file-types.h index c0a1988155..2867e3da84 100644 --- a/include/migration/qemu-file-types.h +++ b/include/migration/qemu-file-types.h @@ -161,6 +161,10 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv) qemu_get_be64s(f, (uint64_t *)pv); } +size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); + +void qemu_put_counted_string(QEMUFile *f, const char *name); + int qemu_file_rate_limit(QEMUFile *f); #endif diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 13baf896bd..185d3de505 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -155,8 +155,6 @@ QEMUFile *qemu_file_get_return_path(QEMUFile *f); void qemu_fflush(QEMUFile *f); void qemu_file_set_blocking(QEMUFile *f, bool block); -size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); - void ram_control_before_iterate(QEMUFile *f, uint64_t flags); void ram_control_after_iterate(QEMUFile *f, uint64_t flags); void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data); @@ -175,6 +173,4 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, ram_addr_t offset, size_t size, uint64_t *bytes_sent); -void qemu_put_counted_string(QEMUFile *f, const char *name); - #endif