[libvirt PATCH 2/2] tests: Minimize variable scope