From 17038e49ea5b89bf3088d7e7f7186ca5aba4975f Mon Sep 17 00:00:00 2001 From: hanliyang Date: Thu, 21 Aug 2025 16:35:45 +0800 Subject: [PATCH] vfio/container: For CSV3 VM, only register listener to shared_memory_listener list in vfio_connect_container() There is a regression for booting CSV3 VM with passthr devices when backporting the commit c7b313d300 ("vfio/container: Move listener to base container"). Fix it here. Signed-off-by: hanliyang --- hw/vfio/container.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 95b8cff33b..56c55d00f1 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -736,14 +736,14 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as, group->container = container; QLIST_INSERT_HEAD(&container->group_list, group, container_next); + bcontainer->listener = vfio_memory_listener; if (kvm_csv3_enabled()) { shared_memory_listener_register(&bcontainer->listener, bcontainer->space->as); + } else { + memory_listener_register(&bcontainer->listener, bcontainer->space->as); } - bcontainer->listener = vfio_memory_listener; - memory_listener_register(&bcontainer->listener, bcontainer->space->as); - if (bcontainer->error) { ret = -1; error_propagate_prepend(errp, bcontainer->error, -- Gitee