History

KVM: pass struct kvm to kvm_set_routing_entry

Arch-specific code will use it.

Radim Krčmář committed 10 years ago

Commit c63cf531 parent 4d8e7725 files · +12 −7Browse files

Unified · Split

5 files
  1. arch/powerpc/kvm/mpic.c +2 −1
  2. arch/s390/kvm/interrupt.c +2 −1
  3. arch/x86/kvm/irq_comm.c +2 −1
  4. include/linux/kvm_host.h +2 −1
  5. virt/kvm/irqchip.c +4 −3
arch/powerpc/kvm/mpic.c+2−1
@@ -1823,7 +1823,8 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, · 1822 unmodified lines
1823 return 0;1823 return 0;
1824}1824}
1825 1825
1826int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,1826int kvm_set_routing_entry(struct kvm *kvm,
1827 struct kvm_kernel_irq_routing_entry *e,
1827 const struct kvm_irq_routing_entry *ue)1828 const struct kvm_irq_routing_entry *ue)
1828{1829{
1829 int r = -EINVAL;1830 int r = -EINVAL;
arch/s390/kvm/interrupt.c+2−1
@@ -2246,7 +2246,8 @@ static int set_adapter_int(struct kvm_kernel_irq_routing_entry *e, · 2245 unmodified lines
2246 return ret;2246 return ret;
2247}2247}
2248 2248
2249int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,2249int kvm_set_routing_entry(struct kvm *kvm,
2250 struct kvm_kernel_irq_routing_entry *e,
2250 const struct kvm_irq_routing_entry *ue)2251 const struct kvm_irq_routing_entry *ue)
2251{2252{
2252 int ret;2253 int ret;
arch/x86/kvm/irq_comm.c+2−1
@@ -248,7 +248,8 @@ static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e, · 247 unmodified lines
248 return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);248 return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);
249}249}
250 250
251int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,251int kvm_set_routing_entry(struct kvm *kvm,
252 struct kvm_kernel_irq_routing_entry *e,
252 const struct kvm_irq_routing_entry *ue)253 const struct kvm_irq_routing_entry *ue)
253{254{
254 int r = -EINVAL;255 int r = -EINVAL;
include/linux/kvm_host.h+2−1
@@ -1011,7 +1011,8 @@ int kvm_set_irq_routing(struct kvm *kvm, · 1010 unmodified lines
1011 const struct kvm_irq_routing_entry *entries,1011 const struct kvm_irq_routing_entry *entries,
1012 unsigned nr,1012 unsigned nr,
1013 unsigned flags);1013 unsigned flags);
1014int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,1014int kvm_set_routing_entry(struct kvm *kvm,
1015 struct kvm_kernel_irq_routing_entry *e,
1015 const struct kvm_irq_routing_entry *ue);1016 const struct kvm_irq_routing_entry *ue);
1016void kvm_free_irq_routing(struct kvm *kvm);1017void kvm_free_irq_routing(struct kvm *kvm);
1017 1018
virt/kvm/irqchip.c+4−3
@@ -135,7 +135,8 @@ void kvm_free_irq_routing(struct kvm *kvm) · 134 unmodified lines
135 free_irq_routing_table(rt);135 free_irq_routing_table(rt);
136}136}
137 137
138static int setup_routing_entry(struct kvm_irq_routing_table *rt,138static int setup_routing_entry(struct kvm *kvm,
139 struct kvm_irq_routing_table *rt,
139 struct kvm_kernel_irq_routing_entry *e,140 struct kvm_kernel_irq_routing_entry *e,
140 const struct kvm_irq_routing_entry *ue)141 const struct kvm_irq_routing_entry *ue)
141{142{
@@ -154,7 +155,7 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, · 12 unmodified lines
154 155
155 e->gsi = ue->gsi;156 e->gsi = ue->gsi;
156 e->type = ue->type;157 e->type = ue->type;
157 r = kvm_set_routing_entry(e, ue);158 r = kvm_set_routing_entry(kvm, e, ue);
158 if (r)159 if (r)
159 goto out;160 goto out;
160 if (e->type == KVM_IRQ_ROUTING_IRQCHIP)161 if (e->type == KVM_IRQ_ROUTING_IRQCHIP)
@@ -211,7 +212,7 @@ int kvm_set_irq_routing(struct kvm *kvm, · 50 unmodified lines
211 kfree(e);212 kfree(e);
212 goto out;213 goto out;
213 }214 }
214 r = setup_routing_entry(new, e, ue);215 r = setup_routing_entry(kvm, new, e, ue);
215 if (r) {216 if (r) {
216 kfree(e);217 kfree(e);
217 goto out;218 goto out;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t