From: Peter Maydell Date: Thu, 30 Jan 2014 13:56:00 +0000 (+0000) Subject: Merge remote-tracking branch 'mjt/tags/trivial-patches-2014-01-16' into staging X-Git-Tag: v2.7.1~2059 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0706f7c85b3c0783f92d44b551f362884db0f4bd;hp=-c;p=mirror_qemu.git 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 " # gpg: aka "Michael Tokarev " # gpg: aka "Michael Tokarev " # 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 --- 0706f7c85b3c0783f92d44b551f362884db0f4bd diff --combined hw/ide/core.c index 036cd4a6d1,7783d58291..e1dfe54df6 --- a/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");