mirror of https://gitee.com/openkylin/linux.git
KVM: move iodev.h from virt/kvm/ to include/kvm
iodev.h contains definitions for the kvm_io_bus framework. This is needed both by the generic KVM code in virt/kvm as well as by architecture specific code under arch/. Putting the header file in virt/kvm and using local includes in the architecture part seems at least dodgy to me, so let's move the file into include/kvm, so that a more natural "#include <kvm/iodev.h>" can be used by all of the code. This also solves a problem later when using struct kvm_io_device in arm_vgic.h. Fixing up the FSF address in the GPL header and a wrong include path on the way. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
parent
e32edf4fd0
commit
af669ac6dc
|
@ -34,7 +34,7 @@
|
||||||
#include <asm/kvm_para.h>
|
#include <asm/kvm_para.h>
|
||||||
#include <asm/kvm_host.h>
|
#include <asm/kvm_host.h>
|
||||||
#include <asm/kvm_ppc.h>
|
#include <asm/kvm_ppc.h>
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
|
|
||||||
#define MAX_CPU 32
|
#define MAX_CPU 32
|
||||||
#define MAX_SRC 256
|
#define MAX_SRC 256
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
|
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
|
|
||||||
struct kvm_kpit_channel_state {
|
struct kvm_kpit_channel_state {
|
||||||
u32 count; /* can be 65536 */
|
u32 count; /* can be 65536 */
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
|
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
|
|
||||||
struct kvm;
|
struct kvm;
|
||||||
struct kvm_vcpu;
|
struct kvm_vcpu;
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
|
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
#include "ioapic.h"
|
#include "ioapic.h"
|
||||||
#include "lapic.h"
|
#include "lapic.h"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __KVM_X86_LAPIC_H
|
#ifndef __KVM_X86_LAPIC_H
|
||||||
#define __KVM_X86_LAPIC_H
|
#define __KVM_X86_LAPIC_H
|
||||||
|
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
|
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
|
|
||||||
|
|
|
@ -9,15 +9,14 @@
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __KVM_IODEV_H__
|
#ifndef __KVM_IODEV_H__
|
||||||
#define __KVM_IODEV_H__
|
#define __KVM_IODEV_H__
|
||||||
|
|
||||||
#include <linux/kvm_types.h>
|
#include <linux/kvm_types.h>
|
||||||
#include <asm/errno.h>
|
#include <linux/errno.h>
|
||||||
|
|
||||||
struct kvm_io_device;
|
struct kvm_io_device;
|
||||||
struct kvm_vcpu;
|
struct kvm_vcpu;
|
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
|
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include <linux/seqlock.h>
|
#include <linux/seqlock.h>
|
||||||
#include <trace/events/kvm.h>
|
#include <trace/events/kvm.h>
|
||||||
|
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
|
|
||||||
#ifdef CONFIG_HAVE_KVM_IRQFD
|
#ifdef CONFIG_HAVE_KVM_IRQFD
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "iodev.h"
|
#include <kvm/iodev.h>
|
||||||
|
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
#include <linux/kvm.h>
|
#include <linux/kvm.h>
|
||||||
|
|
Loading…
Reference in New Issue