Message ID | 20241105062408.3533704-8-xiaoyao.li@intel.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | QEMU TDX support | expand |
Hi, On 5/11/24 06:23, Xiaoyao Li wrote: > Introduce kvm_arch_pre_create_vcpu(), to perform arch-dependent > work prior to create any vcpu. This is for i386 TDX because it needs > call TDX_INIT_VM before creating any vcpu. > > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > Acked-by: Gerd Hoffmann <kraxel@redhat.com> > --- > Changes in v3: > - pass @errp to kvm_arch_pre_create_vcpu(); (Per Daniel) > --- > accel/kvm/kvm-all.c | 10 ++++++++++ > include/sysemu/kvm.h | 1 + > 2 files changed, 11 insertions(+) > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 930a5bfed58f..1732fa1adecd 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -523,6 +523,11 @@ void kvm_destroy_vcpu(CPUState *cpu) > } > } > > +int __attribute__ ((weak)) kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp) We don't use the weak attribute. Maybe declare stubs for each arch? > +{ > + return 0; > +} > + > int kvm_init_vcpu(CPUState *cpu, Error **errp) > { > KVMState *s = kvm_state; > @@ -531,6 +536,11 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp) > > trace_kvm_init_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu)); > > + ret = kvm_arch_pre_create_vcpu(cpu, errp); > + if (ret < 0) { > + goto err; > + } > + > ret = kvm_create_vcpu(cpu); > if (ret < 0) { > error_setg_errno(errp, -ret, > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index c3a60b28909a..643ca4950543 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -374,6 +374,7 @@ int kvm_arch_get_default_type(MachineState *ms); > > int kvm_arch_init(MachineState *ms, KVMState *s); > > +int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp); > int kvm_arch_init_vcpu(CPUState *cpu); > int kvm_arch_destroy_vcpu(CPUState *cpu); >
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 930a5bfed58f..1732fa1adecd 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -523,6 +523,11 @@ void kvm_destroy_vcpu(CPUState *cpu) } } +int __attribute__ ((weak)) kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp) +{ + return 0; +} + int kvm_init_vcpu(CPUState *cpu, Error **errp) { KVMState *s = kvm_state; @@ -531,6 +536,11 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp) trace_kvm_init_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu)); + ret = kvm_arch_pre_create_vcpu(cpu, errp); + if (ret < 0) { + goto err; + } + ret = kvm_create_vcpu(cpu); if (ret < 0) { error_setg_errno(errp, -ret, diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index c3a60b28909a..643ca4950543 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -374,6 +374,7 @@ int kvm_arch_get_default_type(MachineState *ms); int kvm_arch_init(MachineState *ms, KVMState *s); +int kvm_arch_pre_create_vcpu(CPUState *cpu, Error **errp); int kvm_arch_init_vcpu(CPUState *cpu); int kvm_arch_destroy_vcpu(CPUState *cpu);