github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 06:52:13 +00:00
Code Issues Projects Releases Wiki Activity

runtime/qemu: Move from query-cpus to query-cpus-fast

Browse Source 
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>
This commit is contained in:
David Gibson 2021-09-15 16:41:26 +10:00
parent e7deee948a
commit 64bb803fcf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/virtcontainers/qemu.go
View File

@ -2194,7 +2194,7 @@ func (q *qemu) getThreadIDs(ctx context.Context) (vcpuThreadIDs, error) {
return tid, err return tid, err
} }
cpuInfos, err := q.qmpMonitorCh.qmp.ExecQueryCpus(q.qmpMonitorCh.ctx) cpuInfos, err := q.qmpMonitorCh.qmp.ExecQueryCpusFast(q.qmpMonitorCh.ctx)
if err != nil { if err != nil {
q.Logger().WithError(err).Error("failed to query cpu infos") q.Logger().WithError(err).Error("failed to query cpu infos")
return tid, err return tid, err
@ -2203,7 +2203,7 @@ func (q *qemu) getThreadIDs(ctx context.Context) (vcpuThreadIDs, error) {
tid.vcpus = make(map[int]int, len(cpuInfos)) tid.vcpus = make(map[int]int, len(cpuInfos))
for _, i := range cpuInfos { for _, i := range cpuInfos {
if i.ThreadID > 0 { if i.ThreadID > 0 {
tid.vcpus[i.CPU] = i.ThreadID tid.vcpus[i.CPUIndex] = i.ThreadID
} }
} }
return tid, nil return tid, nil