瀏覽代碼

ppc: Fix return value in cpu_post_load() error path

VMState handlers are supposed to return negative errno values on failure.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <20200914123505.612812-4-groug@kaod.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Greg Kurz 5 年之前
父節點
當前提交
899134eb49
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      target/ppc/machine.c

+ 5 - 4
target/ppc/machine.c

@@ -347,18 +347,19 @@ static int cpu_post_load(void *opaque, int version_id)
     if (cpu->compat_pvr) {
     if (cpu->compat_pvr) {
         uint32_t compat_pvr = cpu->compat_pvr;
         uint32_t compat_pvr = cpu->compat_pvr;
         Error *local_err = NULL;
         Error *local_err = NULL;
+        int ret;
 
 
         cpu->compat_pvr = 0;
         cpu->compat_pvr = 0;
-        ppc_set_compat(cpu, compat_pvr, &local_err);
-        if (local_err) {
+        ret = ppc_set_compat(cpu, compat_pvr, &local_err);
+        if (ret < 0) {
             error_report_err(local_err);
             error_report_err(local_err);
-            return -1;
+            return ret;
         }
         }
     } else
     } else
 #endif
 #endif
     {
     {
         if (!pvr_match(cpu, env->spr[SPR_PVR])) {
         if (!pvr_match(cpu, env->spr[SPR_PVR])) {
-            return -1;
+            return -EINVAL;
         }
         }
     }
     }