mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
@@ -3823,7 +3823,7 @@ mod common_parallel {
|
|||||||
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
||||||
let guest = Guest::new(Box::new(focal));
|
let guest = Guest::new(Box::new(focal));
|
||||||
|
|
||||||
let serial_path = guest.tmp_dir.as_path().join("/tmp/serial-output");
|
let serial_path = guest.tmp_dir.as_path().join("serial-output");
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
let console_str: &str = "console=ttyS0";
|
let console_str: &str = "console=ttyS0";
|
||||||
#[cfg(target_arch = "aarch64")]
|
#[cfg(target_arch = "aarch64")]
|
||||||
@@ -4022,7 +4022,7 @@ mod common_parallel {
|
|||||||
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
||||||
let guest = Guest::new(Box::new(focal));
|
let guest = Guest::new(Box::new(focal));
|
||||||
|
|
||||||
let console_path = guest.tmp_dir.as_path().join("/tmp/console-output");
|
let console_path = guest.tmp_dir.as_path().join("console-output");
|
||||||
let mut child = GuestCommand::new(&guest)
|
let mut child = GuestCommand::new(&guest)
|
||||||
.args(["--cpus", "boot=1"])
|
.args(["--cpus", "boot=1"])
|
||||||
.args(["--memory", "size=512M"])
|
.args(["--memory", "size=512M"])
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use crate::{
|
|||||||
get_host_address_range, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VirtioInterrupt,
|
get_host_address_range, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VirtioInterrupt,
|
||||||
VirtioInterruptType,
|
VirtioInterruptType,
|
||||||
};
|
};
|
||||||
use std::convert::TryInto;
|
|
||||||
use std::ffi;
|
use std::ffi;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
|
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
|
||||||
@@ -201,7 +201,7 @@ impl VhostUserHandle {
|
|||||||
|
|
||||||
let mut vrings_info = Vec::new();
|
let mut vrings_info = Vec::new();
|
||||||
for (queue_index, queue, queue_evt) in queues.iter() {
|
for (queue_index, queue, queue_evt) in queues.iter() {
|
||||||
let actual_size: usize = queue.size().try_into().unwrap();
|
let actual_size: usize = queue.size().into();
|
||||||
|
|
||||||
let config_data = VringConfigData {
|
let config_data = VringConfigData {
|
||||||
queue_max_size: queue.max_size(),
|
queue_max_size: queue.max_size(),
|
||||||
|
|||||||
Reference in New Issue
Block a user