| Message ID | 20241024213056.1395400-6-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Migration: Make misc.h helpers available for whole VM lifecycle | expand |
On 10/24/24 23:30, Peter Xu wrote: > Now with the current migration_is_running(), it will report exactly the > opposite of what will be reported by migration_is_idle(). > > Drop migration_is_idle(), instead use "!migration_is_running()" which > should be identical on functionality. > > In reality, most of the idle check is inverted, so it's even easier to > write with "migrate_is_running()" check. > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > include/migration/misc.h | 1 - > hw/virtio/virtio-mem.c | 2 +- > migration/migration.c | 21 +-------------------- > migration/ram.c | 2 +- > system/qdev-monitor.c | 4 ++-- > 5 files changed, 5 insertions(+), 25 deletions(-) > > diff --git a/include/migration/misc.h b/include/migration/misc.h > index 86ef160f19..804eb23c06 100644 > --- a/include/migration/misc.h > +++ b/include/migration/misc.h > @@ -53,7 +53,6 @@ void dump_vmstate_json_to_file(FILE *out_fp); > void migration_object_init(void); > void migration_shutdown(void); > > -bool migration_is_idle(void); > bool migration_is_active(void); > bool migration_is_device(void); > bool migration_is_running(void); > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c > index ae1e81d7ba..80ada89551 100644 > --- a/hw/virtio/virtio-mem.c > +++ b/hw/virtio/virtio-mem.c > @@ -188,7 +188,7 @@ static bool virtio_mem_is_busy(void) > * after plugging them) until we're running on the destination (as we didn't > * migrate these blocks when they were unplugged). > */ > - return migration_in_incoming_postcopy() || !migration_is_idle(); > + return migration_in_incoming_postcopy() || migration_is_running(); > } > > typedef int (*virtio_mem_range_cb)(VirtIOMEM *vmem, void *arg, > diff --git a/migration/migration.c b/migration/migration.c > index 3365195def..f86c709699 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1636,25 +1636,6 @@ bool migration_in_bg_snapshot(void) > return migrate_background_snapshot() && migration_is_running(); > } > > -bool migration_is_idle(void) > -{ > - MigrationState *s = current_migration; > - > - if (!s) { > - return true; > - } > - > - switch (s->state) { > - case MIGRATION_STATUS_NONE: > - case MIGRATION_STATUS_CANCELLED: > - case MIGRATION_STATUS_COMPLETED: > - case MIGRATION_STATUS_FAILED: > - return true; > - default: > - return false; > - } > -} > - > bool migration_is_active(void) > { > MigrationState *s = current_migration; > @@ -1733,7 +1714,7 @@ static bool is_busy(Error **reasonp, Error **errp) > ERRP_GUARD(); > > /* Snapshots are similar to migrations, so check RUN_STATE_SAVE_VM too. */ > - if (runstate_check(RUN_STATE_SAVE_VM) || !migration_is_idle()) { > + if (runstate_check(RUN_STATE_SAVE_VM) || migration_is_running()) { > error_propagate_prepend(errp, *reasonp, > "disallowing migration blocker " > "(migration/snapshot in progress) for: "); > diff --git a/migration/ram.c b/migration/ram.c > index 5646a0b882..504b48d584 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -4498,7 +4498,7 @@ static void ram_mig_ram_block_resized(RAMBlockNotifier *n, void *host, > return; > } > > - if (!migration_is_idle()) { > + if (migration_is_running()) { > /* > * Precopy code on the source cannot deal with the size of RAM blocks > * changing at random points in time - especially after sending the > diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c > index 1310f35c9f..83fa684475 100644 > --- a/system/qdev-monitor.c > +++ b/system/qdev-monitor.c > @@ -686,7 +686,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts, > return NULL; > } > > - if (!migration_is_idle()) { > + if (migration_is_running()) { > error_setg(errp, "device_add not allowed while migrating"); > return NULL; > } > @@ -935,7 +935,7 @@ void qdev_unplug(DeviceState *dev, Error **errp) > return; > } > > - if (!migration_is_idle() && !dev->allow_unplug_during_migration) { > + if (migration_is_running() && !dev->allow_unplug_during_migration) { > error_setg(errp, "device_del not allowed while migrating"); > return; > }
diff --git a/include/migration/misc.h b/include/migration/misc.h index 86ef160f19..804eb23c06 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -53,7 +53,6 @@ void dump_vmstate_json_to_file(FILE *out_fp); void migration_object_init(void); void migration_shutdown(void); -bool migration_is_idle(void); bool migration_is_active(void); bool migration_is_device(void); bool migration_is_running(void); diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index ae1e81d7ba..80ada89551 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -188,7 +188,7 @@ static bool virtio_mem_is_busy(void) * after plugging them) until we're running on the destination (as we didn't * migrate these blocks when they were unplugged). */ - return migration_in_incoming_postcopy() || !migration_is_idle(); + return migration_in_incoming_postcopy() || migration_is_running(); } typedef int (*virtio_mem_range_cb)(VirtIOMEM *vmem, void *arg, diff --git a/migration/migration.c b/migration/migration.c index 3365195def..f86c709699 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1636,25 +1636,6 @@ bool migration_in_bg_snapshot(void) return migrate_background_snapshot() && migration_is_running(); } -bool migration_is_idle(void) -{ - MigrationState *s = current_migration; - - if (!s) { - return true; - } - - switch (s->state) { - case MIGRATION_STATUS_NONE: - case MIGRATION_STATUS_CANCELLED: - case MIGRATION_STATUS_COMPLETED: - case MIGRATION_STATUS_FAILED: - return true; - default: - return false; - } -} - bool migration_is_active(void) { MigrationState *s = current_migration; @@ -1733,7 +1714,7 @@ static bool is_busy(Error **reasonp, Error **errp) ERRP_GUARD(); /* Snapshots are similar to migrations, so check RUN_STATE_SAVE_VM too. */ - if (runstate_check(RUN_STATE_SAVE_VM) || !migration_is_idle()) { + if (runstate_check(RUN_STATE_SAVE_VM) || migration_is_running()) { error_propagate_prepend(errp, *reasonp, "disallowing migration blocker " "(migration/snapshot in progress) for: "); diff --git a/migration/ram.c b/migration/ram.c index 5646a0b882..504b48d584 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4498,7 +4498,7 @@ static void ram_mig_ram_block_resized(RAMBlockNotifier *n, void *host, return; } - if (!migration_is_idle()) { + if (migration_is_running()) { /* * Precopy code on the source cannot deal with the size of RAM blocks * changing at random points in time - especially after sending the diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 1310f35c9f..83fa684475 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -686,7 +686,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts, return NULL; } - if (!migration_is_idle()) { + if (migration_is_running()) { error_setg(errp, "device_add not allowed while migrating"); return NULL; } @@ -935,7 +935,7 @@ void qdev_unplug(DeviceState *dev, Error **errp) return; } - if (!migration_is_idle() && !dev->allow_unplug_during_migration) { + if (migration_is_running() && !dev->allow_unplug_during_migration) { error_setg(errp, "device_del not allowed while migrating"); return; }
Now with the current migration_is_running(), it will report exactly the opposite of what will be reported by migration_is_idle(). Drop migration_is_idle(), instead use "!migration_is_running()" which should be identical on functionality. In reality, most of the idle check is inverted, so it's even easier to write with "migrate_is_running()" check. Signed-off-by: Peter Xu <peterx@redhat.com> --- include/migration/misc.h | 1 - hw/virtio/virtio-mem.c | 2 +- migration/migration.c | 21 +-------------------- migration/ram.c | 2 +- system/qdev-monitor.c | 4 ++-- 5 files changed, 5 insertions(+), 25 deletions(-)