move around definitions in kvm.h that do not require CPUState