Blame SOURCES/0037-kvm-avoid-bogus-vcpu_info-assignment-in-vcpu_registe.patch
|
 |
8f7639 |
From 9446038e9face3313373ca5f7539476789fd4660 Mon Sep 17 00:00:00 2001
|
|
|
8f7639 |
From: Eugene Syromyatnikov <evgsyr@gmail.com>
|
|
|
8f7639 |
Date: Tue, 18 Dec 2018 05:37:30 +0100
|
|
|
8f7639 |
Subject: [PATCH] kvm: avoid bogus vcpu_info assignment in vcpu_register
|
|
|
8f7639 |
|
|
|
8f7639 |
Also reformat code a bit to make nesting a bit clearer.
|
|
|
8f7639 |
|
|
|
8f7639 |
Reported by Clang.
|
|
|
8f7639 |
|
|
|
8f7639 |
* kvm.c (vcpu_register): Do not assign vcpu_alloc result to vcpu_info
|
|
|
8f7639 |
as this value is not used afterwards in the function.
|
|
|
8f7639 |
---
|
|
|
8f7639 |
kvm.c | 7 +++----
|
|
|
8f7639 |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
8f7639 |
|
|
|
8f7639 |
diff --git a/kvm.c b/kvm.c
|
|
|
8f7639 |
index 984a75e..8bdf1cc 100644
|
|
|
8f7639 |
--- a/kvm.c
|
|
|
8f7639 |
+++ b/kvm.c
|
|
|
8f7639 |
@@ -76,10 +76,9 @@ vcpu_register(struct tcb *const tcp, int fd, int cpuid)
|
|
|
8f7639 |
|
|
|
8f7639 |
struct vcpu_info *vcpu_info = vcpu_find(tcp, fd);
|
|
|
8f7639 |
|
|
|
8f7639 |
- if (!vcpu_info)
|
|
|
8f7639 |
- vcpu_info = vcpu_alloc(tcp, fd, cpuid);
|
|
|
8f7639 |
- else if (vcpu_info->cpuid != cpuid)
|
|
|
8f7639 |
- {
|
|
|
8f7639 |
+ if (!vcpu_info) {
|
|
|
8f7639 |
+ vcpu_alloc(tcp, fd, cpuid);
|
|
|
8f7639 |
+ } else if (vcpu_info->cpuid != cpuid) {
|
|
|
8f7639 |
vcpu_info->cpuid = cpuid;
|
|
|
8f7639 |
vcpu_info->resolved = false;
|
|
|
8f7639 |
}
|
|
|
8f7639 |
--
|
|
|
8f7639 |
2.1.4
|
|
|
8f7639 |
|