[PATCH V4 6/6] irqbypass: do not start cons/prod when failed connect
From: Zhu Lingshan <hidden>
Date: 2020-07-28 04:29:04
Also in:
kvm
Subsystem:
the rest, virt lib · Maintainers:
Linus Torvalds, Alex Williamson, Paolo Bonzini
If failed to connect, there is no need to start consumer nor producer. Signed-off-by: Zhu Lingshan <redacted> Suggested-by: Jason Wang <jasowang@redhat.com> --- virt/lib/irqbypass.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/virt/lib/irqbypass.c b/virt/lib/irqbypass.c
index 28fda42e471b..c9bb3957f58a 100644
--- a/virt/lib/irqbypass.c
+++ b/virt/lib/irqbypass.c@@ -40,17 +40,21 @@ static int __connect(struct irq_bypass_producer *prod, if (prod->add_consumer) ret = prod->add_consumer(prod, cons); - if (!ret) { - ret = cons->add_producer(cons, prod); - if (ret && prod->del_consumer) - prod->del_consumer(prod, cons); - } + if (ret) + goto err_add_consumer; + + ret = cons->add_producer(cons, prod); + if (ret) + goto err_add_producer; if (cons->start) cons->start(cons); if (prod->start) prod->start(prod); - +err_add_producer: + if (prod->del_consumer) + prod->del_consumer(prod, cons); +err_add_consumer: return ret; }
--
2.18.4