Merge remote-tracking branch 'mjt/tags/trivial-patches-2014-01-16' into staging

trivial-patches for 2014-01-16

# gpg: Signature made Thu 16 Jan 2014 17:29:05 GMT using RSA key ID 74F0C838
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: E190 8639 3B10 B51B AC2C  8B73 5253 C5AD 74F0 C838

Message-id: 1389893719-16336-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined hw/ide/core.c
index 036cd4a6d14f6c503d5e9f182df66d11d9828426,7783d58291d5cff8a163218aae0a247d74b75c03..e1dfe54df62589c5322e698f4e178f9cf0b4ba28
--- 1/hw/ide/core.c
--- 2/hw/ide/core.c
+++ b/hw/ide/core.c
@@@ -1321,6 -1321,7 +1321,7 @@@ static bool cmd_exec_dev_diagnostic(IDE
          s->status = 0; /* ATAPI spec (v6) section 9.10 defines packet
                          * devices to return a clear status register
                          * with READY_STAT *not* set. */
+         s->error = 0x01;
      } else {
          s->status = READY_STAT | SEEK_STAT;
          /* The bits of the error register are not as usual for this command!
@@@ -2103,7 -2104,7 +2104,7 @@@ int ide_init_drive(IDEState *s, BlockDr
      s->smart_selftest_count = 0;
      if (kind == IDE_CD) {
          bdrv_set_dev_ops(bs, &ide_cd_block_ops, s);
 -        bdrv_set_buffer_alignment(bs, 2048);
 +        bdrv_set_guest_block_size(bs, 2048);
      } else {
          if (!bdrv_is_inserted(s->bs)) {
              error_report("Device needs media, but drive is empty");