From: Peter Maydell Date: Tue, 21 Feb 2017 13:58:50 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-21' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a1cf5fac2b929ffa2abd1285401f2535ff8c6fea;p=qemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-21' into staging Changes to -drive without if= and with if=scsi # gpg: Signature made Tue 21 Feb 2017 12:22:35 GMT # gpg: using RSA key 0x3870B400EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-block-2017-02-21: hw/i386: Deprecate -drive if=scsi with PC machine types hw: Deprecate -drive if=scsi with non-onboard HBAs hw/scsi: Concentrate -drive if=scsi auto-create in one place hw: Drop superfluous special checks for orphaned -drive blockdev: Make orphaned -drive fatal blockdev: Improve message for orphaned -drive hw/arm/highbank: Default -drive to if=ide instead of if=scsi hw: Default -drive to if=none instead of scsi when scsi cannot work hw: Default -drive to if=none instead of ide when ide cannot work hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus hw: Default -drive to if=ide explicitly where it works Signed-off-by: Peter Maydell --- a1cf5fac2b929ffa2abd1285401f2535ff8c6fea