diff options
| author | Thomas Huth <thuth@redhat.com> | 2016-10-18 22:46:43 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-10-28 09:36:58 +1100 |
| commit | ad723fe5a050b685e496f2202a919f9e32c45c43 (patch) | |
| tree | eef8f021590757d26e6289457ca419709f6c1f97 /hw/nvram/mac_nvram.c | |
| parent | 2024c01421eb990e7043afa0e0e4d67f4477596f (diff) | |
| download | qemu-ad723fe5a050b685e496f2202a919f9e32c45c43.zip qemu-ad723fe5a050b685e496f2202a919f9e32c45c43.tar.gz qemu-ad723fe5a050b685e496f2202a919f9e32c45c43.tar.bz2 | |
nvram: Move the remaining CHRP NVRAM related code to chrp_nvram.[ch]
Everything that is related to CHRP NVRAM should rather reside in
chrp_nvram.c / chrp_nvram.h instead of openbios_firmware_abi.h.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/nvram/mac_nvram.c')
| -rw-r--r-- | hw/nvram/mac_nvram.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index c0e62a5..63f9ed1 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/nvram/openbios_firmware_abi.h" #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/mac.h" #include "qemu/cutils.h" @@ -163,15 +162,15 @@ static void pmac_format_nvram_partition_osx(MacIONVRAMState *nvr, int off, int len) { uint32_t start = off; - struct OpenBIOS_nvpart_v1 *part_header; + ChrpNvramPartHdr *part_header; unsigned char *data = &nvr->data[start]; /* empty partition */ - part_header = (struct OpenBIOS_nvpart_v1 *)data; + part_header = (ChrpNvramPartHdr *)data; part_header->signature = OSX_NVRAM_SIGNATURE; pstrcpy(part_header->name, sizeof(part_header->name), "wwwwwwwwwwww"); - OpenBIOS_finish_partition(part_header, len); + chrp_nvram_finish_partition(part_header, len); /* Generation */ stl_be_p(&data[20], 2); |