[libvirt] [PATCH 20/35] tests: qemublock: Rename variables in anticipation of new tests