From owner-svn-src-all@FreeBSD.ORG Sun Jul 20 16:47:32 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04836243; Sun, 20 Jul 2014 16:47:32 +0000 (UTC) Received: from mail-qc0-x22e.google.com (mail-qc0-x22e.google.com [IPv6:2607:f8b0:400d:c01::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74A2F2506; Sun, 20 Jul 2014 16:47:31 +0000 (UTC) Received: by mail-qc0-f174.google.com with SMTP id o8so4863635qcw.5 for ; Sun, 20 Jul 2014 09:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=o8KZ19Yxma7ZDFT8Lude7HPKySSlVLd96sfsxKxhh+A=; b=iUecXC0ziioCcYKx5Ep/SNCT+z/EVJp1VhaEfVv1hay1FpXMUu8oCL8NiOV2EjBMFF owSbiXIIm+ZjpT6wzA0iD/1WZ+P5QFs+BVvd1Mf8J2GZeAQ/fMCAyTmtJBhEr4DcqJoa PPvEsEx6wtsuqMssXgMf3FA69AlvBc+yolvGBaEa1qIeT6AlX+BIjsEyHV8aRbC+LmFc yoqAvGgUb8FpeR+DVOifCtwckzO9nO2tbXQNXMdLPDWFm6kyNARzCR0GmZPMMcHI46Rn qMUBvUeA8D9cVQiQi9mvaLvUnhCp/gK+mQvnstWbFGjCK0sXKaqqNNBrtszYskr0dED3 S4uA== MIME-Version: 1.0 X-Received: by 10.140.38.169 with SMTP id t38mr29607511qgt.3.1405874849085; Sun, 20 Jul 2014 09:47:29 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.1.6 with HTTP; Sun, 20 Jul 2014 09:47:29 -0700 (PDT) In-Reply-To: References: <201407192059.s6JKx8un072543@svn.freebsd.org> <20140720142354.GA1205@mole.fafoe.narf.at> Date: Sun, 20 Jul 2014 09:47:29 -0700 X-Google-Sender-Auth: zM6dkwRJn_BTyphrsDZ3-9dLaxk Message-ID: Subject: Re: svn commit: r268889 - in head: lib/libvmmapi sys/amd64/include sys/amd64/vmm sys/amd64/vmm/intel usr.sbin/bhyve usr.sbin/bhyvectl From: Adrian Chadd To: Neel Natu Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Stefan Farfeleder , "src-committers@freebsd.org" , Neel Natu X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2014 16:47:32 -0000 Thanks! -a On 20 July 2014 09:37, Neel Natu wrote: > Hi, > > On Sun, Jul 20, 2014 at 7:23 AM, Stefan Farfeleder wrote: >> Hi, >> >> On Sat, Jul 19, 2014 at 08:59:08PM +0000, Neel Natu wrote: >>> Author: neel >>> Date: Sat Jul 19 20:59:08 2014 >>> New Revision: 268889 >>> URL: http://svnweb.freebsd.org/changeset/base/268889 >> >> >> >>> Modified: head/sys/amd64/vmm/intel/vmx.c >>> ============================================================================== >>> --- head/sys/amd64/vmm/intel/vmx.c Sat Jul 19 20:55:13 2014 (r268888) >>> +++ head/sys/amd64/vmm/intel/vmx.c Sat Jul 19 20:59:08 2014 (r268889) >>> @@ -1213,22 +1213,31 @@ vmx_inject_interrupts(struct vmx *vmx, i >>> { >>> struct vm_exception exc; >>> int vector, need_nmi_exiting, extint_pending; >>> - uint64_t rflags; >>> + uint64_t rflags, entryinfo; >>> uint32_t gi, info; >>> >>> - if (vm_exception_pending(vmx->vm, vcpu, &exc)) { >>> - KASSERT(exc.vector >= 0 && exc.vector < 32, >>> - ("%s: invalid exception vector %d", __func__, exc.vector)); >>> + if (vm_entry_intinfo(vmx->vm, vcpu, &entryinfo)) { >>> + KASSERT((entryinfo & VMCS_INTR_VALID) != 0, ("%s: entry " >>> + "intinfo is not valid: %#lx", __func__, entryinfo)); >>> >>> info = vmcs_read(VMCS_ENTRY_INTR_INFO); >>> KASSERT((info & VMCS_INTR_VALID) == 0, ("%s: cannot inject " >>> "pending exception %d: %#x", __func__, exc.vector, info)); >>> >> >> /usr/src/sys/modules/vmm/../../amd64/vmm/intel/vmx.c:1214:22: error: unused variable 'exc' [-Werror,-Wunused-variable] >> struct vm_exception exc; >> ^ >> 1 error generated. >> >> Printing the uninitialised object in the KASSERT is most probably wrong. >> > > Fixed in r268922. > > best > Neel > >> BR, >> Stefan >