CPUID test case cleanups (v2)

This pull request contains simple cleanups of the CPUID test cases, to make the code simpler and easier to change and understand.

Changes v1 -> v2:
 * Updated qemu_cpu.cfg to use the new qemu_flavor/version named variants