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>

Author: pm215

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);