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
18231823 return 0;
18241824 }
18251825
1826−int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
1826+int kvm_set_routing_entry(struct kvm *kvm,
1827+ struct kvm_kernel_irq_routing_entry *e,
18271828 const struct kvm_irq_routing_entry *ue)
18281829 {
18291830 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
22462246 return ret;
22472247 }
22482248
2249−int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
2249+int kvm_set_routing_entry(struct kvm *kvm,
2250+ struct kvm_kernel_irq_routing_entry *e,
22502251 const struct kvm_irq_routing_entry *ue)
22512252 {
22522253 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
248248 return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);
249249 }
250250
251−int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
251+int kvm_set_routing_entry(struct kvm *kvm,
252+ struct kvm_kernel_irq_routing_entry *e,
252253 const struct kvm_irq_routing_entry *ue)
253254 {
254255 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
10111011 const struct kvm_irq_routing_entry *entries,
10121012 unsigned nr,
10131013 unsigned flags);
1014−int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
1014+int kvm_set_routing_entry(struct kvm *kvm,
1015+ struct kvm_kernel_irq_routing_entry *e,
10151016 const struct kvm_irq_routing_entry *ue);
10161017 void kvm_free_irq_routing(struct kvm *kvm);
10171018
virt/kvm/irqchip.c+4−3
@@ -135,7 +135,8 @@ void kvm_free_irq_routing(struct kvm *kvm) · 134 unmodified lines
135135 free_irq_routing_table(rt);
136136 }
137137
138−static int setup_routing_entry(struct kvm_irq_routing_table *rt,
138+static int setup_routing_entry(struct kvm *kvm,
139+ struct kvm_irq_routing_table *rt,
139140 struct kvm_kernel_irq_routing_entry *e,
140141 const struct kvm_irq_routing_entry *ue)
141142 {
@@ -154,7 +155,7 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, · 12 unmodified lines
154155
155156 e->gsi = ue->gsi;
156157 e->type = ue->type;
157− r = kvm_set_routing_entry(e, ue);
158+ r = kvm_set_routing_entry(kvm, e, ue);
158159 if (r)
159160 goto out;
160161 if (e->type == KVM_IRQ_ROUTING_IRQCHIP)
@@ -211,7 +212,7 @@ int kvm_set_irq_routing(struct kvm *kvm, · 50 unmodified lines
211212 kfree(e);
212213 goto out;
213214 }
214− r = setup_routing_entry(new, e, ue);
215+ r = setup_routing_entry(kvm, new, e, ue);
215216 if (r) {
216217 kfree(e);
217218 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