From 68c0b85ecb07c8cefcf4f4a2ffc28e123baa9e8c Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Mon, 9 Mar 2020 10:30:39 +0100 Subject: [PATCH] cpu: Change control flow in virCPUUpdateLive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The updateLive CPU sub-driver function is supposed to be called only for a subset of CPU definitions. Let's make it more obvious by turning a negative test and return into a positive check. Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- src/cpu/cpu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 6d6191fe4e..c461c4839d 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -647,13 +647,14 @@ virCPUUpdateLive(virArch arch, if (!driver->updateLive) return 1; - if (cpu->mode != VIR_CPU_MODE_CUSTOM) - return 1; + if (cpu->mode == VIR_CPU_MODE_CUSTOM) { + if (driver->updateLive(cpu, dataEnabled, dataDisabled) < 0) + return -1; - if (driver->updateLive(cpu, dataEnabled, dataDisabled) < 0) - return -1; + return 0; + } - return 0; + return 1; } -- GitLab