aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kvm/mmu.c11
-rw-r--r--arch/x86/kvm/x86.c8
-rw-r--r--virt/kvm/irq_comm.c4
3 files changed, 12 insertions, 11 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 4a21b0f8491c..2a36f7f7c4c7 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -989,8 +989,8 @@ struct kvm_mmu_pages {
989 idx < 512; \ 989 idx < 512; \
990 idx = find_next_bit(bitmap, 512, idx+1)) 990 idx = find_next_bit(bitmap, 512, idx+1))
991 991
992int mmu_pages_add(struct kvm_mmu_pages *pvec, struct kvm_mmu_page *sp, 992static int mmu_pages_add(struct kvm_mmu_pages *pvec, struct kvm_mmu_page *sp,
993 int idx) 993 int idx)
994{ 994{
995 int i; 995 int i;
996 996
@@ -1121,8 +1121,9 @@ struct mmu_page_path {
1121 i < pvec.nr && ({ sp = pvec.page[i].sp; 1;}); \ 1121 i < pvec.nr && ({ sp = pvec.page[i].sp; 1;}); \
1122 i = mmu_pages_next(&pvec, &parents, i)) 1122 i = mmu_pages_next(&pvec, &parents, i))
1123 1123
1124int mmu_pages_next(struct kvm_mmu_pages *pvec, struct mmu_page_path *parents, 1124static int mmu_pages_next(struct kvm_mmu_pages *pvec,
1125 int i) 1125 struct mmu_page_path *parents,
1126 int i)
1126{ 1127{
1127 int n; 1128 int n;
1128 1129
@@ -1141,7 +1142,7 @@ int mmu_pages_next(struct kvm_mmu_pages *pvec, struct mmu_page_path *parents,
1141 return n; 1142 return n;
1142} 1143}
1143 1144
1144void mmu_pages_clear_parents(struct mmu_page_path *parents) 1145static void mmu_pages_clear_parents(struct mmu_page_path *parents)
1145{ 1146{
1146 struct kvm_mmu_page *sp; 1147 struct kvm_mmu_page *sp;
1147 unsigned int level = 0; 1148 unsigned int level = 0;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e4db5be7c953..8ca100a9ecac 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2043,8 +2043,8 @@ static struct kvm_io_device *vcpu_find_mmio_dev(struct kvm_vcpu *vcpu,
2043 return dev; 2043 return dev;
2044} 2044}
2045 2045
2046int kvm_read_guest_virt(gva_t addr, void *val, unsigned int bytes, 2046static int kvm_read_guest_virt(gva_t addr, void *val, unsigned int bytes,
2047 struct kvm_vcpu *vcpu) 2047 struct kvm_vcpu *vcpu)
2048{ 2048{
2049 void *data = val; 2049 void *data = val;
2050 int r = X86EMUL_CONTINUE; 2050 int r = X86EMUL_CONTINUE;
@@ -2073,8 +2073,8 @@ out:
2073 return r; 2073 return r;
2074} 2074}
2075 2075
2076int kvm_write_guest_virt(gva_t addr, void *val, unsigned int bytes, 2076static int kvm_write_guest_virt(gva_t addr, void *val, unsigned int bytes,
2077 struct kvm_vcpu *vcpu) 2077 struct kvm_vcpu *vcpu)
2078{ 2078{
2079 void *data = val; 2079 void *data = val;
2080 int r = X86EMUL_CONTINUE; 2080 int r = X86EMUL_CONTINUE;
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index a70d805e0148..864ac5483baa 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -233,8 +233,8 @@ void kvm_free_irq_routing(struct kvm *kvm)
233 __kvm_free_irq_routing(&kvm->irq_routing); 233 __kvm_free_irq_routing(&kvm->irq_routing);
234} 234}
235 235
236int setup_routing_entry(struct kvm_kernel_irq_routing_entry *e, 236static int setup_routing_entry(struct kvm_kernel_irq_routing_entry *e,
237 const struct kvm_irq_routing_entry *ue) 237 const struct kvm_irq_routing_entry *ue)
238{ 238{
239 int r = -EINVAL; 239 int r = -EINVAL;
240 int delta; 240 int delta;