|
 |
8ecbbe |
From c223ad8f05d2d20a80e21dbb4b6240f11909f92c Mon Sep 17 00:00:00 2001
|
|
|
8ecbbe |
From: Karel Zak <kzak@redhat.com>
|
|
|
8ecbbe |
Date: Thu, 14 Jul 2022 13:10:16 +0200
|
|
|
8ecbbe |
Subject: lscpu: don;t read from HW when use /sys snapshot
|
|
|
8ecbbe |
|
|
|
8ecbbe |
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2069187
|
|
|
8ecbbe |
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
|
8ecbbe |
---
|
|
|
8ecbbe |
sys-utils/lscpu.c | 8 ++++++--
|
|
|
8ecbbe |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
8ecbbe |
|
|
|
8ecbbe |
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
|
|
|
8ecbbe |
index 70a797dd6..01f8fba35 100644
|
|
|
8ecbbe |
--- a/sys-utils/lscpu.c
|
|
|
8ecbbe |
+++ b/sys-utils/lscpu.c
|
|
|
8ecbbe |
@@ -1850,7 +1850,10 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
|
|
|
8ecbbe |
}
|
|
|
8ecbbe |
} else {
|
|
|
8ecbbe |
if (desc->is_cluster) {
|
|
|
8ecbbe |
- int sockets = get_number_of_physical_sockets_from_dmi();
|
|
|
8ecbbe |
+ int sockets = 0;
|
|
|
8ecbbe |
+
|
|
|
8ecbbe |
+ if (mod->system == SYSTEM_LIVE)
|
|
|
8ecbbe |
+ sockets = get_number_of_physical_sockets_from_dmi();
|
|
|
8ecbbe |
|
|
|
8ecbbe |
if (sockets > 0)
|
|
|
8ecbbe |
add_summary_n(tb, _("Socket(s):"), sockets);
|
|
|
8ecbbe |
@@ -2109,7 +2112,8 @@ int main(int argc, char *argv[])
|
|
|
8ecbbe |
qsort(desc->ecaches, desc->necaches,
|
|
|
8ecbbe |
sizeof(struct cpu_cache), cachecmp);
|
|
|
8ecbbe |
|
|
|
8ecbbe |
- desc->is_cluster = is_fallback_to_cluster(desc);
|
|
|
8ecbbe |
+ if (mod->system == SYSTEM_LIVE)
|
|
|
8ecbbe |
+ desc->is_cluster = is_fallback_to_cluster(desc);
|
|
|
8ecbbe |
|
|
|
8ecbbe |
read_nodes(desc);
|
|
|
8ecbbe |
read_hypervisor(desc, mod);
|
|
|
8ecbbe |
--
|
|
|
8ecbbe |
2.36.1
|
|
|
8ecbbe |
|