commit c2b9af1d6c2dda4c58a1c0ff389d09dcd9601b9e
author Peter Maydell <peter.maydell@linaro.org> Mon Apr 14 14:02:12 2014 +0100
committer Peter Maydell <peter.maydell@linaro.org> Mon Apr 14 14:02:12 2014 +0100
tree 21c31bf2d3c7adaf0cf988e6cd35f5b706237751
parent 940973ae0b45c9b6817bab8e4cf4df99a9ef83d7
parent 8611224a7b21db8fa1b0d12fdd053443543dd708

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>

hw/ide/core.c

diff --git a/hw/ide/core.c b/hw/ide/core.c
index e1dfe54..c943a4d 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1602,7 +1602,7 @@
         case 2: /* extended self test */
             s->smart_selftest_count++;
             if (s->smart_selftest_count > 21) {
-                s->smart_selftest_count = 0;
+                s->smart_selftest_count = 1;
             }
             n = 2 + (s->smart_selftest_count - 1) * 24;
             s->smart_selftest_data[n] = s->sector;