motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 14:31:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

kvm: Allow kvm_arch_get/put_registers to accept Error**

Browse source 
This is necessary to provide discernible error messages to the caller.

Signed-off-by: Julia Suvorova <jusual@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/20240927104743.218468-2-jusual@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Julia Suvorova 2024-09-27 12:47:40 +02:00 • committed by Paolo Bonzini
parent 28ed7f9761
commit a1676bb304
9 changed files with 48 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

41
accel/kvm/kvm-all.c
View file

@ -2793,9 +2793,15 @@ void kvm_flush_coalesced_mmio_buffer(void)
static void do_kvm_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg) static void do_kvm_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg)
{ {
if (!cpu->vcpu_dirty && !kvm_state->guest_state_protected) { if (!cpu->vcpu_dirty && !kvm_state->guest_state_protected) {
int ret = kvm_arch_get_registers(cpu); Error *err = NULL;
int ret = kvm_arch_get_registers(cpu, &err);
if (ret) { if (ret) {
error_report("Failed to get registers: %s", strerror(-ret)); if (err) {
error_reportf_err(err, "Failed to synchronize CPU state: ");
} else {
error_report("Failed to get registers: %s", strerror(-ret));
}
cpu_dump_state(cpu, stderr, CPU_DUMP_CODE); cpu_dump_state(cpu, stderr, CPU_DUMP_CODE);
vm_stop(RUN_STATE_INTERNAL_ERROR); vm_stop(RUN_STATE_INTERNAL_ERROR);
} }
@ -2813,9 +2819,15 @@ void kvm_cpu_synchronize_state(CPUState *cpu)
static void do_kvm_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_data arg) static void do_kvm_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_data arg)
{ {
int ret = kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE); Error *err = NULL;
int ret = kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE, &err);
if (ret) { if (ret) {
error_report("Failed to put registers after reset: %s", strerror(-ret)); if (err) {
error_reportf_err(err, "Restoring resisters after reset: ");
} else {
error_report("Failed to put registers after reset: %s",
strerror(-ret));
}
cpu_dump_state(cpu, stderr, CPU_DUMP_CODE); cpu_dump_state(cpu, stderr, CPU_DUMP_CODE);
vm_stop(RUN_STATE_INTERNAL_ERROR); vm_stop(RUN_STATE_INTERNAL_ERROR);
} }
@ -2830,9 +2842,15 @@ void kvm_cpu_synchronize_post_reset(CPUState *cpu)
static void do_kvm_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_data arg) static void do_kvm_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_data arg)
{ {
int ret = kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE); Error *err = NULL;
int ret = kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE, &err);
if (ret) { if (ret) {
error_report("Failed to put registers after init: %s", strerror(-ret)); if (err) {
error_reportf_err(err, "Putting registers after init: ");
} else {
error_report("Failed to put registers after init: %s",
strerror(-ret));
}
exit(1); exit(1);
} }
@ -3022,10 +3040,15 @@ int kvm_cpu_exec(CPUState *cpu)
MemTxAttrs attrs; MemTxAttrs attrs;
if (cpu->vcpu_dirty) { if (cpu->vcpu_dirty) {
ret = kvm_arch_put_registers(cpu, KVM_PUT_RUNTIME_STATE); Error *err = NULL;
ret = kvm_arch_put_registers(cpu, KVM_PUT_RUNTIME_STATE, &err);
if (ret) { if (ret) {
error_report("Failed to put registers after init: %s", if (err) {
strerror(-ret)); error_reportf_err(err, "Putting registers after init: ");
} else {
error_report("Failed to put registers after init: %s",
strerror(-ret));
}
ret = -1; ret = -1;
break; break;
} }

4
include/sysemu/kvm.h
View file

@ -359,7 +359,7 @@ int kvm_arch_handle_exit(CPUState *cpu, struct kvm_run *run);
int kvm_arch_process_async_events(CPUState *cpu); int kvm_arch_process_async_events(CPUState *cpu);
int kvm_arch_get_registers(CPUState *cpu); int kvm_arch_get_registers(CPUState *cpu, Error **errp);
/* state subset only touched by the VCPU itself during runtime */ /* state subset only touched by the VCPU itself during runtime */
#define KVM_PUT_RUNTIME_STATE 1 #define KVM_PUT_RUNTIME_STATE 1
@ -368,7 +368,7 @@ int kvm_arch_get_registers(CPUState *cpu);
/* full state set, modified during initialization or on vmload */ /* full state set, modified during initialization or on vmload */
#define KVM_PUT_FULL_STATE 3 #define KVM_PUT_FULL_STATE 3
int kvm_arch_put_registers(CPUState *cpu, int level); int kvm_arch_put_registers(CPUState *cpu, int level, Error **errp);
int kvm_arch_get_default_type(MachineState *ms); int kvm_arch_get_default_type(MachineState *ms);

4
target/arm/kvm.c
View file

@ -2042,7 +2042,7 @@ static int kvm_arch_put_sve(CPUState *cs)
return 0; return 0;
} }
int kvm_arch_put_registers(CPUState *cs, int level) int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
{ {
uint64_t val; uint64_t val;
uint32_t fpr; uint32_t fpr;
@ -2226,7 +2226,7 @@ static int kvm_arch_get_sve(CPUState *cs)
return 0; return 0;
} }
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs, Error **errp)
{ {
uint64_t val; uint64_t val;
unsigned int el; unsigned int el;

4
target/i386/kvm/kvm.c
View file

@ -5210,7 +5210,7 @@ static int kvm_get_nested_state(X86CPU *cpu)
return ret; return ret;
} }
int kvm_arch_put_registers(CPUState *cpu, int level) int kvm_arch_put_registers(CPUState *cpu, int level, Error **errp)
{ {
X86CPU *x86_cpu = X86_CPU(cpu); X86CPU *x86_cpu = X86_CPU(cpu);
int ret; int ret;
@ -5298,7 +5298,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level)
return 0; return 0;
} }
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs, Error **errp)
{ {
X86CPU *cpu = X86_CPU(cs); X86CPU *cpu = X86_CPU(cs);
int ret; int ret;

4
target/loongarch/kvm/kvm.c
View file

@ -588,7 +588,7 @@ static int kvm_loongarch_put_cpucfg(CPUState *cs)
return ret; return ret;
} }
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs, Error **errp)
{ {
int ret; int ret;
@ -616,7 +616,7 @@ int kvm_arch_get_registers(CPUState *cs)
return ret; return ret;
} }
int kvm_arch_put_registers(CPUState *cs, int level) int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
{ {
int ret; int ret;

4
target/mips/kvm.c
View file

@ -1172,7 +1172,7 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)
return ret; return ret;
} }
int kvm_arch_put_registers(CPUState *cs, int level) int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
{ {
CPUMIPSState *env = cpu_env(cs); CPUMIPSState *env = cpu_env(cs);
struct kvm_regs regs; struct kvm_regs regs;
@ -1207,7 +1207,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
return ret; return ret;
} }
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs, Error **errp)
{ {
CPUMIPSState *env = cpu_env(cs); CPUMIPSState *env = cpu_env(cs);
int ret = 0; int ret = 0;

4
target/ppc/kvm.c
View file

@ -900,7 +900,7 @@ int kvmppc_put_books_sregs(PowerPCCPU *cpu)
return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_SREGS, &sregs); return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_SREGS, &sregs);
} }
int kvm_arch_put_registers(CPUState *cs, int level) int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
{ {
PowerPCCPU *cpu = POWERPC_CPU(cs); PowerPCCPU *cpu = POWERPC_CPU(cs);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
@ -1205,7 +1205,7 @@ static int kvmppc_get_books_sregs(PowerPCCPU *cpu)
return 0; return 0;
} }
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs, Error **errp)
{ {
PowerPCCPU *cpu = POWERPC_CPU(cs); PowerPCCPU *cpu = POWERPC_CPU(cs);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;

4
target/riscv/kvm/kvm-cpu.c
View file

@ -1192,7 +1192,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_LAST_INFO KVM_CAP_LAST_INFO
}; };
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs, Error **errp)
{ {
int ret = 0; int ret = 0;
@ -1237,7 +1237,7 @@ int kvm_riscv_sync_mpstate_to_kvm(RISCVCPU *cpu, int state)
return 0; return 0;
} }
int kvm_arch_put_registers(CPUState *cs, int level) int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
{ {
int ret = 0; int ret = 0;

4
target/s390x/kvm/kvm.c
View file

@ -472,7 +472,7 @@ static int can_sync_regs(CPUState *cs, int regs)
#define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \ #define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \
KVM_SYNC_CRS | KVM_SYNC_PREFIX) KVM_SYNC_CRS | KVM_SYNC_PREFIX)
int kvm_arch_put_registers(CPUState *cs, int level) int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
{ {
CPUS390XState *env = cpu_env(cs); CPUS390XState *env = cpu_env(cs);
struct kvm_fpu fpu = {}; struct kvm_fpu fpu = {};
@ -598,7 +598,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
return 0; return 0;
} }
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs, Error **errp)
{ {
CPUS390XState *env = cpu_env(cs); CPUS390XState *env = cpu_env(cs);
struct kvm_fpu fpu; struct kvm_fpu fpu;