virt:Fix some conflicts

Signed-off-by: Li Yang <liyang.fnst@cn.fujitsu.com>
virt: Fix a bug in VMCPUXML class

Signed-off-by: Li Yang <liyang.fnst@cn.fujitsu.com>