Modify VMCPUXML class to add more cpu options.

@yangdongsheng, I replaced `os_xxx` with a nested xml in https://github.com/autotest/virt-test/pull/1790, but forgotten to remove them from slots.