From patchwork Thu Feb 2 05:13:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 722783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vDTkZ6C80z9s0g for ; Thu, 2 Feb 2017 16:55:50 +1100 (AEDT) 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="krR6EnFT"; dkim-atps=neutral Received: from localhost ([::1]:54427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZAN2-0005NN-9c for incoming@patchwork.ozlabs.org; Thu, 02 Feb 2017 00:55:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZ9js-0007Qd-GI for qemu-devel@nongnu.org; Thu, 02 Feb 2017 00:15:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZ9jn-0003ma-Br for qemu-devel@nongnu.org; Thu, 02 Feb 2017 00:15:20 -0500 Received: from ozlabs.org ([103.22.144.67]:49319) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZ9jm-0003hv-Ra; Thu, 02 Feb 2017 00:15:15 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vDSqQ64Mjz9s7r; Thu, 2 Feb 2017 16:14:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1486012498; bh=EyHKrtIVMH8fQ+D0sc3JROt/jjH85ZO41TZ33PdnM/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=krR6EnFT+2d+8nfF8KiWBS5efSH6YHvU9su9fHwGFz1Cs1z27SzapaZajxGbYtjc3 YExNCia0jlMwo4gWk09Iu9xBnoD671l/SIIz8y758Iv5ugygUF7fw1Xeb8n00SoWTT unqcGDOgkYE1uKh3ngJyE5xjZjBVTFcbwZ0zybP0= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 2 Feb 2017 16:13:30 +1100 Message-Id: <20170202051445.5735-33-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170202051445.5735-1-david@gibson.dropbear.id.au> References: <20170202051445.5735-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 032/107] prep: do not use global variable to access nvram X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, agraf@suse.de, aik@ozlabs.ru, qemu-ppc@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Hervé Poussineau Signed-off-by: Hervé Poussineau Signed-off-by: David Gibson --- hw/ppc/prep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 054af1e..9fb89d3 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -339,13 +339,13 @@ static PortioList prep_port_list; /* NVRAM helpers */ static inline uint32_t nvram_read(Nvram *nvram, uint32_t addr) { - NvramClass *k = NVRAM_GET_CLASS(sysctrl->nvram); + NvramClass *k = NVRAM_GET_CLASS(nvram); return (k->read)(nvram, addr); } static inline void nvram_write(Nvram *nvram, uint32_t addr, uint32_t val) { - NvramClass *k = NVRAM_GET_CLASS(sysctrl->nvram); + NvramClass *k = NVRAM_GET_CLASS(nvram); (k->write)(nvram, addr, val); }