summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2014-04-13 23:55:51 +0200
committerMichael S. Tsirkin <mst@redhat.com>2014-04-14 15:13:27 +0300
commit482f38b9488cb42939b92332ca7b5b42af882cd0 (patch)
tree02b3d49c4ac2fab6243572790a76afec1a8cc68e
parent590e5dd98fcc926cc3b63aad35aed79235ca4c2a (diff)
downloadqemu-482f38b9488cb42939b92332ca7b5b42af882cd0.zip
acpi: fix incorrect encoding for 0x{F-1}FFFF
Fix typo in build_append_int() which causes integer truncation when it's in range 0x{F-1}FFFF by packing it as WordConst instead of required DWordConst. In partucular this fixes a regression: hotplug in slots 16,17,18 and 19 didn't work, since SSDT had code like this: If (And (Arg0, 0x0000)) { Notify (S80, Arg1) } Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Stefan Weil <sw@weilnetz.de>
-rw-r--r--hw/i386/acpi-build.c2
1 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);