Message ID | 20190108224600.23125-24-david@gibson.dropbear.id.au |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="HqftPLsT"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43Z80g3nP9z9sDL for <incoming@patchwork.ozlabs.org>; Wed, 9 Jan 2019 10:41:23 +1100 (AEDT) Received: from localhost ([127.0.0.1]:57418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gh0zp-0002JL-F9 for incoming@patchwork.ozlabs.org; Tue, 08 Jan 2019 18:41:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1gh09x-0007AD-Cz for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:47:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1gh09w-0007ry-Ik for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:47:45 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:40853) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1gh09w-000756-60; Tue, 08 Jan 2019 17:47:44 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 43Z6n04PcGz9sPP; Wed, 9 Jan 2019 09:46:10 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1546987572; bh=6EUJwvihoHvDBxLPwuslTCiCicNDp5ylZRifiX++7Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HqftPLsT9FBOUca7/LYfUx8y5K8rd+qfTDPPUM6Om2UHx2DYPcYCb7lnVtTkVm23C Rn5B+05qjRYHh/Nu9CnrP2PT9PCbgWP+KlQo+HlgAvZVEAenGIHngn+gCzzYHOFOTQ mW23sL6PTdU+4ACkHraR42UKwKWL0ePQJT4WUQyU= From: David Gibson <david@gibson.dropbear.id.au> To: peter.maydell@linaro.org Date: Wed, 9 Jan 2019 09:45:54 +1100 Message-Id: <20190108224600.23125-24-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190108224600.23125-1-david@gibson.dropbear.id.au> References: <20190108224600.23125-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 23/29] spapr: return from post_load method when RTC import fails X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: qemu-devel@nongnu.org, David Gibson <david@gibson.dropbear.id.au>, qemu-ppc@nongnu.org, groug@kaod.org, clg@kaod.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/29] spapr: Add H-Call H_HOME_NODE_ASSOCIATIVITY
|
expand
|
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 8576c1c6f7..59faeccf4b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -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) {