tests: Re-enable vfio_user integration test

This time we use the Rust Hypervisor Firmware for test_vfio_user() in
order to fix the systemd issues we've seen so far.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2021-12-07 17:17:57 +01:00 committed by Rob Bradford
parent 50f5f43ae3
commit 7bce72dff3

View File

@ -6105,7 +6105,6 @@ mod tests {
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
#[ignore]
#[test] #[test]
fn test_vfio_user() { fn test_vfio_user() {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
@ -6114,14 +6113,12 @@ mod tests {
let spdk_nvme_dir = guest.tmp_dir.as_path().join("test-vfio-user"); let spdk_nvme_dir = guest.tmp_dir.as_path().join("test-vfio-user");
setup_spdk_nvme(spdk_nvme_dir.as_path()); setup_spdk_nvme(spdk_nvme_dir.as_path());
let kernel_path = direct_kernel_boot_path();
let api_socket = temp_api_path(&guest.tmp_dir); let api_socket = temp_api_path(&guest.tmp_dir);
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--api-socket", &api_socket]) .args(&["--api-socket", &api_socket])
.args(&["--cpus", "boot=1"]) .args(&["--cpus", "boot=1"])
.args(&["--memory", "size=512M,shared=on"]) .args(&["--memory", "size=512M,shared=on"])
.args(&["--kernel", kernel_path.to_str().unwrap()]) .args(&["--kernel", guest.fw_path.as_str()])
.args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
.default_disks() .default_disks()
.default_net() .default_net()
.capture_output() .capture_output()