On Sat, May 08, 2021 at 03:11:52PM +0800, Zhu Lingshan wrote:
This reverts commit a979a6aa009f3c99689432e0cdb5402a4463fb88.
The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by: Zhu Lingshan lingshan.zhu@intel.com
Acked-by: Michael S. Tsirkin mst@redhat.com
virt/lib/irqbypass.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/virt/lib/irqbypass.c b/virt/lib/irqbypass.c index c9bb3957f58a..28fda42e471b 100644 --- a/virt/lib/irqbypass.c +++ b/virt/lib/irqbypass.c @@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod, if (prod->add_consumer) ret = prod->add_consumer(prod, cons);
- if (ret)
goto err_add_consumer;- ret = cons->add_producer(cons, prod);
- if (ret)
goto err_add_producer;
- if (!ret) {
ret = cons->add_producer(cons, prod);if (ret && prod->del_consumer)prod->del_consumer(prod, cons);- }
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.27.0