External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Use a more obvious iterator name

Browse Source 
The algorithm that matches data from query-cpus and
query-hotpluggable-cpus is quite complex. Start using descriptive
iterator names to avoid confusion.
This commit is contained in:
Peter Krempa 2016-09-13 17:28:02 +02:00
parent 988218ca3f
commit 03376b6da0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_monitor.c
View File

@ -1772,6 +1772,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl
char *tmp;
int order = 1;
size_t totalvcpus = 0;
size_t mastervcpu; /* this iterator is used for iterating hotpluggable entities */
size_t i;
size_t j;
@ -1812,19 +1813,19 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl
/* transfer appropriate data from the hotpluggable list to corresponding
* entries. the entries returned by qemu may in fact describe multiple
* logical vcpus in the guest */
j = 0;
mastervcpu = 0;
for (i = 0; i < nhotplugvcpus; i++) {
vcpus[j].socket_id = hotplugvcpus[i].socket_id;
vcpus[j].core_id = hotplugvcpus[i].core_id;
vcpus[j].thread_id = hotplugvcpus[i].thread_id;
vcpus[j].vcpus = hotplugvcpus[i].vcpus;
VIR_STEAL_PTR(vcpus[j].qom_path, hotplugvcpus[i].qom_path);
VIR_STEAL_PTR(vcpus[j].alias, hotplugvcpus[i].alias);
VIR_STEAL_PTR(vcpus[j].type, hotplugvcpus[i].type);
vcpus[j].id = hotplugvcpus[i].enable_id;
vcpus[mastervcpu].socket_id = hotplugvcpus[i].socket_id;
vcpus[mastervcpu].core_id = hotplugvcpus[i].core_id;
vcpus[mastervcpu].thread_id = hotplugvcpus[i].thread_id;
vcpus[mastervcpu].vcpus = hotplugvcpus[i].vcpus;
VIR_STEAL_PTR(vcpus[mastervcpu].qom_path, hotplugvcpus[i].qom_path);
VIR_STEAL_PTR(vcpus[mastervcpu].alias, hotplugvcpus[i].alias);
VIR_STEAL_PTR(vcpus[mastervcpu].type, hotplugvcpus[i].type);
vcpus[mastervcpu].id = hotplugvcpus[i].enable_id;
/* skip over vcpu entries covered by this hotpluggable entry */
j += hotplugvcpus[i].vcpus;
/* calculate next master vcpu (hotpluggable unit) entry */
mastervcpu += hotplugvcpus[i].vcpus;
}
/* match entries from query cpus to the output array taking into account