Commit e502202c authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

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.

This fixes the Coverity issue CID 1398591.

Fixes: d39c90f5 ("spapr: Fix migration of Radix guests")
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 3ff73aa2

hw/ppc/spapr.c

+7 −2
Original line number Diff line number Diff line
@@ -1747,12 +1747,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) {