| Message ID | 20200903152646.93336-3-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration/postcopy: Sync faulted addresses after network recovered | expand |
* Peter Xu (peterx@redhat.com) wrote: > This is another layer wrapper for sending a page request to the source VM, Ah, it's not obvious why this is needed until 4/5 :-) Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > migration/migration.c | 10 ++++++++-- > migration/migration.h | 2 ++ > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 6761e3f233..6b43ffddbd 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -316,8 +316,8 @@ error: > * Start: Address offset within the RB > * Len: Length in bytes required - must be a multiple of pagesize > */ > -int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, > - ram_addr_t start) > +int migrate_send_rp_message_req_pages(MigrationIncomingState *mis, > + RAMBlock *rb, ram_addr_t start) > { > uint8_t bufc[12 + 1 + 255]; /* start (8), len (4), rbname up to 256 */ > size_t msglen = 12; /* start + len */ > @@ -353,6 +353,12 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, > return migrate_send_rp_message(mis, msg_type, msglen, bufc); > } > > +int migrate_send_rp_req_pages(MigrationIncomingState *mis, > + RAMBlock *rb, ram_addr_t start) > +{ > + return migrate_send_rp_message_req_pages(mis, rb, start); > +} > + > static bool migration_colo_enabled; > bool migration_incoming_colo_enabled(void) > { > diff --git a/migration/migration.h b/migration/migration.h > index ca8dc4c773..f552725305 100644 > --- a/migration/migration.h > +++ b/migration/migration.h > @@ -330,6 +330,8 @@ void migrate_send_rp_pong(MigrationIncomingState *mis, > uint32_t value); > int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, > ram_addr_t start); > +int migrate_send_rp_message_req_pages(MigrationIncomingState *mis, > + RAMBlock *rb, ram_addr_t start); > void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis, > char *block_name); > void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value); > -- > 2.26.2 >
On Tue, Sep 08, 2020 at 10:57:57AM +0100, Dr. David Alan Gilbert wrote: > * Peter Xu (peterx@redhat.com) wrote: > > This is another layer wrapper for sending a page request to the source VM, > > Ah, it's not obvious why this is needed until 4/5 :-) Yeah. :) I'll try to move this to be before that one in the next version. > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Thanks!
diff --git a/migration/migration.c b/migration/migration.c index 6761e3f233..6b43ffddbd 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -316,8 +316,8 @@ error: * Start: Address offset within the RB * Len: Length in bytes required - must be a multiple of pagesize */ -int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, - ram_addr_t start) +int migrate_send_rp_message_req_pages(MigrationIncomingState *mis, + RAMBlock *rb, ram_addr_t start) { uint8_t bufc[12 + 1 + 255]; /* start (8), len (4), rbname up to 256 */ size_t msglen = 12; /* start + len */ @@ -353,6 +353,12 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, return migrate_send_rp_message(mis, msg_type, msglen, bufc); } +int migrate_send_rp_req_pages(MigrationIncomingState *mis, + RAMBlock *rb, ram_addr_t start) +{ + return migrate_send_rp_message_req_pages(mis, rb, start); +} + static bool migration_colo_enabled; bool migration_incoming_colo_enabled(void) { diff --git a/migration/migration.h b/migration/migration.h index ca8dc4c773..f552725305 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -330,6 +330,8 @@ void migrate_send_rp_pong(MigrationIncomingState *mis, uint32_t value); int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, ram_addr_t start); +int migrate_send_rp_message_req_pages(MigrationIncomingState *mis, + RAMBlock *rb, ram_addr_t start); void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis, char *block_name); void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
This is another layer wrapper for sending a page request to the source VM, Signed-off-by: Peter Xu <peterx@redhat.com> --- migration/migration.c | 10 ++++++++-- migration/migration.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)