From 40b00e2bcd363f688c7acf34e66277435b82ef89 Mon Sep 17 00:00:00 2001 From: Benjamin Lamowski Date: Tue, 14 Jan 2025 13:27:01 +0100 Subject: [PATCH] fixup: hw: x86_64: refactor Vm_session_component Remove unused vCPU priority support. Issue #5221 --- .../x86_64/virtualization/svm_session_component.h | 1 - .../x86_64/virtualization/vmx_session_component.h | 1 - repos/base-hw/src/core/spec/x86_64/vm_root.h | 13 ++----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/repos/base-hw/src/core/spec/x86_64/virtualization/svm_session_component.h b/repos/base-hw/src/core/spec/x86_64/virtualization/svm_session_component.h index a31122e7c0..5e631f76bd 100644 --- a/repos/base-hw/src/core/spec/x86_64/virtualization/svm_session_component.h +++ b/repos/base-hw/src/core/spec/x86_64/virtualization/svm_session_component.h @@ -116,7 +116,6 @@ class Core::Svm_session_component Diag diag, Ram_allocator &ram_alloc, Region_map ®ion_map, - unsigned, Trace::Source_registry &) : Session_object(ds_ep, resources, label, diag), diff --git a/repos/base-hw/src/core/spec/x86_64/virtualization/vmx_session_component.h b/repos/base-hw/src/core/spec/x86_64/virtualization/vmx_session_component.h index e2e4874251..66538e11bd 100644 --- a/repos/base-hw/src/core/spec/x86_64/virtualization/vmx_session_component.h +++ b/repos/base-hw/src/core/spec/x86_64/virtualization/vmx_session_component.h @@ -116,7 +116,6 @@ class Core::Vmx_session_component Diag diag, Ram_allocator &ram_alloc, Region_map ®ion_map, - unsigned, Trace::Source_registry &) : Session_object(ds_ep, resources, label, diag), diff --git a/repos/base-hw/src/core/spec/x86_64/vm_root.h b/repos/base-hw/src/core/spec/x86_64/vm_root.h index 93413b899b..ab87d40881 100644 --- a/repos/base-hw/src/core/spec/x86_64/vm_root.h +++ b/repos/base-hw/src/core/spec/x86_64/vm_root.h @@ -43,15 +43,6 @@ class Core::Vm_root : public Root_component> Session_object *_create_session(const char *args) override { - unsigned priority = 0; - Arg a = Arg_string::find_arg(args, "priority"); - if (a.valid()) { - priority = (unsigned)a.ulong_value(0); - - /* clamp priority value to valid range */ - priority = min((unsigned)Cpu_session::PRIORITY_LIMIT - 1, priority); - } - Session::Resources resources = session_resources_from_args(args); if (Hw::Virtualization_support::has_svm()) @@ -61,7 +52,7 @@ class Core::Vm_root : public Root_component> resources, session_label_from_args(args), session_diag_from_args(args), - _ram_allocator, _local_rm, priority, + _ram_allocator, _local_rm, _trace_sources); if (Hw::Virtualization_support::has_vmx()) @@ -71,7 +62,7 @@ class Core::Vm_root : public Root_component> session_resources_from_args(args), session_label_from_args(args), session_diag_from_args(args), - _ram_allocator, _local_rm, priority, + _ram_allocator, _local_rm, _trace_sources); Genode::error( "No virtualization support detected.");