mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-22 04:25:18 +00:00
qemu: monitor: Don't bother extracting vCPU halted state in text monitor
The code causes the 'offset' variable to be overwritten (possibly with NULL if neither of the vCPUs is halted) which causes a crash since the variable is still used after that part. Additionally there's a bug, since strstr() would look up the '(halted)' string in the whole string rather than just the currently processed line the returned data is completely bogus. Rather than switching to single line parsing let's remove the code altogether since it has a commonly used JSON monitor alternative and the data itself is not very useful to report. The code was introduced in commit cc5e695bde Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452106
This commit is contained in:
parent
6a12907d86
commit
6ff99e9577
@ -552,12 +552,6 @@ qemuMonitorTextQueryCPUs(qemuMonitorPtr mon,
|
||||
cpu.qemu_id = cpuid;
|
||||
cpu.tid = tid;
|
||||
|
||||
/* Extract halted indicator */
|
||||
if ((offset = strstr(line, "(halted)")) != NULL)
|
||||
cpu.halted = true;
|
||||
else
|
||||
cpu.halted = false;
|
||||
|
||||
if (VIR_APPEND_ELEMENT_COPY(cpus, ncpus, cpu) < 0) {
|
||||
ret = -1;
|
||||
goto cleanup;
|
||||
|
Loading…
x
Reference in New Issue
Block a user