From owner-svn-src-head@FreeBSD.ORG Thu Apr 30 22:23:27 2015 Return-Path: Delivered-To: svn-src-head@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 5C26440F; Thu, 30 Apr 2015 22:23:27 +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 3D04D15BD; Thu, 30 Apr 2015 22:23:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UMNR3m096402; Thu, 30 Apr 2015 22:23:27 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UMNNmZ096369; Thu, 30 Apr 2015 22:23:23 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201504302223.t3UMNNmZ096369@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Thu, 30 Apr 2015 22:23:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282287 - in head/sys/amd64: include vmm vmm/amd vmm/intel vmm/io X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 22:23:27 -0000 Author: neel Date: Thu Apr 30 22:23:22 2015 New Revision: 282287 URL: https://svnweb.freebsd.org/changeset/base/282287 Log: Don't require to be always included before . Only a subset of source files that include need to use the APIs that require the inclusion of . MFC after: 1 week Modified: head/sys/amd64/include/vmm.h head/sys/amd64/vmm/amd/amdv.c head/sys/amd64/vmm/amd/svm_msr.c head/sys/amd64/vmm/amd/vmcb.c head/sys/amd64/vmm/intel/vmx_msr.c head/sys/amd64/vmm/io/vatpic.c head/sys/amd64/vmm/io/vatpit.c head/sys/amd64/vmm/io/vhpet.c head/sys/amd64/vmm/io/vioapic.c head/sys/amd64/vmm/io/vpmtmr.c head/sys/amd64/vmm/io/vrtc.c head/sys/amd64/vmm/vmm_ioport.c head/sys/amd64/vmm/vmm_stat.c head/sys/amd64/vmm/x86.c Modified: head/sys/amd64/include/vmm.h ============================================================================== --- head/sys/amd64/include/vmm.h Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/include/vmm.h Thu Apr 30 22:23:22 2015 (r282287) @@ -204,13 +204,12 @@ int vm_get_x2apic_state(struct vm *vm, i int vm_set_x2apic_state(struct vm *vm, int vcpu, enum x2apic_state state); int vm_apicid2vcpuid(struct vm *vm, int apicid); int vm_activate_cpu(struct vm *vm, int vcpu); -cpuset_t vm_active_cpus(struct vm *vm); -cpuset_t vm_suspended_cpus(struct vm *vm); struct vm_exit *vm_exitinfo(struct vm *vm, int vcpuid); void vm_exit_suspended(struct vm *vm, int vcpuid, uint64_t rip); void vm_exit_rendezvous(struct vm *vm, int vcpuid, uint64_t rip); void vm_exit_astpending(struct vm *vm, int vcpuid, uint64_t rip); +#ifdef _SYS__CPUSET_H_ /* * Rendezvous all vcpus specified in 'dest' and execute 'func(arg)'. * The rendezvous 'func(arg)' is not allowed to do anything that will @@ -228,6 +227,9 @@ void vm_exit_astpending(struct vm *vm, i typedef void (*vm_rendezvous_func_t)(struct vm *vm, int vcpuid, void *arg); void vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest, vm_rendezvous_func_t func, void *arg); +cpuset_t vm_active_cpus(struct vm *vm); +cpuset_t vm_suspended_cpus(struct vm *vm); +#endif /* _SYS__CPUSET_H_ */ static __inline int vcpu_rendezvous_pending(void *rendezvous_cookie) Modified: head/sys/amd64/vmm/amd/amdv.c ============================================================================== --- head/sys/amd64/vmm/amd/amdv.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/amd/amdv.c Thu Apr 30 22:23:22 2015 (r282287) @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "io/iommu.h" Modified: head/sys/amd64/vmm/amd/svm_msr.c ============================================================================== --- head/sys/amd64/vmm/amd/svm_msr.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/amd/svm_msr.c Thu Apr 30 22:23:22 2015 (r282287) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: head/sys/amd64/vmm/amd/vmcb.c ============================================================================== --- head/sys/amd64/vmm/amd/vmcb.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/amd/vmcb.c Thu Apr 30 22:23:22 2015 (r282287) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: head/sys/amd64/vmm/intel/vmx_msr.c ============================================================================== --- head/sys/amd64/vmm/intel/vmx_msr.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/intel/vmx_msr.c Thu Apr 30 22:23:22 2015 (r282287) @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: head/sys/amd64/vmm/io/vatpic.c ============================================================================== --- head/sys/amd64/vmm/io/vatpic.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/io/vatpic.c Thu Apr 30 22:23:22 2015 (r282287) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/amd64/vmm/io/vatpit.c ============================================================================== --- head/sys/amd64/vmm/io/vatpit.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/io/vatpit.c Thu Apr 30 22:23:22 2015 (r282287) @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/amd64/vmm/io/vhpet.c ============================================================================== --- head/sys/amd64/vmm/io/vhpet.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/io/vhpet.c Thu Apr 30 22:23:22 2015 (r282287) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include Modified: head/sys/amd64/vmm/io/vioapic.c ============================================================================== --- head/sys/amd64/vmm/io/vioapic.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/io/vioapic.c Thu Apr 30 22:23:22 2015 (r282287) @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include Modified: head/sys/amd64/vmm/io/vpmtmr.c ============================================================================== --- head/sys/amd64/vmm/io/vpmtmr.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/io/vpmtmr.c Thu Apr 30 22:23:22 2015 (r282287) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include Modified: head/sys/amd64/vmm/io/vrtc.c ============================================================================== --- head/sys/amd64/vmm/io/vrtc.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/io/vrtc.c Thu Apr 30 22:23:22 2015 (r282287) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include Modified: head/sys/amd64/vmm/vmm_ioport.c ============================================================================== --- head/sys/amd64/vmm/vmm_ioport.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/vmm_ioport.c Thu Apr 30 22:23:22 2015 (r282287) @@ -28,16 +28,10 @@ __FBSDID("$FreeBSD$"); #include -#include -#include -#include #include -#include - #include #include -#include #include "vatpic.h" #include "vatpit.h" Modified: head/sys/amd64/vmm/vmm_stat.c ============================================================================== --- head/sys/amd64/vmm/vmm_stat.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/vmm_stat.c Thu Apr 30 22:23:22 2015 (r282287) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include "vmm_util.h" Modified: head/sys/amd64/vmm/x86.c ============================================================================== --- head/sys/amd64/vmm/x86.c Thu Apr 30 21:51:12 2015 (r282286) +++ head/sys/amd64/vmm/x86.c Thu Apr 30 22:23:22 2015 (r282287) @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include