Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af669ac6 authored by Andre Przywara's avatar Andre Przywara Committed by Marc Zyngier
Browse files

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: default avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent e32edf4f

arch/powerpc/kvm/mpic.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <asm/kvm_para.h>

#include <asm/kvm_host.h>

#include <asm/kvm_ppc.h>

#include "iodev.h"

#include <kvm/iodev.h>



#define MAX_CPU     32

#define MAX_SRC     256

arch/x86/kvm/i8254.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <linux/kthread.h>



#include "iodev.h"

#include <kvm/iodev.h>



struct kvm_kpit_channel_state {

	u32 count; /* can be 65536 */

arch/x86/kvm/ioapic.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <linux/kvm_host.h>



#include "iodev.h"

#include <kvm/iodev.h>



struct kvm;

struct kvm_vcpu;

arch/x86/kvm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/kvm_host.h>

#include <linux/spinlock.h>



#include "iodev.h"

#include <kvm/iodev.h>

#include "ioapic.h"

#include "lapic.h"

arch/x86/kvm/lapic.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __KVM_X86_LAPIC_H

#define __KVM_X86_LAPIC_H



#include "iodev.h"

#include <kvm/iodev.h>



#include <linux/kvm_host.h>