summaryrefslogtreecommitdiffstats
path: root/sys-utils/lscpu.c
diff options
context:
space:
mode:
authorKarel Zak2013-02-14 15:38:08 +0100
committerKarel Zak2013-02-14 15:38:08 +0100
commiteff79ceb0b0eaa0334e5b546870548dceda27f7b (patch)
treeb06dcbf6d31cfc38d1cb424096327072beb41ba8 /sys-utils/lscpu.c
parentnsenter: fix errors in manpage (diff)
downloadkernel-qcow2-util-linux-eff79ceb0b0eaa0334e5b546870548dceda27f7b.tar.gz
kernel-qcow2-util-linux-eff79ceb0b0eaa0334e5b546870548dceda27f7b.tar.xz
kernel-qcow2-util-linux-eff79ceb0b0eaa0334e5b546870548dceda27f7b.zip
lscpu: don't read cpuid on non-live systems
Reported-by: Luis Aranguren <pizzaman@hotmail.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/lscpu.c')
-rw-r--r--sys-utils/lscpu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 824c8b77b..b4fe02dd6 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -518,9 +518,10 @@ read_hypervisor_cpuid(struct lscpu_desc *desc)
#endif
static void
-read_hypervisor(struct lscpu_desc *desc)
+read_hypervisor(struct lscpu_desc *desc, struct lscpu_modifier *mod)
{
- read_hypervisor_cpuid(desc);
+ if (mod->system != SYSTEM_SNAPSHOT)
+ read_hypervisor_cpuid(desc);
if (desc->hyper)
/* hvm */
@@ -1385,7 +1386,7 @@ int main(int argc, char *argv[])
sizeof(struct cpu_cache), cachecmp);
read_nodes(desc);
- read_hypervisor(desc);
+ read_hypervisor(desc, mod);
switch(mod->mode) {
case OUTPUT_SUMMARY: