From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 11 Apr 2024 08:11:51 +0000 (+0200)
Subject: qemu: Make sure qemu/VM exit status take priority
X-Git-Tag: v23~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ba7e398c1b090a353bee43913ff2eb5361c5415;p=thirdparty%2Fmkosi.git

qemu: Make sure qemu/VM exit status take priority

In spawn(), if an exception is raised by the context manager block,
we'll let it take priority over any exception we raise in spawn()
itself. Let's make use of this to make sure the qemu/VM exit code
always takes priority by raising the CalledProcessError from within
the qemu spawn() block.

We also let any qemu error take precedence over any EXIT_STATUS error.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index e32b3b485..f54ebcf16 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -1100,8 +1100,8 @@ def run_qemu(args: Args, config: Config) -> None:
             )
             register_machine(config, qemu.pid, fname)
 
-    if status := int(notifications.get("EXIT_STATUS", 0)):
-        raise subprocess.CalledProcessError(status, cmdline)
+            if qemu.wait() == 0 and (status := int(notifications.get("EXIT_STATUS", 0))):
+                raise subprocess.CalledProcessError(status, cmdline)
 
 
 def run_ssh(args: Args, config: Config) -> None: