From: Hervé Poussineau <hpoussin@reactos.org>
Date: Thu, 29 Dec 2016 22:12:13 +0000 (+0100)
Subject: prep: do not use global variable to access nvram
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5904bca84ed3b41b983e14a5adc388400cf737e6;p=qemu.git

prep: do not use global variable to access nvram

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 054af1e8b4..9fb89d3a45 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);
 }