| Message ID | 20231011203527.9061-9-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Removal of QEMUFileHooks | expand |
On 12/10/2023 04:35, Juan Quintela wrote: > Reviewed-by: Peter Xu <peterx@redhat.com> > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Li Zhijian <lizhijian@fujitsu.com> > --- > migration/qemu-file.h | 17 ----------------- > migration/rdma.h | 16 ++++++++++++++++ > migration/ram.c | 2 +- > 3 files changed, 17 insertions(+), 18 deletions(-) > > diff --git a/migration/qemu-file.h b/migration/qemu-file.h > index 0b22d8335f..a29c37b0d0 100644 > --- a/migration/qemu-file.h > +++ b/migration/qemu-file.h > @@ -29,13 +29,6 @@ > #include "exec/cpu-common.h" > #include "io/channel.h" > > -/* > - * Constants used by ram_control_* hooks > - */ > -#define RAM_CONTROL_SETUP 0 > -#define RAM_CONTROL_ROUND 1 > -#define RAM_CONTROL_FINISH 3 > - > QEMUFile *qemu_file_new_input(QIOChannel *ioc); > QEMUFile *qemu_file_new_output(QIOChannel *ioc); > int qemu_fclose(QEMUFile *f); > @@ -101,16 +94,6 @@ void qemu_fflush(QEMUFile *f); > void qemu_file_set_blocking(QEMUFile *f, bool block); > int qemu_file_get_to_fd(QEMUFile *f, int fd, size_t size); > > -/* Whenever this is found in the data stream, the flags > - * will be passed to ram_control_load_hook in the incoming-migration > - * side. This lets before_ram_iterate/after_ram_iterate add > - * transport-specific sections to the RAM migration data. > - */ > -#define RAM_SAVE_FLAG_HOOK 0x80 > - > -#define RAM_SAVE_CONTROL_NOT_SUPP -1000 > -#define RAM_SAVE_CONTROL_DELAYED -2000 > - > QIOChannel *qemu_file_get_ioc(QEMUFile *file); > > #endif > diff --git a/migration/rdma.h b/migration/rdma.h > index 09a16c1e3c..1ff3718a76 100644 > --- a/migration/rdma.h > +++ b/migration/rdma.h > @@ -24,6 +24,22 @@ void rdma_start_outgoing_migration(void *opaque, const char *host_port, > > void rdma_start_incoming_migration(const char *host_port, Error **errp); > > +/* > + * Constants used by rdma return codes > + */ > +#define RAM_CONTROL_SETUP 0 > +#define RAM_CONTROL_ROUND 1 > +#define RAM_CONTROL_FINISH 3 > + > +/* > + * Whenever this is found in the data stream, the flags > + * will be passed to rdma functions in the incoming-migration > + * side. > + */ > +#define RAM_SAVE_FLAG_HOOK 0x80 > + > +#define RAM_SAVE_CONTROL_NOT_SUPP -1000 > +#define RAM_SAVE_CONTROL_DELAYED -2000 > > #ifdef CONFIG_RDMA > int qemu_rdma_registration_handle(QEMUFile *f); > diff --git a/migration/ram.c b/migration/ram.c > index fd5c61c739..f9bbd17028 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -89,7 +89,7 @@ > #define RAM_SAVE_FLAG_EOS 0x10 > #define RAM_SAVE_FLAG_CONTINUE 0x20 > #define RAM_SAVE_FLAG_XBZRLE 0x40 > -/* 0x80 is reserved in qemu-file.h for RAM_SAVE_FLAG_HOOK */ > +/* 0x80 is reserved in rdma.h for RAM_SAVE_FLAG_HOOK */ > #define RAM_SAVE_FLAG_COMPRESS_PAGE 0x100 > #define RAM_SAVE_FLAG_MULTIFD_FLUSH 0x200 > /* We can't use any flag that is bigger than 0x200 */
diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 0b22d8335f..a29c37b0d0 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -29,13 +29,6 @@ #include "exec/cpu-common.h" #include "io/channel.h" -/* - * Constants used by ram_control_* hooks - */ -#define RAM_CONTROL_SETUP 0 -#define RAM_CONTROL_ROUND 1 -#define RAM_CONTROL_FINISH 3 - QEMUFile *qemu_file_new_input(QIOChannel *ioc); QEMUFile *qemu_file_new_output(QIOChannel *ioc); int qemu_fclose(QEMUFile *f); @@ -101,16 +94,6 @@ void qemu_fflush(QEMUFile *f); void qemu_file_set_blocking(QEMUFile *f, bool block); int qemu_file_get_to_fd(QEMUFile *f, int fd, size_t size); -/* Whenever this is found in the data stream, the flags - * will be passed to ram_control_load_hook in the incoming-migration - * side. This lets before_ram_iterate/after_ram_iterate add - * transport-specific sections to the RAM migration data. - */ -#define RAM_SAVE_FLAG_HOOK 0x80 - -#define RAM_SAVE_CONTROL_NOT_SUPP -1000 -#define RAM_SAVE_CONTROL_DELAYED -2000 - QIOChannel *qemu_file_get_ioc(QEMUFile *file); #endif diff --git a/migration/rdma.h b/migration/rdma.h index 09a16c1e3c..1ff3718a76 100644 --- a/migration/rdma.h +++ b/migration/rdma.h @@ -24,6 +24,22 @@ void rdma_start_outgoing_migration(void *opaque, const char *host_port, void rdma_start_incoming_migration(const char *host_port, Error **errp); +/* + * Constants used by rdma return codes + */ +#define RAM_CONTROL_SETUP 0 +#define RAM_CONTROL_ROUND 1 +#define RAM_CONTROL_FINISH 3 + +/* + * Whenever this is found in the data stream, the flags + * will be passed to rdma functions in the incoming-migration + * side. + */ +#define RAM_SAVE_FLAG_HOOK 0x80 + +#define RAM_SAVE_CONTROL_NOT_SUPP -1000 +#define RAM_SAVE_CONTROL_DELAYED -2000 #ifdef CONFIG_RDMA int qemu_rdma_registration_handle(QEMUFile *f); diff --git a/migration/ram.c b/migration/ram.c index fd5c61c739..f9bbd17028 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -89,7 +89,7 @@ #define RAM_SAVE_FLAG_EOS 0x10 #define RAM_SAVE_FLAG_CONTINUE 0x20 #define RAM_SAVE_FLAG_XBZRLE 0x40 -/* 0x80 is reserved in qemu-file.h for RAM_SAVE_FLAG_HOOK */ +/* 0x80 is reserved in rdma.h for RAM_SAVE_FLAG_HOOK */ #define RAM_SAVE_FLAG_COMPRESS_PAGE 0x100 #define RAM_SAVE_FLAG_MULTIFD_FLUSH 0x200 /* We can't use any flag that is bigger than 0x200 */