From: Masayoshi Mizuma <msys.mizuma@gmail.com>
To: util-linux@vger.kernel.org
Cc: Masayoshi Mizuma <msys.mizuma@gmail.com>,
Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Subject: [PATCH v3 2/5] lscpu-virt: split hypervisor_from_dmi_table()
Date: Fri, 20 Nov 2020 00:06:06 -0500 [thread overview]
Message-ID: <20201120050609.17409-3-msys.mizuma@gmail.com> (raw)
In-Reply-To: <20201120050609.17409-1-msys.mizuma@gmail.com>
From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Split hypervisor_from_dmi_table() to parsing dmi table and checking the
hypervisor vendor.
Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
sys-utils/lscpu-virt.c | 54 ++++++++++++++++++++++++++----------------
sys-utils/lscpu.h | 6 +++++
2 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/sys-utils/lscpu-virt.c b/sys-utils/lscpu-virt.c
index 8d7c9b740..c86dae8c9 100644
--- a/sys-utils/lscpu-virt.c
+++ b/sys-utils/lscpu-virt.c
@@ -76,20 +76,13 @@ nothing:
return NULL;
}
-static int hypervisor_from_dmi_table(uint32_t base, uint16_t len,
- uint16_t num, const char *devmem)
+static int parse_dmi_table(uint16_t len, uint16_t num,
+ uint8_t *data,
+ struct dmi_info *di)
{
- uint8_t *buf;
- uint8_t *data;
+ uint8_t *buf = data;
+ int rc = -1;
int i = 0;
- char *vendor = NULL;
- char *product = NULL;
- char *manufacturer = NULL;
- int rc = VIRT_VENDOR_NONE;
-
- data = buf = get_mem_chunk(base, len, devmem);
- if (!buf)
- goto done;
/* 4 is the length of an SMBIOS structure header */
while (i < num && data + 4 <= buf + len) {
@@ -113,11 +106,11 @@ static int hypervisor_from_dmi_table(uint32_t base, uint16_t len,
next += 2;
switch (h.type) {
case 0:
- vendor = dmi_string(&h, data[0x04]);
+ di->vendor = dmi_string(&h, data[0x04]);
break;
case 1:
- manufacturer = dmi_string(&h, data[0x04]);
- product = dmi_string(&h, data[0x05]);
+ di->manufacturer = dmi_string(&h, data[0x04]);
+ di->product = dmi_string(&h, data[0x05]);
break;
default:
break;
@@ -126,15 +119,36 @@ static int hypervisor_from_dmi_table(uint32_t base, uint16_t len,
data = next;
i++;
}
- if (manufacturer && !strcmp(manufacturer, "innotek GmbH"))
+ rc = 0;
+done:
+ return rc;
+}
+
+static int hypervisor_from_dmi_table(uint32_t base, uint16_t len,
+ uint16_t num, const char *devmem)
+{
+ uint8_t *data;
+ int rc = VIRT_VENDOR_NONE;
+ struct dmi_info di;
+
+ data = get_mem_chunk(base, len, devmem);
+ if (!data)
+ return rc;
+
+ memset(&di, 0, sizeof(struct dmi_info));
+ rc = parse_dmi_table(len, num, data, &di);
+ if (rc < 0)
+ goto done;
+
+ if (di.manufacturer && !strcmp(di.manufacturer, "innotek GmbH"))
rc = VIRT_VENDOR_INNOTEK;
- else if (manufacturer && strstr(manufacturer, "HITACHI") &&
- product && strstr(product, "LPAR"))
+ else if (di.manufacturer && strstr(di.manufacturer, "HITACHI") &&
+ di.product && strstr(di.product, "LPAR"))
rc = VIRT_VENDOR_HITACHI;
- else if (vendor && !strcmp(vendor, "Parallels"))
+ else if (di.vendor && !strcmp(di.vendor, "Parallels"))
rc = VIRT_VENDOR_PARALLELS;
done:
- free(buf);
+ free(data);
return rc;
}
diff --git a/sys-utils/lscpu.h b/sys-utils/lscpu.h
index 7d42816c3..11b27fb14 100644
--- a/sys-utils/lscpu.h
+++ b/sys-utils/lscpu.h
@@ -305,6 +305,12 @@ struct lscpu_dmi_header
uint8_t *data;
};
+struct dmi_info {
+ char *vendor;
+ char *product;
+ char *manufacturer;
+};
+
static inline void to_dmi_header(struct lscpu_dmi_header *h, uint8_t *data)
{
h->type = data[0];
--
2.27.0
next prev parent reply other threads:[~2020-11-20 5:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 5:06 [PATCH v3 0/5] lscpu: Fix socket information on aarch64 machine Masayoshi Mizuma
2020-11-20 5:06 ` [PATCH v3 1/5] lscpu: use cluster on aarch64 machine which doesn't have ACPI PPTT Masayoshi Mizuma
2020-11-20 5:06 ` Masayoshi Mizuma [this message]
2020-11-20 5:06 ` [PATCH v3 3/5] lscpu-dmi: Move some functions related to DMI to lscpu-dmi Masayoshi Mizuma
2020-11-20 5:06 ` [PATCH v3 4/5] lscpu: add helper to get physical sockets Masayoshi Mizuma
2020-11-20 5:06 ` [PATCH v3 5/5] lscpu: show the number of physical socket on aarch64 machine without ACPI PPTT Masayoshi Mizuma
2020-11-20 9:07 ` [PATCH v3 0/5] lscpu: Fix socket information on aarch64 machine Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201120050609.17409-3-msys.mizuma@gmail.com \
--to=msys.mizuma@gmail.com \
--cc=m.mizuma@jp.fujitsu.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).