ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lscpu: cleanup ppc virtualization detection 

References: https://bugzilla.redhat.com/show_bug.cgi?id=1151604
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2015-02-06 11:23:40 +01:00
parent 9992324409
commit 79738105b1
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys-utils/lscpu.c
View File

@ -623,22 +623,19 @@ read_hypervisor_powerpc(struct lscpu_desc *desc)
{
assert(!desc->hyper);
/* powerpc:
* IBM iSeries: legacy, if /proc/iSeries exists, its para-virtualized on top of OS/400
* IBM pSeries: always has a hypervisor
* if partition-name is "full", its kind of "bare-metal": full-system-partition
* otherwise its some partition created by Hardware Management Console
* in any case, its always some sort of HVM
*
* Note that pSeries could also be emulated by qemu and it's
* indicated by 'qemu,pseries" in /compatible
*
* KVM: "linux,kvm" in /hypervisor/compatible indicates a KVM guest
* Xen: not in use, not detected
*/
/* IBM iSeries: legacy, para-virtualized on top of OS/400 */
if (path_exist("/proc/iSeries")) {
desc->hyper = HYPER_OS400;
desc->virtype = VIRT_PARA;
/* PowerNV (POWER Non-Virtualized, bare-metal) */
} else if (path_exist(_PATH_PROC_DEVICETREE "/compatible")) {
if (is_compatible(_PATH_PROC_DEVICETREE "/compatible", "ibm,powernv")) {
desc->hyper = HYPER_KVM;
desc->virtype = VIRT_PARA;
}
/* PowerVM (IBM's proprietary hypervisor, aka pHyp */
} else if (path_exist(_PATH_PROC_DEVICETREE "/ibm,partition-name")
&& path_exist(_PATH_PROC_DEVICETREE "/hmc-managed?")
&& !path_exist(_PATH_PROC_DEVICETREE "/chosen/qemu,graphic-width")) {
@ -652,16 +649,12 @@ read_hypervisor_powerpc(struct lscpu_desc *desc)
desc->virtype = VIRT_NONE;
fclose(fd);
}
} else if (path_exist(_PATH_PROC_DEVICETREE "/hypervisor/compatible")) {
if (is_compatible(_PATH_PROC_DEVICETREE "/hypervisor/compatible",
"linux,kvm")) {
desc->hyper = HYPER_KVM;
desc->virtype = VIRT_FULL;
}
/* Qemu */
} else if (path_exist(_PATH_PROC_DEVICETREE "/compatible")) {
if (is_compatible(_PATH_PROC_DEVICETREE "/compatible", "qemu,pseries")) {
desc->hyper = HYPER_KVM;
desc->virtype = VIRT_FULL;
desc->virtype = VIRT_PARA;
}
}
return desc->hyper;