From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1af6cW-0006xT-RP for qemu-devel@nongnu.org; Sun, 13 Mar 2016 10:03:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1af6cT-0001To-LP for qemu-devel@nongnu.org; Sun, 13 Mar 2016 10:03:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1af6cT-0001Tk-GB for qemu-devel@nongnu.org; Sun, 13 Mar 2016 10:03:45 -0400 Date: Sun, 13 Mar 2016 16:03:42 +0200 From: "Michael S. Tsirkin" Message-ID: <20160313160206-mutt-send-email-mst@redhat.com> References: <1456340356-17147-1-git-send-email-minyard@acm.org> <1456340356-17147-3-git-send-email-minyard@acm.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456340356-17147-3-git-send-email-minyard@acm.org> Subject: Re: [Qemu-devel] [PATCH 2/5] pc: Postpone SMBIOS table installation to post machine init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: minyard@acm.org Cc: Igor Mammedov , Corey Minyard , qemu-devel@nongnu.org, Paolo Bonzini On Wed, Feb 24, 2016 at 12:59:13PM -0600, minyard@acm.org wrote: > From: Corey Minyard > > 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 This changes the order of fw cfg files, which is guest visible. Need to make it depend on either machine type or the presence of ipmi somehow. > --- > 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