incusd/instance/qemu: Improve error handling

This generally improves the error handling around finding processes and works around a Go change in tip. Signed-off-by: Stéphane Graber <[email protected]>
lxc · Feb 22, 2024 · c20a2c3 · c20a2c3
1 parent 8f5f80e
commit c20a2c3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
@@ -807,12 +807,16 @@ func (d *qemu) ovmfPath() string {
 func (d *qemu) killQemuProcess(pid int) error {
 	proc, err := os.FindProcess(pid)
 	if err != nil {
+		if err == os.ErrProcessDone {
+			return nil
+		}
+
 		return err
 	}
 
 	err = proc.Kill()
 	if err != nil {
-		if strings.Contains(err.Error(), "process already finished") {
+		if err == os.ErrProcessDone {
 			return nil
 		}