[libvirt PATCH] tests: change confusing macro agument names