diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index ce3c52fd0f7d..d07dfc714a3c 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -5320,8 +5320,7 @@ static int kvm_get_nested_state(X86CPU *cpu) return ret; } -#define KVM_X86_REG_SYNTHETIC_MSR BIT_ULL(35) -#define REG_MSR_INDEX(x) (KVM_X86_REG_SYNTHETIC_MSR | x) +#define KVM_X86_REG_SSP (0x20300003ULL << 32 | 0x00000000) static bool has_cet_ssp(CPUState *cpu) { @@ -5409,9 +5408,9 @@ int kvm_arch_put_registers(CPUState *cpu, int level, Error **errp) } if (has_cet_ssp(cpu)) { - ret = kvm_set_one_reg(cpu, REG_MSR_INDEX(0ull), &env->guest_ssp); + ret = kvm_set_one_reg(cpu, KVM_X86_REG_SSP, &env->guest_ssp); if (ret) { - error_report("Failed to set KVM_REG_MSR, ret = %d\n", ret); + error_report("Failed to set KVM_REG_MSR, ret = %d", ret); } } @@ -5489,9 +5488,9 @@ int kvm_arch_get_registers(CPUState *cs, Error **errp) goto out; } if (has_cet_ssp(cs)) { - ret = kvm_get_one_reg(cs, REG_MSR_INDEX(0ull), &env->guest_ssp); + ret = kvm_get_one_reg(cs, KVM_X86_REG_SSP, &env->guest_ssp); if (ret) { - error_report("Failed to get KVM_REG_MSR, ret = %d\n", ret); + error_report("Failed to get KVM_REG_MSR, ret = %d", ret); } } ret = kvm_get_apic(cpu);