refactor struct definition for vcpuins+vcpu