Merge "Revert "guest: trusty: security_vm: add a pVM launcher for test purpose"" into main
diff --git a/guest/trusty/common/early_vms.xml b/guest/trusty/common/early_vms.xml
index e9d4c61..1ed324c 100644
--- a/guest/trusty/common/early_vms.xml
+++ b/guest/trusty/common/early_vms.xml
@@ -19,9 +19,4 @@
<cid>200</cid>
<path>/system_ext/bin/trusty_security_vm_launcher</path>
</early_vm>
- <early_vm>
- <name>trusty_security_vm_launcher_protected</name>
- <cid>210</cid>
- <path>/system_ext/bin/trusty_security_vm_launcher</path>
- </early_vm>
</early_vms>
diff --git a/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc b/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc
index 3f3e48d..c0e0537 100644
--- a/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc
+++ b/guest/trusty/security_vm/launcher/security_vm_launcher-arm64.rc
@@ -18,30 +18,3 @@
setprop trusty.security_vm.nonsecure_vm_ready 1
setprop trusty.security_vm.vm_cid 200
start trusty_security_vm_launcher
-
-##########################
-# BELOW IS FOR TEST ONLY #
-##########################
-
-service trusty_security_vm_launcher_protected /system_ext/bin/trusty_security_vm_launcher \
---name trusty_security_vm_launcher_protected \
---kernel /system_ext/etc/vm/trusty_vm/trusty-security_vm.elf \
---memory-size-mib 32 \
---protected
- disabled
- user system
- group system virtualmachine
- capabilities IPC_LOCK NET_BIND_SERVICE SYS_RESOURCE SYS_NICE
- stdio_to_kmsg
- oneshot
-
-# Testing protected vm during early boot
-# TODO(b/): solve the MMIO guard issue preventing Host/VM communications
-# to reproduce: uncomment the `on post-fs` section
-#on post-fs
-# start trusty_security_vm_launcher_protected
-
-# TODO(b/): solve the pKVM crash
-# to reproduce: uncomment the `on init` section
-#on init
-# start trusty_security_vm_launcher_protected