Hi,
Finally going to merge this. Figured the acpi test issue, I've turned
off iasl in my build scripts a while ago, probably to workaround
something, then forgot about it. So with that fixed I could
successfully update the acpi test data, which was the last thing
blocking the merge.
please pull,
Gerd
The following changes since commit 97556fe80e4f7252300b3498b3477fb4295153a3:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
(2016-03-08 04:53:37 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/pull-fw-cfg-20160308-1
for you to fetch changes up to a60c7856088b75b402671de74bf9c5cfce87dfbb:
tests: update acpi test data (2016-03-08 12:15:27 +0100)
----------------------------------------------------------------
acpi: add fw_cfg device node to dsdt
----------------------------------------------------------------
Gabriel L. Somlo (5):
fw_cfg: expose control register size in fw_cfg.h
pc: fw_cfg: move ioport base constant to pc.h
acpi: pc: add fw_cfg device node to dsdt
acpi: arm: add fw_cfg device node to dsdt
fw_cfg: document ACPI device node information
Gerd Hoffmann (1):
tests: update acpi test data
docs/specs/fw_cfg.txt | 9 +++++++++
hw/arm/virt-acpi-build.c | 15 +++++++++++++++
hw/i386/acpi-build.c | 29 +++++++++++++++++++++++++++++
hw/i386/pc.c | 5 ++---
hw/nvram/fw_cfg.c | 4 +++-
include/hw/i386/pc.h | 2 ++
include/hw/nvram/fw_cfg.h | 3 +++
tests/acpi-test-data/pc/DSDT | Bin 5478 -> 5538 bytes
tests/acpi-test-data/pc/DSDT.bridge | Bin 7337 -> 7397 bytes
tests/acpi-test-data/q35/DSDT | Bin 8321 -> 8381 bytes
tests/acpi-test-data/q35/DSDT.bridge | Bin 8338 -> 8398 bytes
11 files changed, 63 insertions(+), 4 deletions(-)
