[libvirt] [RFC PATCH 16/30] tests: qemublock: Rename variables in anticipation of new tests