5280b56d80
runtime: 0079-kata-runtime-fix-qemu-SCSIBus-info-not-saved-into-pe.patch 0080-kata-runtime-fix-the-block-device-not-removed-in-dev.patch 0081-kata-runtime-cut-too-long-message-in-grpc-log.patch 0082-kata-runtime-change-sandbox-state-to-unhealthy-when-.patch 0083-kata-runtime-add-removeMountBlockDevices-for-contain.patch 0084-kata-runtime-fix-validInterface-func-cause-crash-pro.patch 0085-kata-runtime-fix-kata-netmon-does-not-exit-when-cont.patch 0086-kata-runtime-add-checkCPUSet-before-create-container.patch 0087-kata-runtime-force-delete-the-sandbox-and-container.patch 0088-kata-runtime-check-sandbox-healthy-state-before-call.patch 0089-kata-add-support-for-update-iface.patch 0090-kata-set-sandbox-or-container-status-to-unhealthy.patch 0091-kata-runtime-add-sandbox-file-lock-while-call-GetSan.patch 0092-qemu-add-arm64-to-support-list-of-dimm.patch 0093-kata-runtime-add-timeout-for-grpcWaitProcessRequest.patch 0094-kata-runtime-fix-update-iface-clean-NIC-cause-route-.patch 0095-kata-runtime-fix-qemu-process-resource-resi.patch 0096-kata-containers-Move-from-query-cpus-to-query-cpus-f.patch agent: 0021-kata-agent-fix-sync-clock-not-work-problem.patch 0022-kata-agent-delete-container-id-from-sandbox-struct.patch 0023-kata-agent-modify-log-level.patch 0024-kata-agent-fix-agent.debug_console-not-work-when-bui.patch Signed-off-by: Vanient <xiadanni1@huawei.com> (cherry picked from commit f2d936028666741658157472b8de9d02187c6d55)
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From dfd1e6aa9be31b0df7866c3a3dbb0ab210a02052 Mon Sep 17 00:00:00 2001
|
|
From: jiangpengfei 00444339 <jiangpengfei9@huawei.com>
|
|
Date: Fri, 22 Apr 2022 11:52:53 +0800
|
|
Subject: [PATCH] kata-containers: Move from query-cpus to query-cpus-fast
|
|
|
|
reason: We recently updated to using qemu-6.1 (from qemu 5.2). Unfortunately one
|
|
breaking change in qemu 6.0 wasn't caught by the CI.
|
|
|
|
The query-cpus QMP command has been removed, replaced by query-cpus-fast
|
|
(which has been available since qemu 2.12). govmm already had support for
|
|
query-cpus-fast, we just weren't using it, so the change is quite easy.
|
|
|
|
fixes #2643
|
|
|
|
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
|
Signed-off-by: jiangpengfei 00444339 <jiangpengfei9@huawei.com>
|
|
---
|
|
virtcontainers/qemu.go | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
|
|
index c60ec02..5c55c09 100644
|
|
--- a/virtcontainers/qemu.go
|
|
+++ b/virtcontainers/qemu.go
|
|
@@ -2210,7 +2210,7 @@ func (q *qemu) getThreadIDs() (vcpuThreadIDs, error) {
|
|
return tid, err
|
|
}
|
|
|
|
- cpuInfos, err := q.qmpMonitorCh.qmp.ExecQueryCpus(q.qmpMonitorCh.ctx)
|
|
+ cpuInfos, err := q.qmpMonitorCh.qmp.ExecQueryCpusFast(q.qmpMonitorCh.ctx)
|
|
if err != nil {
|
|
q.Logger().WithError(err).Error("failed to query cpu infos")
|
|
return tid, err
|
|
@@ -2219,7 +2219,7 @@ func (q *qemu) getThreadIDs() (vcpuThreadIDs, error) {
|
|
tid.vcpus = make(map[int]int, len(cpuInfos))
|
|
for _, i := range cpuInfos {
|
|
if i.ThreadID > 0 {
|
|
- tid.vcpus[i.CPU] = i.ThreadID
|
|
+ tid.vcpus[i.CPUIndex] = i.ThreadID
|
|
}
|
|
}
|
|
return tid, nil
|
|
--
|
|
2.33.0
|
|
|