b60d6a584c
- target/i386: csv: Release CSV3 shared pages after unmapping DMA - target/i386: Add new CPU model ClearwaterForest - target/i386: add sha512, sm3, sm4 feature bits - docs: Add GNR, SRF and CWF CPU models - target/i386: Export BHI_NO bit to guests - target/i386: Introduce SierraForest-v2 model - vdpa/iommufd:Implement DMA mapping through the iommufd interface - vdpa/iommufd:Introduce vdpa-iommufd module - vdpa/iommufd:support associating iommufd backend for vDPA devices - Kconfig/iommufd/VDPA: Update IOMMUFD module configuration dependencies The vDPA module can also use IOMMUFD like the VFIO module. - backends/iommufd: Get rid of qemu_open_old() - backends/iommufd: Make iommufd_backend_*() return bool - backends/iommufd: Fix missing ERRP_GUARD() for error_prepend() - backends/iommufd: Remove mutex - backends/iommufd: Remove check on number of backend users - hw/intc: Add extioi ability of 256 vcpu interrupt routing - hw/rtc: Fixed loongson rtc emulation errors - hw/loongarch/boot: Adjust the loading position of the initrd - target/loongarch: Fix the cpu unplug resource leak - target/loongarch: fix vcpu reset command word issue - vdpa:Fix dirty page bitmap synchronization not done after suspend for vdpa devices Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit a5212066e7516ff2a316e1b2feaa75dd5ee4d17a)
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From 655073e4e179e601e35a444f585d8e2049df97f5 Mon Sep 17 00:00:00 2001
|
|
From: Xianglai Li <lixianglai@loongson.cn>
|
|
Date: Wed, 5 Feb 2025 19:56:54 +0800
|
|
Subject: [PATCH] target/loongarch: fix vcpu reset command word issue
|
|
|
|
When the KVM_REG_LOONGARCH_VCPU_RESET command word
|
|
is sent to the kernel through the kvm_set_one_reg interface,
|
|
the parameter source needs to be a legal address,
|
|
otherwise the kernel will return an error and the command word
|
|
will fail to be sent.
|
|
|
|
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
|
|
---
|
|
target/loongarch/cpu.c | 2 +-
|
|
target/loongarch/kvm/kvm.c | 9 ++++++++-
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
|
|
index ee764f0bc7..570ce8be3b 100644
|
|
--- a/target/loongarch/cpu.c
|
|
+++ b/target/loongarch/cpu.c
|
|
@@ -638,8 +638,8 @@ static void loongarch_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
|
loongarch_cpu_register_gdb_regs_for_features(cs);
|
|
|
|
- cpu_reset(cs);
|
|
qemu_init_vcpu(cs);
|
|
+ cpu_reset(cs);
|
|
|
|
lacc->parent_realize(dev, errp);
|
|
}
|
|
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
|
|
index 0acdd5c4c1..277210ca04 100644
|
|
--- a/target/loongarch/kvm/kvm.c
|
|
+++ b/target/loongarch/kvm/kvm.c
|
|
@@ -590,9 +590,16 @@ static int kvm_loongarch_get_lbt(CPUState *cs)
|
|
void kvm_arch_reset_vcpu(CPUState *cs)
|
|
{
|
|
CPULoongArchState *env = cpu_env(cs);
|
|
+ int ret = 0;
|
|
+ uint64_t unused = 0;
|
|
|
|
env->mp_state = KVM_MP_STATE_RUNNABLE;
|
|
- kvm_set_one_reg(cs, KVM_REG_LOONGARCH_VCPU_RESET, 0);
|
|
+ ret = kvm_set_one_reg(cs, KVM_REG_LOONGARCH_VCPU_RESET, &unused);
|
|
+ if (ret) {
|
|
+ error_report("Failed to set KVM_REG_LOONGARCH_VCPU_RESET: %s",
|
|
+ strerror(errno));
|
|
+ exit(EXIT_FAILURE);
|
|
+ }
|
|
}
|
|
|
|
static int kvm_loongarch_get_mpstate(CPUState *cs)
|
|
--
|
|
2.41.0.windows.1
|
|
|