From: Karel Zak <kzak@redhat.com>
Date: Thu, 14 Feb 2013 14:38:08 +0000 (+0100)
Subject: lscpu: don't read cpuid on non-live systems
X-Git-Tag: v2.23-rc1~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eff79ceb0b0eaa0334e5b546870548dceda27f7b;p=thirdparty%2Futil-linux.git

lscpu: don't read cpuid on non-live systems

Reported-by: Luis Aranguren <pizzaman@hotmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 824c8b77b2..b4fe02dd67 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: