mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
tests: Use serial console in test_cpu_hotplug
Virtio console is activated much later in boot. The output it spits out lacks the initial CPU configuration of the guest. Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
@@ -4939,6 +4939,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 api_socket = temp_api_path(&guest.tmp_dir);
|
let api_socket = temp_api_path(&guest.tmp_dir);
|
||||||
|
let console_str = "console=ttyS0";
|
||||||
|
|
||||||
let kernel_path = direct_kernel_boot_path();
|
let kernel_path = direct_kernel_boot_path();
|
||||||
|
|
||||||
@@ -4946,7 +4947,14 @@ mod common_parallel {
|
|||||||
.args(["--cpus", "boot=2,max=4"])
|
.args(["--cpus", "boot=2,max=4"])
|
||||||
.args(["--memory", "size=512M"])
|
.args(["--memory", "size=512M"])
|
||||||
.args(["--kernel", kernel_path.to_str().unwrap()])
|
.args(["--kernel", kernel_path.to_str().unwrap()])
|
||||||
.args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
|
.args([
|
||||||
|
"--cmdline",
|
||||||
|
DIRECT_KERNEL_BOOT_CMDLINE
|
||||||
|
.replace("console=hvc0 ", console_str)
|
||||||
|
.as_str(),
|
||||||
|
])
|
||||||
|
.args(["--serial", "tty"])
|
||||||
|
.args(["--console", "off"])
|
||||||
.default_disks()
|
.default_disks()
|
||||||
.default_net()
|
.default_net()
|
||||||
.args(["--api-socket", &api_socket])
|
.args(["--api-socket", &api_socket])
|
||||||
|
|||||||
Reference in New Issue
Block a user