diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9991a0a644..1bf8bafe63 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1209,7 +1209,6 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, for (i = 0 ; i < ncpus ; i++) { virJSONValuePtr entry = virJSONValueArrayGet(data, i); - int cpu; int thread; if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1217,12 +1216,6 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, goto cleanup; } - if (virJSONValueObjectGetNumberInt(entry, "CPU", &cpu) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cpu information was missing cpu number")); - goto cleanup; - } - if (virJSONValueObjectGetNumberInt(entry, "thread_id", &thread) < 0) { /* Only qemu-kvm tree includs thread_id, so treat this as non-fatal, simply returning no data */ @@ -1230,13 +1223,6 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, goto cleanup; } - if (cpu != i) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected cpu index %d expecting %d"), - i, cpu); - goto cleanup; - } - threads[i] = thread; } diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 58f632338b..1b6efba95d 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -510,7 +510,6 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, { char *qemucpus = NULL; char *line; - int lastVcpu = -1; pid_t *cpupids = NULL; size_t ncpupids = 0; @@ -530,16 +529,12 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, do { char *offset = strchr(line, '#'); char *end = NULL; - int vcpu = 0, tid = 0; + int tid = 0; /* See if we're all done */ if (offset == NULL) break; - /* Extract VCPU number */ - if (virStrToLong_i(offset + 1, &end, 10, &vcpu) < 0) - goto error; - if (end == NULL || *end != ':') goto error; @@ -552,15 +547,11 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, if (end == NULL || !c_isspace(*end)) goto error; - if (vcpu != (lastVcpu + 1)) - goto error; - if (VIR_REALLOC_N(cpupids, ncpupids+1) < 0) goto error; - VIR_DEBUG("vcpu=%d pid=%d", vcpu, tid); + VIR_DEBUG("pid=%d", tid); cpupids[ncpupids++] = tid; - lastVcpu = vcpu; /* Skip to next data line */ line = strchr(offset, '\r');