Skip to contentSkip to conversation

spapr: return from post_load method when RTC import fails

PATCH Superseded Cédric Le Goater 2 participants 4 messages Jan 4, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spapr: return from post_load method when RTC import fails

The error value can be squashed by the section handling radix migration. Simply bail out if an error occurs when the RTC offset is imported.

Fixes d39c90f5f3ae ("spapr: Fix migration of Radix guests")
---
 hw/ppc/spapr.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
hw/ppc/spapr.c +7 -2
index f1725313e979..64397ee91ef0 100644
@@ -1748,12 +1748,17 @@ static int spapr_post_load(void *opaque, int version_id)
         return err;
     }
 
-    /* In earlier versions, there was no separate qdev for the PAPR
+    /*
+     * In earlier versions, there was no separate qdev for the PAPR
      * RTC, so the RTC offset was stored directly in sPAPREnvironment.
      * So when migrating from those versions, poke the incoming offset
-     * value into the RTC device */
+     * value into the RTC device
+     */
     if (version_id < 3) {
         err = spapr_rtc_import_offset(&spapr->rtc, spapr->rtc_offset);
+        if (err) {
+            return err;
+        }
     }
 
     if (kvm_enabled() && spapr->patb_entry) {
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Cédric Le Goater

The error value can be squashed by the section handling radix migration. Simply bail out if an error occurs when the RTC offset is imported.

Fixes d39c90f5f3ae ("spapr: Fix migration of Radix guests")

You could also mention that this fixes the Coverity issue CID 1398591.

thanks
-- PMM

#2 lore raw
Quoted 9 lines · Peter Maydell
Quoted 5 lines · Cédric Le Goater

The error value can be squashed by the section handling radix migration. Simply bail out if an error occurs when the RTC offset is imported.

Fixes d39c90f5f3ae ("spapr: Fix migration of Radix guests")

You could also mention that this fixes the Coverity issue CID 1398591.

ok. I will in a v2.

Is there a tag for it ?

or adding a comment "this fixes the Coverity issue CID 1398591." is considered sufficient ?

Thanks,

C.

#3 lore raw
Quoted 12 lines · Cédric Le Goater
Quoted 9 lines · Peter Maydell
Quoted 5 lines · Cédric Le Goater

The error value can be squashed by the section handling radix migration. Simply bail out if an error occurs when the RTC offset is imported.

Fixes d39c90f5f3ae ("spapr: Fix migration of Radix guests")

You could also mention that this fixes the Coverity issue CID 1398591.

Quoted 6 lines

ok. I will in a v2.

Is there a tag for it ?

or adding a comment "this fixes the Coverity issue CID 1398591." is considered sufficient ?

No, we don't have a formal tag for that kind of thing.

thanks
-- PMM