Merge branch 'fmorgner/x86-64-double-fault-handling' into 'develop'

x86_64: handle double faults

See merge request teachos/kernel!59

1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/kapi/devices/facet_registry.tests.cpp b/kernel/kapi/devices/facet_registry.tests.cpp
index 9396fc6c..f6735f01 100644
--- a/kernel/kapi/devices/facet_registry.tests.cpp
+++ b/kernel/kapi/devices/facet_registry.tests.cpp
@@ -50,15 +50,15 @@ namespace
       return m_value;
     }
 
-    auto query_facet(kapi::capabilities::facet_id facet) -> void * override
+    auto query_facet(kapi::capabilities::facet_id facet) -> kstd::observer_ptr<void> override
     {
       if (facet == probe_device::id)
       {
-        return static_cast<probe_device *>(this);
+        return kstd::make_observer<probe_device>(this);
       }
       if (facet == const_device::id)
       {
-        return m_const_device;
+        return kstd::observer_ptr{m_const_device};
       }
 
       return kapi::devices::device::query_facet(facet);
@@ -143,7 +143,7 @@ SCENARIO("Publishing and finding a device", "[kapi][devices][facet_registry]")
 
       THEN("publishing a free standing second facet for the same device succeeds")
       {
-        REQUIRE(registry.publish(device, "probe0", &free_standing_facet));
+        REQUIRE(registry.publish(device, "probe0", kstd::make_observer(&free_standing_facet)));
       }
 
       AND_WHEN("getting all devices implementing that facet")
@@ -239,7 +239,7 @@ SCENARIO("Publishing and finding a device", "[kapi][devices][facet_registry]")
 
     THEN("publishing the facet for the device fails")
     {
-      REQUIRE_FALSE(registry.publish(device, "probe0", &facet));
+      REQUIRE_FALSE(registry.publish(device, "probe0", kstd::make_observer(&facet)));
     }
   }
 }