"rc" is written immediately below the outer if(). Fold the remaining two if()s.
Coverity ID: 1532320 Fixes: 685e922d6f30 ("tools/libxc: Rework xc_cpuid_apply_policy() to use {get,set}_cpu_policy()") Signed-off-by: Jan Beulich <jbeul...@suse.com> --- The code in question was subsequently moved by 54463aa79dac ("x86/hvm: Disable MPX by default"). --- a/tools/libs/guest/xg_cpuid_x86.c +++ b/tools/libs/guest/xg_cpuid_x86.c @@ -462,17 +462,12 @@ int xc_cpuid_apply_policy(xc_interface * /* Get the host policy. */ rc = xc_get_cpu_featureset(xch, XEN_SYSCTL_cpu_featureset_host, &len, host_featureset); - if ( rc ) + /* Tolerate "buffer too small", as we've got the bits we need. */ + if ( rc && errno != ENOBUFS ) { - /* Tolerate "buffer too small", as we've got the bits we need. */ - if ( errno == ENOBUFS ) - rc = 0; - else - { - PERROR("Failed to obtain host featureset"); - rc = -errno; - goto out; - } + PERROR("Failed to obtain host featureset"); + rc = -errno; + goto out; } /* Get the domain's default policy. */