Commit 2667c987 authored by Fangrui Song's avatar Fangrui Song Committed by Juan Quintela
Browse files

migration: Fix incorrect integer->float conversion caught by clang 



Clang does not like qmp_migrate_set_downtime()'s code to clamp double
@value to 0..INT64_MAX:

    qemu/migration/migration.c:2038:24: error: implicit conversion from 'long' to 'double' changes value from 9223372036854775807 to 9223372036854775808 [-Werror,-Wimplicit-int-float-conversion]

The warning will be enabled by default in clang 10. It is not
available for clang <= 9.

The clamp is actually useless; @value is checked to be within
0..MAX_MIGRATE_DOWNTIME_SECONDS immediately before.  Delete it.

While there, make the conversion from double to int64_t explicit.

Signed-off-by: default avatarFangrui Song <i@maskray.me>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
[Patch split, commit message improved]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 97e1e067

migration/migration.c

+1 −2
Original line number Diff line number Diff line
@@ -2035,11 +2035,10 @@ void qmp_migrate_set_downtime(double value, Error **errp) 
    }



    value *= 1000; /* Convert to milliseconds */

    value = MAX(0, MIN(INT64_MAX, value));



    MigrateSetParameters p = {

        .has_downtime_limit = true,

        .downtime_limit = value,

        .downtime_limit = (int64_t)value,

    };



    qmp_migrate_set_parameters(&p, errp);