File riscv.patch of Package cloud-hypervisor
Index: cloud-hypervisor-50.0/cloud-hypervisor/tests/integration.rs
===================================================================
--- cloud-hypervisor-50.0.orig/cloud-hypervisor/tests/integration.rs
+++ cloud-hypervisor-50.0/cloud-hypervisor/tests/integration.rs
@@ -83,6 +83,32 @@ mod aarch64 {
#[cfg(target_arch = "aarch64")]
use aarch64::*;
+#[cfg(target_arch = "riscv64")]
+mod riscv64 {
+ pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-riscv64-custom-20210929-0.raw";
+ pub const FOCAL_IMAGE_UPDATE_KERNEL_NAME: &str =
+ "focal-server-cloudimg-riscv64-custom-20210929-0-update-kernel.raw";
+ pub const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-riscv64-custom-20210929-0.vhd";
+ pub const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-riscv64-custom-20210929-0.vhdx";
+ pub const JAMMY_IMAGE_NAME: &str = "jammy-server-cloudimg-riscv64-custom-20220329-0.raw";
+ pub const JAMMY_IMAGE_NAME_QCOW2: &str = "jammy-server-cloudimg-riscv64-custom-20220329-0.qcow2";
+ pub const JAMMY_IMAGE_NAME_QCOW2_ZLIB: &str =
+ "jammy-server-cloudimg-riscv64-custom-20220329-0-zlib.qcow2";
+ pub const JAMMY_IMAGE_NAME_QCOW2_ZSTD: &str =
+ "jammy-server-cloudimg-riscv64-custom-20220329-0-zstd.qcow2";
+ pub const JAMMY_IMAGE_NAME_QCOW2_BACKING_ZSTD_FILE: &str =
+ "jammy-server-cloudimg-riscv64-custom-20220329-0-backing-zstd.qcow2";
+ pub const JAMMY_IMAGE_NAME_QCOW2_BACKING_UNCOMPRESSED_FILE: &str =
+ "jammy-server-cloudimg-riscv64-custom-20220329-0-backing-uncompressed.qcow2";
+ pub const WINDOWS_IMAGE_NAME: &str = "windows-11-iot-enterprise-riscv64.raw";
+ pub const OVMF_NAME: &str = "CLOUDHV_EFI.fd";
+ pub const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'PLIC.*ttyS0' /proc/interrupts || true";
+ pub const GREP_PMU_IRQ_CMD: &str = "grep -c 'PLIC.*riscv-pmu' /proc/interrupts || true";
+}
+
+#[cfg(target_arch = "riscv64")]
+use riscv64::*;
+
const DIRECT_KERNEL_BOOT_CMDLINE: &str =
"root=/dev/vda1 console=hvc0 rw systemd.journald.forward_to_console=1";
@@ -4145,7 +4171,7 @@ mod common_parallel {
}
#[test]
- #[cfg(target_arch = "aarch64")]
+ #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
fn test_pmu_on() {
let disk_config = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
let guest = Guest::new(Box::new(disk_config));
Index: cloud-hypervisor-50.0/performance-metrics/src/performance_tests.rs
===================================================================
--- cloud-hypervisor-50.0.orig/performance-metrics/src/performance_tests.rs
+++ cloud-hypervisor-50.0/performance-metrics/src/performance_tests.rs
@@ -18,6 +18,8 @@ use crate::{ImageFormat, PerformanceTest
pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-0.raw";
#[cfg(target_arch = "aarch64")]
pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0-update-tool.raw";
+#[cfg(target_arch = "riscv64")]
+pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-riscv64-custom-20210929-0-update-tool.raw";
#[allow(dead_code)]
#[derive(Error, Debug)]