From 4876f7550d2d64901ce09be9ac3cfd0980a673e2 Mon Sep 17 00:00:00 2001
From: Bo Chen <chen.bo@intel.com>
Date: Fri, 14 Apr 2023 15:41:54 -0700
Subject: [PATCH] Revert "vmm: config: Implement Clone for NetConfig"

This reverts commit ea4a95c4f65b949e983b335abbb077c832596381.

Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 vmm/src/config.rs    | 16 ----------------
 vmm/src/vm_config.rs |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index 98d533038..687175f6e 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -1134,22 +1134,6 @@ impl NetConfig {
     }
 }
 
-impl Clone for NetConfig {
-    fn clone(&self) -> Self {
-        NetConfig {
-            tap: self.tap.clone(),
-            vhost_socket: self.vhost_socket.clone(),
-            id: self.id.clone(),
-            fds: self
-                .fds
-                .as_ref()
-                // SAFETY: We have been handed these FDs through the API
-                .map(|fds| fds.iter().map(|fd| unsafe { libc::dup(*fd) }).collect()),
-            ..*self
-        }
-    }
-}
-
 impl RngConfig {
     pub fn parse(rng: &str) -> Result<Self> {
         let mut parser = OptionParser::new();
diff --git a/vmm/src/vm_config.rs b/vmm/src/vm_config.rs
index ed7e4c109..f9740e57d 100644
--- a/vmm/src/vm_config.rs
+++ b/vmm/src/vm_config.rs
@@ -183,7 +183,7 @@ impl Default for MemoryConfig {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Default)]
 pub enum VhostMode {
     #[default]
     Client,
@@ -248,7 +248,7 @@ impl Default for DiskConfig {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 pub struct NetConfig {
     #[serde(default = "default_netconfig_tap")]
     pub tap: Option<String>,