diff options
author | Andre Przywara <andre.przywara@arm.com> | 2015-03-26 10:39:29 -0400 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2015-03-26 17:43:12 -0400 |
commit | af669ac6dc3f66bb56fb9612b9826adac6292794 (patch) | |
tree | a9d24d28bc910b423694ec952184f4019780da3c /virt/kvm/iodev.h | |
parent | e32edf4fd0fa4897e12ca66118ab67bf257e16e4 (diff) |
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>
Diffstat (limited to 'virt/kvm/iodev.h')
-rw-r--r-- | virt/kvm/iodev.h | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/virt/kvm/iodev.h b/virt/kvm/iodev.h deleted file mode 100644 index 9ef709cc2cae..000000000000 --- a/virt/kvm/iodev.h +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | /* | ||
2 | * This program is free software; you can redistribute it and/or modify | ||
3 | * it under the terms of the GNU General Public License as published by | ||
4 | * the Free Software Foundation; either version 2 of the License. | ||
5 | * | ||
6 | * This program is distributed in the hope that it will be useful, | ||
7 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
8 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
9 | * GNU General Public License for more details. | ||
10 | * | ||
11 | * You should have received a copy of the GNU General Public License | ||
12 | * along with this program; if not, write to the Free Software | ||
13 | * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
14 | */ | ||
15 | |||
16 | #ifndef __KVM_IODEV_H__ | ||
17 | #define __KVM_IODEV_H__ | ||
18 | |||
19 | #include <linux/kvm_types.h> | ||
20 | #include <asm/errno.h> | ||
21 | |||
22 | struct kvm_io_device; | ||
23 | struct kvm_vcpu; | ||
24 | |||
25 | /** | ||
26 | * kvm_io_device_ops are called under kvm slots_lock. | ||
27 | * read and write handlers return 0 if the transaction has been handled, | ||
28 | * or non-zero to have it passed to the next device. | ||
29 | **/ | ||
30 | struct kvm_io_device_ops { | ||
31 | int (*read)(struct kvm_vcpu *vcpu, | ||
32 | struct kvm_io_device *this, | ||
33 | gpa_t addr, | ||
34 | int len, | ||
35 | void *val); | ||
36 | int (*write)(struct kvm_vcpu *vcpu, | ||
37 | struct kvm_io_device *this, | ||
38 | gpa_t addr, | ||
39 | int len, | ||
40 | const void *val); | ||
41 | void (*destructor)(struct kvm_io_device *this); | ||
42 | }; | ||
43 | |||
44 | |||
45 | struct kvm_io_device { | ||
46 | const struct kvm_io_device_ops *ops; | ||
47 | }; | ||
48 | |||
49 | static inline void kvm_iodevice_init(struct kvm_io_device *dev, | ||
50 | const struct kvm_io_device_ops *ops) | ||
51 | { | ||
52 | dev->ops = ops; | ||
53 | } | ||
54 | |||
55 | static inline int kvm_iodevice_read(struct kvm_vcpu *vcpu, | ||
56 | struct kvm_io_device *dev, gpa_t addr, | ||
57 | int l, void *v) | ||
58 | { | ||
59 | return dev->ops->read ? dev->ops->read(vcpu, dev, addr, l, v) | ||
60 | : -EOPNOTSUPP; | ||
61 | } | ||
62 | |||
63 | static inline int kvm_iodevice_write(struct kvm_vcpu *vcpu, | ||
64 | struct kvm_io_device *dev, gpa_t addr, | ||
65 | int l, const void *v) | ||
66 | { | ||
67 | return dev->ops->write ? dev->ops->write(vcpu, dev, addr, l, v) | ||
68 | : -EOPNOTSUPP; | ||
69 | } | ||
70 | |||
71 | static inline void kvm_iodevice_destructor(struct kvm_io_device *dev) | ||
72 | { | ||
73 | if (dev->ops->destructor) | ||
74 | dev->ops->destructor(dev); | ||
75 | } | ||
76 | |||
77 | #endif /* __KVM_IODEV_H__ */ | ||