From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 04:57:17 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7F90C25; Sat, 11 Oct 2014 04:57:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D48C434C; Sat, 11 Oct 2014 04:57:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B4vHcY027474; Sat, 11 Oct 2014 04:57:17 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B4vHnP027473; Sat, 11 Oct 2014 04:57:17 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201410110457.s9B4vHnP027473@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Sat, 11 Oct 2014 04:57:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272930 - projects/bhyve_svm/sys/amd64/vmm/amd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Oct 2014 04:57:18 -0000 Author: neel Date: Sat Oct 11 04:57:17 2014 New Revision: 272930 URL: https://svnweb.freebsd.org/changeset/base/272930 Log: Remove extraneous comments. Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h ============================================================================== --- projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h Sat Oct 11 04:41:21 2014 (r272929) +++ projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h Sat Oct 11 04:57:17 2014 (r272930) @@ -38,7 +38,8 @@ struct asid { }; /* - * svm_vpcu contains SVM VMCB state and vcpu register state. + * XXX separate out 'struct vmcb' from 'svm_vcpu' to avoid wasting space + * due to VMCB alignment requirements. */ struct svm_vcpu { struct vmcb vmcb; /* hardware saved vcpu context */ @@ -54,29 +55,12 @@ struct svm_vcpu { * SVM softc, one per virtual machine. */ struct svm_softc { - /* - * IO permission map, VMCB.ctrl.iopm_base_pa should point to this. - * If a bit is set, access to I/O port is intercepted. - */ - uint8_t iopm_bitmap[SVM_IO_BITMAP_SIZE]; - - /* - * MSR permission bitmap, VMCB.ctrl.msrpm_base_pa should point to this. - * Two bits are used for each MSR with the LSB used for read access - * and the MSB used for write access. A value of '1' indicates that - * the operation is intercepted. - */ - uint8_t msr_bitmap[SVM_MSR_BITMAP_SIZE]; - + uint8_t iopm_bitmap[SVM_IO_BITMAP_SIZE]; /* shared by all vcpus */ + uint8_t msr_bitmap[SVM_MSR_BITMAP_SIZE]; /* shared by all vcpus */ uint8_t apic_page[VM_MAXCPU][PAGE_SIZE]; - /* Nested Paging */ - vm_offset_t nptp; - - /* Virtual machine pointer. */ - struct vm *vm; - - /* Guest VCPU h/w and s/w context. */ struct svm_vcpu vcpu[VM_MAXCPU]; + vm_offset_t nptp; /* nested page table */ + struct vm *vm; } __aligned(PAGE_SIZE); CTASSERT((offsetof(struct svm_softc, nptp) & PAGE_MASK) == 0);