AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

KVM: x86: cleanup return handling in setup_routing_entry()

Browse Source 
Let's drop the goto and return the error value directly.

Suggested-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
This commit is contained in:
David Hildenbrand 2017-04-07 10:50:35 +02:00 committed by Radim Krčmář
parent 43ae312ca1
commit 8c6b7828c2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
virt/kvm/irqchip.c
View File

@ -142,8 +142,8 @@ static int setup_routing_entry(struct kvm *kvm,
struct kvm_kernel_irq_routing_entry *e, struct kvm_kernel_irq_routing_entry *e,
const struct kvm_irq_routing_entry *ue) const struct kvm_irq_routing_entry *ue)
{ {
int r = -EINVAL;
struct kvm_kernel_irq_routing_entry *ei; struct kvm_kernel_irq_routing_entry *ei;
int r;
/* /*
* Do not allow GSI to be mapped to the same irqchip more than once. * Do not allow GSI to be mapped to the same irqchip more than once.
@ -153,20 +153,19 @@ static int setup_routing_entry(struct kvm *kvm,
if (ei->type != KVM_IRQ_ROUTING_IRQCHIP || if (ei->type != KVM_IRQ_ROUTING_IRQCHIP ||
ue->type != KVM_IRQ_ROUTING_IRQCHIP || ue->type != KVM_IRQ_ROUTING_IRQCHIP ||
ue->u.irqchip.irqchip == ei->irqchip.irqchip) ue->u.irqchip.irqchip == ei->irqchip.irqchip)
return r; return -EINVAL;
e->gsi = ue->gsi; e->gsi = ue->gsi;
e->type = ue->type; e->type = ue->type;
r = kvm_set_routing_entry(kvm, e, ue); r = kvm_set_routing_entry(kvm, e, ue);
if (r) if (r)
goto out; return r;
if (e->type == KVM_IRQ_ROUTING_IRQCHIP) if (e->type == KVM_IRQ_ROUTING_IRQCHIP)
rt->chip[e->irqchip.irqchip][e->irqchip.pin] = e->gsi; rt->chip[e->irqchip.irqchip][e->irqchip.pin] = e->gsi;
hlist_add_head(&e->link, &rt->map[e->gsi]); hlist_add_head(&e->link, &rt->map[e->gsi]);
r = 0;
out: return 0;
return r;
} }
void __attribute__((weak)) kvm_arch_irq_routing_update(struct kvm *kvm) void __attribute__((weak)) kvm_arch_irq_routing_update(struct kvm *kvm)