summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2022-04-03 17:09:29 +0100
committerAndreas Kling <kling@serenityos.org>2022-04-03 23:20:33 +0200
commit0f27432ec699e2d751bd88edd308738701590434 (patch)
tree34260570af05bb50023171e82de24983b2c69adf
parent3f9c2495e5e951ad588d8201bb6215e597ad85ac (diff)
downloadserenity-0f27432ec699e2d751bd88edd308738701590434.zip
Kernel+SystemMonitor+lscpu: Rename 'CPUID' -> 'Vendor ID'
This is what the Intel manual, as well as Linux's cpuinfo calls it.
-rw-r--r--Kernel/GlobalProcessExposed.cpp3
-rw-r--r--Userland/Applications/SystemMonitor/main.cpp2
-rw-r--r--Userland/Utilities/lscpu.cpp4
3 files changed, 4 insertions, 5 deletions
diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp
index d1f312a164..cab35c8682 100644
--- a/Kernel/GlobalProcessExposed.cpp
+++ b/Kernel/GlobalProcessExposed.cpp
@@ -582,8 +582,7 @@ private:
auto& info = proc.info();
auto obj = TRY(array.add_object());
TRY(obj.add("processor", proc.id()));
- // FIXME: Rename this to use the same name everywhere.
- TRY(obj.add("cpuid", info.vendor_id_string()));
+ TRY(obj.add("vendor_id", info.vendor_id_string()));
TRY(obj.add("family", info.display_family()));
auto features_array = TRY(obj.add_array("features"));
diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp
index 59af7b682f..53ab6eda2f 100644
--- a/Userland/Applications/SystemMonitor/main.cpp
+++ b/Userland/Applications/SystemMonitor/main.cpp
@@ -133,7 +133,7 @@ public:
{
Vector<GUI::JsonArrayModel::FieldSpec> processors_field;
processors_field.empend("processor", "Processor", Gfx::TextAlignment::CenterRight);
- processors_field.empend("cpuid", "CPUID", Gfx::TextAlignment::CenterLeft);
+ processors_field.empend("vendor_id", "Vendor ID", Gfx::TextAlignment::CenterLeft);
processors_field.empend("brand", "Brand", Gfx::TextAlignment::CenterLeft);
processors_field.empend("Features", Gfx::TextAlignment::CenterLeft, [](auto& object) {
StringBuilder builder;
diff --git a/Userland/Utilities/lscpu.cpp b/Userland/Utilities/lscpu.cpp
index a8f69df42b..89af32f9c4 100644
--- a/Userland/Utilities/lscpu.cpp
+++ b/Userland/Utilities/lscpu.cpp
@@ -14,8 +14,8 @@
static void print_cpu_info(JsonObject const& value)
{
outln("CPU {}:", value.get("processor").as_u32());
- outln("\tVendor ID: {}", value.get("cpuid").as_string());
- outln("\tModel: {}", value.get("brand").as_string());
+ outln("\tVendor ID: {}", value.get("vendor_id").as_string());
+ outln("\tBrand: {}", value.get("brand").as_string());
outln("\tFamily: {}", value.get("family").as_u32());
outln("\tModel: {}", value.get("model").as_u32());
outln("\tStepping: {}", value.get("stepping").as_u32());