motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: Set migration error outside of migrate_cancel

Browse source 
There's no point passing the error into migration cancel only for it
to call migrate_set_error().

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20250213175927.19642-2-farosas@suse.de>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Fabiano Rosas 2025-02-13 14:59:19 -03:00
parent e0ad300fe1
commit a47f0cfba8
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
migration/migration.c
View file

@ -342,11 +342,8 @@ void migration_bh_schedule(QEMUBHFunc *cb, void *opaque)
qemu_bh_schedule(bh); qemu_bh_schedule(bh);
} }
void migration_cancel(const Error *error) void migration_cancel()
{ {
if (error) {
migrate_set_error(current_migration, error);
}
if (migrate_dirty_limit()) { if (migrate_dirty_limit()) {
qmp_cancel_vcpu_dirty_limit(false, -1, NULL); qmp_cancel_vcpu_dirty_limit(false, -1, NULL);
} }
@ -365,7 +362,7 @@ void migration_shutdown(void)
* Cancel the current migration - that will (eventually) * Cancel the current migration - that will (eventually)
* stop the migration using this structure * stop the migration using this structure
*/ */
migration_cancel(NULL); migration_cancel();
object_unref(OBJECT(current_migration)); object_unref(OBJECT(current_migration));
/* /*

2
migration/migration.h
View file

@ -563,7 +563,7 @@ void migration_make_urgent_request(void);
void migration_consume_urgent_request(void); void migration_consume_urgent_request(void);
bool migration_rate_limit(void); bool migration_rate_limit(void);
void migration_bh_schedule(QEMUBHFunc *cb, void *opaque); void migration_bh_schedule(QEMUBHFunc *cb, void *opaque);
void migration_cancel(const Error *error); void migration_cancel(void);
void migration_populate_vfio_info(MigrationInfo *info); void migration_populate_vfio_info(MigrationInfo *info);
void migration_reset_vfio_bytes_transferred(void); void migration_reset_vfio_bytes_transferred(void);

4
migration/ram.c
View file

@ -4465,8 +4465,10 @@ static void ram_mig_ram_block_resized(RAMBlockNotifier *n, void *host,
* Abort and indicate a proper reason. * Abort and indicate a proper reason.
*/ */
error_setg(&err, "RAM block '%s' resized during precopy.", rb->idstr); error_setg(&err, "RAM block '%s' resized during precopy.", rb->idstr);
migration_cancel(err); migrate_set_error(migrate_get_current(), err);
error_free(err); error_free(err);
migration_cancel();
} }
switch (ps) { switch (ps) {