Set primary kernel in manifest and allow preloading.
The primary kernel was previously hard-coded as `vmlinuz` but the
manifest allows more flexibility. If the kernel file for any VM is not
specified, it is assumed that the image has been preloaded into memory.
The loading of the primary and secondaries are becoming increasingly
similar and will continue to do so.
Change-Id: I34f134d8a4d32e8ac92e142d3636902d52ad86ec
diff --git a/test/linux/BUILD.gn b/test/linux/BUILD.gn
index fcc5907..527a4c3 100644
--- a/test/linux/BUILD.gn
+++ b/test/linux/BUILD.gn
@@ -58,6 +58,7 @@
testonly = true
manifest = "manifest.dts"
+ primary_name = "vmlinuz"
primary_vm = "//third_party:linux__prebuilt"
primary_initrd = ":linux_test_initrd"
secondary_vms = [ [
diff --git a/test/linux/manifest.dts b/test/linux/manifest.dts
index 1372663..71c891e 100644
--- a/test/linux/manifest.dts
+++ b/test/linux/manifest.dts
@@ -21,7 +21,8 @@
hypervisor {
compatible = "hafnium,hafnium";
vm1 {
- debug_name = "primary";
+ debug_name = "linux_test";
+ kernel_filename = "vmlinuz";
};
vm2 {
diff --git a/test/vmapi/gicv3/BUILD.gn b/test/vmapi/gicv3/BUILD.gn
index 196f169..f3325e0 100644
--- a/test/vmapi/gicv3/BUILD.gn
+++ b/test/vmapi/gicv3/BUILD.gn
@@ -42,6 +42,7 @@
testonly = true
manifest = "manifest.dts"
+ primary_name = "gicv3_test"
primary_vm = ":gicv3_test_vm"
secondary_vms = [ [
"services0",
diff --git a/test/vmapi/gicv3/manifest.dts b/test/vmapi/gicv3/manifest.dts
index 4e3a769..9f3ea87 100644
--- a/test/vmapi/gicv3/manifest.dts
+++ b/test/vmapi/gicv3/manifest.dts
@@ -21,7 +21,8 @@
hypervisor {
compatible = "hafnium,hafnium";
vm1 {
- debug_name = "primary";
+ debug_name = "gicv3_test";
+ kernel_filename = "gicv3_test";
};
vm2 {
diff --git a/test/vmapi/primary_only/BUILD.gn b/test/vmapi/primary_only/BUILD.gn
index ecb197a..cdb35b9 100644
--- a/test/vmapi/primary_only/BUILD.gn
+++ b/test/vmapi/primary_only/BUILD.gn
@@ -31,5 +31,6 @@
initrd("primary_only_test") {
testonly = true
manifest = "manifest.dts"
+ primary_name = "primary_only_test"
primary_vm = ":primary_only_test_vm"
}
diff --git a/test/vmapi/primary_only/manifest.dts b/test/vmapi/primary_only/manifest.dts
index 3cf090d..f83e057 100644
--- a/test/vmapi/primary_only/manifest.dts
+++ b/test/vmapi/primary_only/manifest.dts
@@ -21,7 +21,8 @@
hypervisor {
compatible = "hafnium,hafnium";
vm1 {
- debug_name = "primary";
+ debug_name = "primary_only_test";
+ kernel_filename = "primary_only_test";
};
};
};
diff --git a/test/vmapi/primary_with_secondaries/BUILD.gn b/test/vmapi/primary_with_secondaries/BUILD.gn
index 3c00989..b8bdfb2 100644
--- a/test/vmapi/primary_with_secondaries/BUILD.gn
+++ b/test/vmapi/primary_with_secondaries/BUILD.gn
@@ -50,6 +50,7 @@
manifest = "manifest.dts"
+ primary_name = "primary_with_secondaries_test"
primary_vm = ":primary_with_secondaries_test_vm"
secondary_vms = [
[
diff --git a/test/vmapi/primary_with_secondaries/manifest.dts b/test/vmapi/primary_with_secondaries/manifest.dts
index 6460a60..8cc5c00 100644
--- a/test/vmapi/primary_with_secondaries/manifest.dts
+++ b/test/vmapi/primary_with_secondaries/manifest.dts
@@ -21,7 +21,8 @@
hypervisor {
compatible = "hafnium,hafnium";
vm1 {
- debug_name = "primary";
+ debug_name = "primary_with_secondaries_test";
+ kernel_filename = "primary_with_secondaries_test";
};
vm2 {