diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-10 23:07:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-10 23:07:56 +0100 |
| commit | f516a5cc051db6e999e9e60dc968dcb5aeffe11f (patch) | |
| tree | c048a3497d51133250d54d822d8dc9b08fee83d6 /block/bochs.c | |
| parent | 0a9077ea144a7e6a6f456b94e2d2eaad21e74d34 (diff) | |
| parent | 775478418a5244b28ce891e398e0232dc4e60b43 (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
acpi: DSDT update
Two fixes here:
- Test fix to avoid warning with make check.
- Hex file update so people building QEMU
without installing iasl get exactly the same ACPI
as with.
Both should help avoid user confusion.
As it's very easy to check that the produced ACPI
binary didn't change, I think these are very low risk.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 10 Apr 2014 17:09:43 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
acpi: update generated hex files
tests/acpi: update expected DSDT files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/bochs.c')
0 files changed, 0 insertions, 0 deletions