diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-14 14:02:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-14 14:02:12 +0100 |
| commit | c2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e (patch) | |
| tree | 21c31bf2d3c7adaf0cf988e6cd35f5b706237751 | |
| parent | 940973ae0b45c9b6817bab8e4cf4df99a9ef83d7 (diff) | |
| parent | 8611224a7b21db8fa1b0d12fdd053443543dd708 (diff) | |
| download | qemu-c2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e.tar.gz | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
acpi: SSDT update
This has a fix by Igor for a regression introduced by
bridge hotplug code.
Expected test files were updated accordingly.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 14 Apr 2014 13:13:35 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-test: update expected files
acpi: fix incorrect encoding for 0x{F-1}FFFF
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/i386/acpi-build.c | 2 | ||||
| -rw-r--r-- | tests/acpi-test-data/pc/SSDT | bin | 2261 -> 2269 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a5d3fbfcbd..c98df88cd2 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -391,7 +391,7 @@ static void build_append_int(GArray *table, uint32_t value) build_append_byte(table, 0x01); /* OneOp */ } else if (value <= 0xFF) { build_append_value(table, value, 1); - } else if (value <= 0xFFFFF) { + } else if (value <= 0xFFFF) { build_append_value(table, value, 2); } else { build_append_value(table, value, 4); diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT Binary files differindex 6444f60ce7..c987fb2379 100644 --- a/tests/acpi-test-data/pc/SSDT +++ b/tests/acpi-test-data/pc/SSDT |