From 22f91ab3a2a9982c050ee1b0b68e40bb79d85b82 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Wed, 4 Sep 2019 12:49:55 -0700
Subject: [PATCH] vm-virtio: Move vsock to its own module

There is a lot of code related to this virtio-vsock hybrid
implementation, that's why it's better to keep it under its
own module.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 vm-virtio/src/{vsock.rs => vsock/device.rs} |  6 +++---
 vm-virtio/src/vsock/mod.rs                  | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 rename vm-virtio/src/{vsock.rs => vsock/device.rs} (99%)
 create mode 100644 vm-virtio/src/vsock/mod.rs

diff --git a/vm-virtio/src/vsock.rs b/vm-virtio/src/vsock/device.rs
similarity index 99%
rename from vm-virtio/src/vsock.rs
rename to vm-virtio/src/vsock/device.rs
index 8329cca87..08e2d3360 100644
--- a/vm-virtio/src/vsock.rs
+++ b/vm-virtio/src/vsock/device.rs
@@ -36,12 +36,12 @@ use std::result;
 use std::sync::{Arc, RwLock};
 use std::thread;
 
-use super::Error as DeviceError;
-use super::{
+use crate::Error as DeviceError;
+use crate::VirtioInterrupt;
+use crate::{
     ActivateError, ActivateResult, DeviceEventT, Queue, VirtioDevice, VirtioDeviceType,
     VIRTIO_F_VERSION_1,
 };
-use crate::VirtioInterrupt;
 use byteorder::{ByteOrder, LittleEndian};
 use vm_memory::GuestMemoryMmap;
 use vmm_sys_util::eventfd::EventFd;
diff --git a/vm-virtio/src/vsock/mod.rs b/vm-virtio/src/vsock/mod.rs
new file mode 100644
index 000000000..4e8e24a05
--- /dev/null
+++ b/vm-virtio/src/vsock/mod.rs
@@ -0,0 +1,13 @@
+// Copyright 2019 Intel Corporation. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Portions Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the THIRD-PARTY file.
+
+mod device;
+
+pub use self::device::Vsock;