aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-09-06 14:44:22 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-09-06 15:57:15 +0200
commit96dbb2c0a24fdc6bbe4d8d834f0b879e01fdcae3 (patch)
tree47fc15d16e1467dc2ebde10aa1a1a174cea90d42 /main.c
parent751e77e06ec147046b4eae76777dc2e22774aee0 (diff)
downloadqboot-96dbb2c0a24fdc6bbe4d8d834f0b879e01fdcae3.zip
qboot-96dbb2c0a24fdc6bbe4d8d834f0b879e01fdcae3.tar.gz
qboot-96dbb2c0a24fdc6bbe4d8d834f0b879e01fdcae3.tar.bz2
use fw_cfg_read_entry
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'main.c')
-rw-r--r--main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/main.c b/main.c
index b376c0d..1913b37 100644
--- a/main.c
+++ b/main.c
@@ -43,7 +43,6 @@ static void extract_e820(void)
size = fw_cfg_file_size(id);
nr_map = size / sizeof(e820->map[0]) + 4;
- fw_cfg_file_select(id);
e820 = malloc(offsetof(struct e820map, map[nr_map]));
e820->nr_map = nr_map;
@@ -55,7 +54,7 @@ static void extract_e820(void)
{ .addr = 0xd0000, .size = 128 * 1024, .type = E820_NVS }; /* ACPI tables */
e820->map[3] = (struct e820entry)
{ .addr = 0xf0000, .size = 64 * 1024, .type = E820_RESERVED }; /* firmware */
- fw_cfg_read(&e820->map[4], size);
+ fw_cfg_read_file(id, &e820->map[4], size);
for (i = 4; i < e820->nr_map; i++)
if (e820->map[i].addr == 0) {
lowmem = e820->map[i].size;