From 53cf28c47c8b50c315ac581019f768f906d9255a Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Sun, 19 Sep 2021 21:02:53 +0300 Subject: [PATCH] Kernel: Use StringView literals in VirtIO::determine_device_class() Since the return type is StringView we can just create them at compile time and avoid the run-time construction. --- Kernel/Bus/VirtIO/Device.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Kernel/Bus/VirtIO/Device.cpp b/Kernel/Bus/VirtIO/Device.cpp index 78f851f44e4..3945207de73 100644 --- a/Kernel/Bus/VirtIO/Device.cpp +++ b/Kernel/Bus/VirtIO/Device.cpp @@ -54,34 +54,36 @@ StringView determine_device_class(const PCI::Address& address) auto subsystem_device_id = PCI::get_subsystem_id(address); switch (subsystem_device_id) { case 1: - return "VirtIONetAdapter"; + return "VirtIONetAdapter"sv; case 2: - return "VirtIOBlockDevice"; + return "VirtIOBlockDevice"sv; case 3: - return "VirtIOConsole"; + return "VirtIOConsole"sv; case 4: - return "VirtIORNG"; + return "VirtIORNG"sv; + default: + dbgln("VirtIO: Unknown subsystem_device_id {}", subsystem_device_id); + VERIFY_NOT_REACHED(); } - dbgln("VirtIO: Unknown subsystem_device_id {}", subsystem_device_id); - VERIFY_NOT_REACHED(); } auto id = PCI::get_id(address); VERIFY(id.vendor_id == PCI::VendorID::VirtIO); switch (id.device_id) { case PCI::DeviceID::VirtIONetAdapter: - return "VirtIONetAdapter"; + return "VirtIONetAdapter"sv; case PCI::DeviceID::VirtIOBlockDevice: - return "VirtIOBlockDevice"; + return "VirtIOBlockDevice"sv; case PCI::DeviceID::VirtIOConsole: - return "VirtIOConsole"; + return "VirtIOConsole"sv; case PCI::DeviceID::VirtIOEntropy: - return "VirtIORNG"; + return "VirtIORNG"sv; case PCI::DeviceID::VirtIOGPU: - return "VirtIOGPU"; + return "VirtIOGPU"sv; + default: + dbgln("VirtIO: Unknown device_id {}", id.vendor_id); + VERIFY_NOT_REACHED(); } - dbgln("VirtIO: Unknown device_id {}", id.vendor_id); - VERIFY_NOT_REACHED(); } UNMAP_AFTER_INIT void Device::initialize()