From patchwork Thu Feb 25 03:02:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8417481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C512E9F372 for ; Thu, 25 Feb 2016 03:03:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 351EA20295 for ; Thu, 25 Feb 2016 03:03:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9577F2028D for ; Thu, 25 Feb 2016 03:03:08 +0000 (UTC) Received: from localhost ([::1]:39717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYmCq-0002fb-1q for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 Feb 2016 22:03:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYmBD-00081Z-GN for qemu-devel@nongnu.org; Wed, 24 Feb 2016 22:01:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYmB8-0006NS-Qn for qemu-devel@nongnu.org; Wed, 24 Feb 2016 22:01:27 -0500 Received: from ozlabs.org ([103.22.144.67]:45843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYmB8-0006N0-FX; Wed, 24 Feb 2016 22:01:22 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id E2C0F140C4B; Thu, 25 Feb 2016 14:01:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1456369277; bh=LEmBDqIKio2UDy7UTtigw6IkR0+XTK/biyr4Shm2OKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h9AbfJJISsA6t3+oi/Fnh1mNbeNG2m1EwEvX8j4mgW4IThGbU+yer6KB5tzL97Miv 7fWCNgGhieL2WluP3aZUNkuD63n9wZgWK7ZZTRDx25fq4GQYJHa8MeidTLl1jJ70qW w5hGdp40pss0NSkxx9HAVgu5ufB5v7BDEO+XHtrk= From: David Gibson To: peter.maydell@linaro.org, agraf@suse.de Date: Thu, 25 Feb 2016 14:02:08 +1100 Message-Id: <1456369330-7294-4-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456369330-7294-1-git-send-email-david@gibson.dropbear.id.au> References: <1456369330-7294-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson , Greg Kurz Subject: [Qemu-devel] [PULL 3/5] spapr: initialize local Error pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Greg Kurz This fixes a crash in the target QEMU during migration. Broken in commit c5f54f3. Signed-off-by: Greg Kurz Reviewed-by: Markus Armbruster [reworded commit message] Signed-off-by: David Gibson --- hw/ppc/spapr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e214a34..c119f55 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1528,7 +1528,7 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id) section_hdr = qemu_get_be32(f); if (section_hdr) { - Error *local_err; + Error *local_err = NULL; /* First section gives the htab size */ spapr_reallocate_hpt(spapr, section_hdr, &local_err);