[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 2/6] pc: Postpone SMBIOS table installation t
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH v5 2/6] pc: Postpone SMBIOS table installation to post machine init |
Date: |
Fri, 20 May 2016 10:59:14 +0200 |
On Thu, 19 May 2016 10:23:58 -0500
address@hidden wrote:
> From: Corey Minyard <address@hidden>
>
> 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 <address@hidden>
> ---
> 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 99437e0..5e78ef4 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -764,8 +764,6 @@ static FWCfgState *bochs_bios_init(AddressSpace *as,
> PCMachineState *pcms)
> 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;
Patch looks ok.
except of adding extra local var, I'd just use 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)
- [Qemu-devel] [PATCH v5 0/6] Add IPMI to firmware tables, minyard, 2016/05/19
- [Qemu-devel] [PATCH v5 2/6] pc: Postpone SMBIOS table installation to post machine init, minyard, 2016/05/19
- Re: [Qemu-devel] [PATCH v5 2/6] pc: Postpone SMBIOS table installation to post machine init,
Igor Mammedov <=
- [Qemu-devel] [PATCH v5 3/6] smbios: Move table build tools into an include file., minyard, 2016/05/19
- [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, minyard, 2016/05/19
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Igor Mammedov, 2016/05/20
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Corey Minyard, 2016/05/21
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Marcel Apfelbaum, 2016/05/23
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Corey Minyard, 2016/05/23
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Marcel Apfelbaum, 2016/05/23
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Corey Minyard, 2016/05/23
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Igor Mammedov, 2016/05/23
- Re: [Qemu-devel] [PATCH v5 5/6] acpi: Add IPMI table entries, Corey Minyard, 2016/05/23