From 5c96fbb19bedb6d89850f7e10dab0b583deeecbc Mon Sep 17 00:00:00 2001 From: Omer Faruk Bayram Date: Thu, 23 Mar 2023 11:57:29 +0300 Subject: [PATCH] vmm: move the http api into its own submodule This commits moves the http API code into its own submodule. Signed-off-by: Omer Faruk Bayram --- vmm/src/api/{ => http}/http_endpoint.rs | 0 vmm/src/api/{http.rs => http/mod.rs} | 4 +++- vmm/src/api/mod.rs | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) rename vmm/src/api/{ => http}/http_endpoint.rs (100%) rename vmm/src/api/{http.rs => http/mod.rs} (99%) diff --git a/vmm/src/api/http_endpoint.rs b/vmm/src/api/http/http_endpoint.rs similarity index 100% rename from vmm/src/api/http_endpoint.rs rename to vmm/src/api/http/http_endpoint.rs diff --git a/vmm/src/api/http.rs b/vmm/src/api/http/mod.rs similarity index 99% rename from vmm/src/api/http.rs rename to vmm/src/api/http/mod.rs index fd5188271..12ddad93a 100644 --- a/vmm/src/api/http.rs +++ b/vmm/src/api/http/mod.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -use crate::api::http_endpoint::{VmActionHandler, VmCreate, VmInfo, VmmPing, VmmShutdown}; +use self::http_endpoint::{VmActionHandler, VmCreate, VmInfo, VmmPing, VmmShutdown}; use crate::api::{ApiError, ApiRequest, VmAction}; use crate::seccomp_filters::{get_seccomp_filter, Thread}; use crate::{Error as VmmError, Result}; @@ -23,6 +23,8 @@ use std::sync::Arc; use std::thread; use vmm_sys_util::eventfd::EventFd; +pub mod http_endpoint; + /// Errors associated with VMM management #[derive(Debug)] pub enum HttpError { diff --git a/vmm/src/api/mod.rs b/vmm/src/api/mod.rs index 5b0c3847e..2f6d7d42b 100644 --- a/vmm/src/api/mod.rs +++ b/vmm/src/api/mod.rs @@ -32,7 +32,6 @@ pub use self::http::start_http_fd_thread; pub use self::http::start_http_path_thread; pub mod http; -pub mod http_endpoint; use crate::config::{ DeviceConfig, DiskConfig, FsConfig, NetConfig, PmemConfig, RestoreConfig, UserDeviceConfig,