From: Sergiu Moga <sergiu@unikraft.io>
Date: Fri, 11 Aug 2023 17:51:08 +0000 (+0300)
Subject: plat/kvm: Fix guest hang on `UKPLAT_HALT` during shutdown request
X-Git-Tag: RELEASE-0.14.0~30
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b59c47ac6f16c5796bf00b8ea677ce8fdba0df51;p=unikraft%2Funikraft.git

plat/kvm: Fix guest hang on `UKPLAT_HALT` during shutdown request

As soon as
commit 170a8a4fb242 ("plat/kvm/shutdown.c: If on a `UEFI` system, rely on Runtime Services")
got merged guests would not finish on successful runs by exiting, but
instead by halting.

Although confusing, the intention was to use `UKPLAT_HALT` for a
graceful shutdown instead of a `cpu_halt` as it acts now.

Therefore, fix this by deleting the `UKPLAT_HALT` `case` from the
`switch` statement.

Signed-off-by: Sergiu Moga <sergiu@unikraft.io>
Reviewed-by: Alexander Jung <alex@unikraft.io>
Reviewed-by: Simon Kuenzer <simon@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #1039
---

diff --git a/plat/kvm/shutdown.c b/plat/kvm/shutdown.c
index a4f7a9725..c0e13cb1b 100644
--- a/plat/kvm/shutdown.c
+++ b/plat/kvm/shutdown.c
@@ -59,10 +59,6 @@ void ukplat_terminate(enum ukplat_gstate request)
 	uk_pr_info("Unikraft halted\n");
 
 	switch (request) {
-	case UKPLAT_HALT:
-		cpu_halt();
-
-		break;
 	case UKPLAT_RESTART:
 		uk_efi_rs_reset_system(UK_EFI_RESET_COLD);