From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKNhH-0001Iu-4Z for qemu-devel@nongnu.org; Mon, 12 Jun 2017 07:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKNhE-0007AM-1p for qemu-devel@nongnu.org; Mon, 12 Jun 2017 07:39:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58634) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKNhD-0007AI-Oy for qemu-devel@nongnu.org; Mon, 12 Jun 2017 07:39:47 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88E3F80F8F for ; Mon, 12 Jun 2017 11:39:46 +0000 (UTC) References: <20170601212921.30241-1-quintela@redhat.com> <20170601212921.30241-8-quintela@redhat.com> From: Laurent Vivier Message-ID: <36fd7d5a-8f20-b366-1704-9dc8951c154b@redhat.com> Date: Mon, 12 Jun 2017 13:39:42 +0200 MIME-Version: 1.0 In-Reply-To: <20170601212921.30241-8-quintela@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 07/11] migration: ram_control_* are implemented in qemu_file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org Cc: dgilbert@redhat.com, peterx@redhat.com On 01/06/2017 23:29, Juan Quintela wrote: > Signed-off-by: Juan Quintela Reviewed-by: Laurent Vivier > --- > include/migration/migration.h | 18 ------------------ > migration/qemu-file.h | 17 +++++++++++++++++ > 2 files changed, 17 insertions(+), 18 deletions(-) > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 108212c..cb894b8 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -171,24 +171,6 @@ void migrate_send_rp_pong(MigrationIncomingState *mis, > void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname, > ram_addr_t start, size_t len); > > -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); > - > -/* 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 > - > -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 savevm_skip_section_footers(void); > void register_global_state(void); > void global_state_set_optional(void); > diff --git a/migration/qemu-file.h b/migration/qemu-file.h > index 49fd697..aae4e5e 100644 > --- a/migration/qemu-file.h > +++ b/migration/qemu-file.h > @@ -156,5 +156,22 @@ 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); > + > +/* 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 > + > +size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, > + ram_addr_t offset, size_t size, > + uint64_t *bytes_sent); > > #endif >