On Wed, Oct 10, 2012 at 08:14:46AM +0200, Gerd Hoffmann wrote:
Hi,
Ok, I like this idea. My only hesitation would be that the dsdt table might in the future include a dependency on being built with seabios, such as the 'ACPI_EXTRACT_*' stuff. At the moment it can be cleanly separated out. And this patch enforces that.
If we don't touch seabios here as you've suggested. What steps are required on the qemu side? To copy the 2 .aml files to its bios dir (Not too familiar with these details)?
roms/Makefile builds seabios for qemu and copyes bios.bin to pc-bios/. Needs to be updated to also copy the acpi tables. acpi tables must be committed (like pc-bios/bios.bin, this is done for non-x86 hosts which can't easily build x86 bios btw). "make install" must be updated to also install the acpi tables. pc_piix.c should load them from disk and stick into fw_cfg.
cheers, Gerd
Right, I implemented the patch below for this:
--- a/Makefile +++ b/Makefile @@ -275,7 +275,8 @@ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin kvmvapic.bin \ s390-zipl.rom \ spapr-rtas.bin slof.bin \ -palcode-clipper +palcode-clipper \ +acpi-dsdt.aml q35-acpi-dsdt.aml \ else BLOBS= endif --- a/roms/Makefile +++ b/roms/Makefile @@ -12,6 +12,7 @@ bios: config.seabios sh configure-seabios.sh $< make -C seabios out/bios.bin cp seabios/out/bios.bin ../pc-bios/bios.bin + cp seabios/out/*dsdt.aml ../pc-bios/
seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))
Another point of discussion is the ordering of the commits to seabios vs. qemu. We could commit the above patch now (without the q35 aml, and with the acpi-dsdt.aml file).
For q35, we could wait for the SeaBIOS bits to go in first, and then add the q35-acpi-dsdt.aml to pci-bios/. In that way, no special command line option will ever be required for q35 (except maybe -M pc_q35).
The alternative would be to commit both trees in parallel, and have users of q35 specify -L <bios dir with q35 dsdt table>, until the q35-acpi-dsdt.aml is added to qemu.
I could definitely see a strong case for the former option (waiting on SeaBIOS bits), but wanted to have an agreed on plan for this.
Thanks,
-Jason