Merge pull request #1959 from giuseppe/fix-krun-err

giuseppe · web-flow · commit 91df434a47bc · 2026-01-23T21:41:52.000+01:00
krun: fix error return
diff --git a/src/libcrun/handlers/krun.c b/src/libcrun/handlers/krun.c
@@ -430,14 +430,17 @@ libkrun_exec (void *cookie, libcrun_container_t *container, const char *pathname
         {
           ret = libkrun_enable_virtio_gpu (kconf);
           if (UNLIKELY (ret < 0))
-            return ret;
+            error (EXIT_FAILURE, -ret, "could not enable virtio gpu");
         }
     }
 
   yajl_tree_free (config_tree);
 
   ret = krun_start_enter (ctx_id);
-  return -ret;
+  if (UNLIKELY (ret < 0))
+    error (EXIT_FAILURE, -ret, "could not start krun");
+
+  return ret;
 }
 
 /* libkrun_create_kvm_device: explicitly adds kvm device.  */

Original file line number	Diff line number	Diff line change
`@@ -430,14 +430,17 @@ libkrun_exec (void cookie, libcrun_container_t container, const char *pathname`
`430`	`430`	`{`
`431`	`431`	`ret = libkrun_enable_virtio_gpu (kconf);`
`432`	`432`	`if (UNLIKELY (ret < 0))`
`433`		`- return ret;`
	`433`	`+ error (EXIT_FAILURE, -ret, "could not enable virtio gpu");`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`yajl_tree_free (config_tree);`
`438`	`438`
`439`	`439`	`ret = krun_start_enter (ctx_id);`
`440`		`- return -ret;`
	`440`	`+ if (UNLIKELY (ret < 0))`
	`441`	`+ error (EXIT_FAILURE, -ret, "could not start krun");`
	`442`	`+`
	`443`	`+ return ret;`
`441`	`444`	`}`
`442`	`445`
`443`	`446`	`/* libkrun_create_kvm_device: explicitly adds kvm device. */`