From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRUk3-00030O-IV for qemu-devel@nongnu.org; Wed, 11 Jan 2017 21:03:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRUk1-0006ap-Pv for qemu-devel@nongnu.org; Wed, 11 Jan 2017 21:03:51 -0500 From: David Gibson Date: Thu, 12 Jan 2017 13:02:52 +1100 Message-Id: <20170112020327.24882-33-david@gibson.dropbear.id.au> In-Reply-To: <20170112020327.24882-1-david@gibson.dropbear.id.au> References: <20170112020327.24882-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 32/67] prep: do not use global variable to access nvram List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: agraf@suse.de, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, thuth@redhat.com, lvivier@redhat.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , David Gibson From: Herv=C3=A9 Poussineau Signed-off-by: Herv=C3=A9 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 =3D NVRAM_GET_CLASS(sysctrl->nvram); + NvramClass *k =3D NVRAM_GET_CLASS(nvram); return (k->read)(nvram, addr); } =20 static inline void nvram_write(Nvram *nvram, uint32_t addr, uint32_t val= ) { - NvramClass *k =3D NVRAM_GET_CLASS(sysctrl->nvram); + NvramClass *k =3D NVRAM_GET_CLASS(nvram); (k->write)(nvram, addr, val); } =20 --=20 2.9.3