From: Jan Beulich Date: Thu, 19 Jul 2018 09:54:45 +0000 (+0200) Subject: VMX: fix vmx_{find,del}_msr() build X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1840f825b086304a171ee5a7389aac2dc65b3017;p=xen.git VMX: fix vmx_{find,del}_msr() build Older gcc at -O2 (and perhaps higher) does not recognize that apparently uninitialized variables aren't really uninitialized. Pull out the assignments used by two of the three case blocks and make them initializers of the variables, as I think I had suggested during review. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Acked-by: Kevin Tian (cherry picked from commit 97cb0516a322ecdf0032fa9d8aa1525c03d7772f) --- diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index dc0e6a43c5..732b7e08ea 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1317,7 +1317,8 @@ struct vmx_msr_entry *vmx_find_msr(const struct vcpu *v, uint32_t msr, { const struct arch_vmx_struct *vmx = &v->arch.hvm_vmx; struct vmx_msr_entry *start = NULL, *ent, *end; - unsigned int substart, subend, total; + unsigned int substart = 0, subend = vmx->msr_save_count; + unsigned int total = vmx->msr_load_count; ASSERT(v == current || !vcpu_runnable(v)); @@ -1325,23 +1326,18 @@ struct vmx_msr_entry *vmx_find_msr(const struct vcpu *v, uint32_t msr, { case VMX_MSR_HOST: start = vmx->host_msr_area; - substart = 0; subend = vmx->host_msr_count; total = subend; break; case VMX_MSR_GUEST: start = vmx->msr_area; - substart = 0; - subend = vmx->msr_save_count; - total = vmx->msr_load_count; break; case VMX_MSR_GUEST_LOADONLY: start = vmx->msr_area; - substart = vmx->msr_save_count; - subend = vmx->msr_load_count; - total = subend; + substart = subend; + subend = total; break; default: