[libvirt] [PATCH 6/6] maint: enforce previous if-else {} cleanups