Ferrochrome: Add missing VM configs
Bug: N/A
Test: Presubmit
Test: Run Ferrochrome based on docs/custom_vm.md
Change-Id: I32ec02bb1902ad84e76400798f5aed7fbff34fac
diff --git a/android/FerrochromeApp/vm_config.json.template b/android/FerrochromeApp/vm_config.json.template
index 6e024ba..380f016 100644
--- a/android/FerrochromeApp/vm_config.json.template
+++ b/android/FerrochromeApp/vm_config.json.template
@@ -43,7 +43,7 @@
},
"audio": {
"speaker": true,
- "microphone": true
+ "microphone": true
},
"gpu": {
"backend": "virglrenderer",
@@ -52,5 +52,5 @@
"display": {
"scale": "0.77",
"refresh_rate": "30"
- }
+ }
}
diff --git a/docs/custom_vm.md b/docs/custom_vm.md
index 9b0fcd4..e4b374f 100644
--- a/docs/custom_vm.md
+++ b/docs/custom_vm.md
@@ -245,16 +245,34 @@
"writable": true
}
],
+ "protected": false,
+ "cpu_topology": "match_host",
+ "platform_version": "~1.0",
+ "memory_mib": 8096,
+ "debuggable": true,
+ "console_out": true,
+ "connect_console": true,
+ "console_input_device": "hvc0",
+ "network": true,
+ "input": {
+ "touchscreen": true,
+ "keyboard": true,
+ "mouse": true,
+ "trackpad": true,
+ "switches": true
+ },
+ "audio": {
+ "speaker": true,
+ "microphone": true
+ },
"gpu": {
"backend": "virglrenderer",
"context_types": ["virgl2"]
},
- "params": "root=/dev/vda3 rootwait noinitrd ro enforcing=0 cros_debug cros_secure",
- "protected": false,
- "cpu_topology": "match_host",
- "platform_version": "~1.0",
- "memory_mib" : 8096,
- "console_input_device": "hvc0"
+ "display": {
+ "scale": "0.77",
+ "refresh_rate": "30"
+ }
}
```
diff --git a/tests/ferrochrome/assets/vm_config.json b/tests/ferrochrome/assets/vm_config.json
index 3053626..53e3b72 100644
--- a/tests/ferrochrome/assets/vm_config.json
+++ b/tests/ferrochrome/assets/vm_config.json
@@ -7,14 +7,32 @@
"writable": true
}
],
+ "protected": false,
+ "cpu_topology": "match_host",
+ "platform_version": "~1.0",
+ "memory_mib": 8096,
+ "debuggable": true,
+ "console_out": true,
+ "connect_console": true,
+ "console_input_device": "hvc0",
+ "network": true,
+ "input": {
+ "touchscreen": true,
+ "keyboard": true,
+ "mouse": true,
+ "trackpad": true,
+ "switches": true
+ },
+ "audio": {
+ "speaker": true,
+ "microphone": true
+ },
"gpu": {
"backend": "virglrenderer",
"context_types": ["virgl2"]
},
- "params": "root=/dev/vda3 rootwait noinitrd ro enforcing=0 cros_debug cros_secure",
- "protected": false,
- "cpu_topology": "match_host",
- "platform_version": "~1.0",
- "memory_mib" : 8096,
- "console_input_device": "hvc0"
+ "display": {
+ "scale": "0.77",
+ "refresh_rate": "30"
+ }
}