vmm: Switch to the micro-http package

It's been extracted from the Firecracker code base.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2020-03-11 16:41:33 +01:00
parent 9023444ad3
commit 18dc916380
2 changed files with 5 additions and 23 deletions

26
Cargo.lock generated
View File

@ -418,16 +418,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "micro_http"
version = "0.1.0"
source = "git+https://github.com/firecracker-microvm/firecracker#6b3e5f0a1818fae17657ca3625ad31351a591c06"
source = "git+https://github.com/firecracker-microvm/micro-http#e712d6ae231456ee9e6c0b831fadb3f2dc1acf03"
dependencies = [
"utils 0.1.0 (git+https://github.com/firecracker-microvm/firecracker)",
"epoll 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "net_gen"
version = "0.1.0"
source = "git+https://github.com/firecracker-microvm/firecracker#6b3e5f0a1818fae17657ca3625ad31351a591c06"
[[package]]
name = "net_gen"
version = "0.1.0"
@ -982,17 +977,6 @@ name = "utf8-ranges"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "utils"
version = "0.1.0"
source = "git+https://github.com/firecracker-microvm/firecracker#6b3e5f0a1818fae17657ca3625ad31351a591c06"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"net_gen 0.1.0 (git+https://github.com/firecracker-microvm/firecracker)",
"vmm-sys-util 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "vcpkg"
version = "0.2.8"
@ -1180,7 +1164,7 @@ dependencies = [
"libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"linux-loader 0.1.0 (git+https://github.com/rust-vmm/linux-loader)",
"log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"micro_http 0.1.0 (git+https://github.com/firecracker-microvm/firecracker)",
"micro_http 0.1.0 (git+https://github.com/firecracker-microvm/micro-http)",
"net_util 0.1.0",
"pci 0.1.0",
"qcow 0.1.0",
@ -1294,8 +1278,7 @@ dependencies = [
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "1b9ad466a945c9c40f6f9a449c55675547e59bc75a2722d4689042ab3ae80c9c"
"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
"checksum micro_http 0.1.0 (git+https://github.com/firecracker-microvm/firecracker)" = "<none>"
"checksum net_gen 0.1.0 (git+https://github.com/firecracker-microvm/firecracker)" = "<none>"
"checksum micro_http 0.1.0 (git+https://github.com/firecracker-microvm/micro-http)" = "<none>"
"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
@ -1355,7 +1338,6 @@ dependencies = [
"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
"checksum utils 0.1.0 (git+https://github.com/firecracker-microvm/firecracker)" = "<none>"
"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
"checksum vfio-bindings 0.1.0 (git+https://github.com/rust-vmm/vfio-bindings)" = "<none>"

View File

@ -24,7 +24,7 @@ kvm-ioctls = "0.5.0"
lazy_static = "1.4.0"
libc = "0.2.67"
log = "0.4.8"
micro_http = { git = "https://github.com/firecracker-microvm/firecracker", branch = "master" }
micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "master" }
net_util = { path = "../net_util" }
pci = {path = "../pci", optional = true}
qcow = { path = "../qcow" }