[PATCH 00/21] qemu capability testing cleanups and improvements (part 5)