C++

Author: assembler-0

drivers/virtio/VirtioBlk.c

@@ -3,9 +3,7 @@
 #include <BlockDevice.h>
 #include <Console.h>
 #include <DriveNaming.h>
-#include <Format.h>
 #include <PCI/PCI.h>
-#include <../../kernel/atomic/cpp/Spinlock.h>
 #include <SpinlockRust.h>
 #include <VMem.h>
 #include <Virtio.h>

kernel/atomic/cpp/Spinlock.h

@@ -17,7 +17,10 @@ class SpinlockGuard {
 public:
     explicit SpinlockGuard(Spinlock& lock);
     ~SpinlockGuard();
-
+    SpinlockGuard(const SpinlockGuard&) = delete;
+    SpinlockGuard& operator=(const SpinlockGuard&) = delete;
+    SpinlockGuard(SpinlockGuard&&) = delete;
+    SpinlockGuard& operator=(SpinlockGuard&&) = delete;
 private:
     Spinlock& lock;
 };
@@ -28,7 +31,7 @@ class SpinlockGuard {
 extern "C" {
 #endif
 
-typedef struct Spinlock Spinlock;
+typedef Spinlock Spinlock;
 
 void spinlock_lock(Spinlock* lock);
 void spinlock_unlock(Spinlock* lock);