| Message ID | 20190524063553.5339-7-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> 于2019年5月24日周五 下午2:48写道： > To be able to extract the e820* code out of this file (in the next > patch), access e820_entries with its correct helper. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/i386/pc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index ac8343c728..2e195049a5 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1022,7 +1022,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 > -- > 2.20.1 > > >
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ac8343c728..2e195049a5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1022,7 +1022,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
To be able to extract the e820* code out of this file (in the next patch), access e820_entries with its correct helper. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)