From 412829dc40b12533e35eb1181eba3e80d7a07800 Mon Sep 17 00:00:00 2001
From: Connor Zwick <cozwick@uci.edu>
Date: Thu, 13 May 2021 19:05:51 -0700
Subject: [PATCH] Fixes for Virtio RREF

---
 Makefile                                  | 2 +-
 domains/sys/driver/virtio_net/Cargo.toml  | 1 -
 domains/sys/driver/virtio_net/src/main.rs | 4 ++--
 lib/devices/virtio/Cargo.toml             | 1 -
 lib/devices/virtio_net/Cargo.toml         | 1 -
 lib/devices/virtio_net/src/lib.rs         | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 401676e5..d92fe363 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 DEBUG            ?= false
 LARGE_MEM        ?= true
 IXGBE		 ?= true
-VIRTIO_NET 		 ?= true
+VIRTIO_NET 		 ?= false
 
 ifndef NO_DEFAULT_FLAGS
 CARGO_FLAGS      ?=
diff --git a/domains/sys/driver/virtio_net/Cargo.toml b/domains/sys/driver/virtio_net/Cargo.toml
index bc80b0b3..4c42934b 100644
--- a/domains/sys/driver/virtio_net/Cargo.toml
+++ b/domains/sys/driver/virtio_net/Cargo.toml
@@ -9,7 +9,6 @@ libsyscalls = { path = "../../../../lib/core/libsyscalls" }
 libtime = { path = "../../../../lib/core/libtime" }
 console = { path = "../../../../lib/core/console" }
 malloc = { path = "../../../../lib/core/malloc" }
-rref = { path = "../../../../lib/core/rref" }
 spin = { path = "../../../../lib/core/spin-rs" }
 
 smolnet = { path = "../../../../domains/lib/smolnet" }
diff --git a/domains/sys/driver/virtio_net/src/main.rs b/domains/sys/driver/virtio_net/src/main.rs
index 5879705b..4b4b756b 100644
--- a/domains/sys/driver/virtio_net/src/main.rs
+++ b/domains/sys/driver/virtio_net/src/main.rs
@@ -30,7 +30,7 @@ pub use interface::error::{ErrorKind, Result};
 use virtio_network_device::pci::PciFactory;
 use virtio_network_device::VirtioNetInner;
 
-use rref::{RRef, RRefDeque};
+use interface::rref::{RRef, RRefDeque};
 
 use smolnet::{self, SmolPhy};
 
@@ -103,7 +103,7 @@ pub fn trusted_entry(
     pci: Box<dyn interface::pci::PCI>,
 ) -> Box<dyn interface::net::Net> {
     libsyscalls::syscalls::init(s);
-    rref::init(heap, libsyscalls::syscalls::sys_get_current_domain_id());
+    interface::rref::init(heap, libsyscalls::syscalls::sys_get_current_domain_id());
 
     let net = {
         let mut pci_factory = PciFactory::new();
diff --git a/lib/devices/virtio/Cargo.toml b/lib/devices/virtio/Cargo.toml
index 8ae9418b..98d1c7a3 100644
--- a/lib/devices/virtio/Cargo.toml
+++ b/lib/devices/virtio/Cargo.toml
@@ -11,5 +11,4 @@ libsyscalls = { path = "../../../lib/core/libsyscalls" }
 libtime = { path = "../../../lib/core/libtime" }
 console = { path = "../../../lib/core/console" }
 malloc = { path = "../../../lib/core/malloc" }
-rref = { path = "../../../lib/core/rref" }
 volatile_accessor = { path = "../../../lib/external/volatile_accessor" }
\ No newline at end of file
diff --git a/lib/devices/virtio_net/Cargo.toml b/lib/devices/virtio_net/Cargo.toml
index d1e67fae..fe88f116 100644
--- a/lib/devices/virtio_net/Cargo.toml
+++ b/lib/devices/virtio_net/Cargo.toml
@@ -11,7 +11,6 @@ libsyscalls = { path = "../../../lib/core/libsyscalls" }
 libtime = { path = "../../../lib/core/libtime" }
 console = { path = "../../../lib/core/console" }
 malloc = { path = "../../../lib/core/malloc" }
-rref = { path = "../../../lib/core/rref" }
 spin = { path = "../../../lib/core/spin-rs" }
 volatile_accessor = { path = "../../../lib/external/volatile_accessor" }
 
diff --git a/lib/devices/virtio_net/src/lib.rs b/lib/devices/virtio_net/src/lib.rs
index 4aabfc3b..42b198d7 100644
--- a/lib/devices/virtio_net/src/lib.rs
+++ b/lib/devices/virtio_net/src/lib.rs
@@ -15,7 +15,7 @@ extern crate alloc;
 use alloc::sync::Arc;
 use console::println;
 use hashbrown::HashMap;
-use rref::{RRef, RRefDeque};
+use interface::rref::{RRef, RRefDeque};
 use spin::Mutex;
 use virtio_device::defs::{
     VirtQueue, VirtqAvailable, VirtqDescriptor, VirtqUsed, VirtqUsedElement, VirtualQueues,