Re: [Qemu-devel] [PATCH 2/5] pc: Postpone SMBIOS table installation to post machine init

[Corey Minyard <minyard@acm.org>]

On 03/13/2016 09:03 PM, Michael S. Tsirkin wrote:
> On Wed, Feb 24, 2016 at 12:59:13PM -0600, minyard@acm.org wrote:
>> From: Corey Minyard <cminyard@mvista.com>
>>
>> This is the same place that the ACPI SSDT table gets added, so that
>> devices can add themselves to the SMBIOS table.
>>
>> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> This changes the order of fw cfg files, which
> is guest visible.
> Need to make it depend on either machine type

Do you mean add a new machine type, like adding a
2.7 version of pc-i440fx and pc-q35?

> or the presence of ipmi somehow.

You could pre-scan for ipmi options from early in the
pc code.  Kind of hackish.

One other option would be to just have ACPI support for
IPMI.  Older OSes might not work; I'm not sure how
important that is.

Does anyone have a preference here?  To me, adding a
new machine type looks easiest, but I'm not sure of the
effects on users.

-corey

>> ---
>>   hw/i386/pc.c | 11 ++++++-----
>>   1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
>> index 0aeefd2..da8fc76 100644
>> --- a/hw/i386/pc.c
>> +++ b/hw/i386/pc.c
>> @@ -778,8 +778,6 @@ static FWCfgState *bochs_bios_init(AddressSpace *as)
>>                        acpi_tables, acpi_tables_len);
>>       fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override());
>>   
>> -    pc_build_smbios(fw_cfg);
>> -
>>       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,
>> @@ -1161,6 +1159,7 @@ void pc_machine_done(Notifier *notifier, void *data)
>>   {
>>       PCMachineState *pcms = container_of(notifier,
>>                                           PCMachineState, machine_done);
>> +    FWCfgState *fw_cfg = pcms->fw_cfg;
>>       PCIBus *bus = pcms->bus;
>>   
>>       if (bus) {
>> @@ -1172,15 +1171,17 @@ void pc_machine_done(Notifier *notifier, void *data)
>>                   extra_hosts++;
>>               }
>>           }
>> -        if (extra_hosts && pcms->fw_cfg) {
>> +        if (extra_hosts && fw_cfg) {
>>               uint64_t *val = g_malloc(sizeof(*val));
>>               *val = cpu_to_le64(extra_hosts);
>> -            fw_cfg_add_file(pcms->fw_cfg,
>> -                    "etc/extra-pci-roots", val, sizeof(*val));
>> +            fw_cfg_add_file(fw_cfg, "etc/extra-pci-roots", val, sizeof(*val));
>>           }
>>       }
>>   
>>       acpi_setup();
>> +    if (fw_cfg) {
>> +        pc_build_smbios(fw_cfg);
>> +    }
>>   }
>>   
>>   void pc_guest_info_init(PCMachineState *pcms)
>> -- 
>> 2.5.0