* Juan Quintela (quint...@redhat.com) wrote:
> Otherwise we are setting err twice, what is wrong and causes an abort.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Queued just this one.
> ---
> hmp.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index 92941142af..8eec768088 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1825,8 +1825,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const
> QDict *qdict)
> case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
> p->has_xbzrle_cache_size = true;
> visit_type_size(v, param, &cache_size, &err);
> - if (err || cache_size > INT64_MAX
> - || (size_t)cache_size != cache_size) {
> + if (err) {
> + break;
> + }
> + if (cache_size > INT64_MAX || (size_t)cache_size != cache_size) {
> error_setg(&err, "Invalid size %s", valuestr);
> break;
> }
> --
> 2.20.1
>
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
