From: Philippe Mathieu-Daudé Date: Sun, 18 Aug 2019 22:54:00 +0000 (+0200) Subject: hw/i386/pc: Use e820_get_num_entries() to access e820_entries X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=42d400acfc2dabc56653ee5396df14a8d8cb46c7;p=qemu.git hw/i386/pc: Use e820_get_num_entries() to access e820_entries To be able to extract the e820* code out of this file (in the next patch), access e820_entries with its correct helper. Reviewed-by: Li Qiang Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190818225414.22590-2-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/hw/i386/pc.c b/hw/i386/pc.c index bad866fe44..31e9c1f16b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1029,7 +1029,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms) fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, &e820_reserve, sizeof(e820_reserve)); fw_cfg_add_file(fw_cfg, "etc/e820", e820_table, - sizeof(struct e820_entry) * e820_entries); + sizeof(struct e820_entry) * e820_get_num_entries()); fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_cfg, sizeof(hpet_cfg)); /* allocate memory for the NUMA channel: one (64bit) word for the number