Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

Pull request

# gpg: Signature made Thu 31 Oct 2019 15:55:44 GMT
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <[email protected]>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  hd-geo-test: Add tests for lchs override
  bootdevice: FW_CFG interface for LCHS values
  bootdevice: Refactor get_boot_devices_list
  bootdevice: Gather LCHS from all relevant devices
  scsi: Propagate unrealize() callback to scsi-hd
  bootdevice: Add interface to gather LCHS
  block: Support providing LCHS from user
  block: Refactor macros - fix tabbing
  IDE: deprecate ide-drive

Signed-off-by: Peter Maydell <[email protected]>

diff --combined tests/Makefile.include
index 7715d8cd63ad80395436cc743273e97ef96a5a88,728d802dbd036e9b6dbdbba10cdd91083e34e27a..56f73b46e2ae8dc55370d0adc18df13f8fa94af4
--- 1/tests/Makefile.include
--- 2/tests/Makefile.include
+++ b/tests/Makefile.include
@@@ -140,7 -140,7 +140,7 @@@ check-unit-y += tests/test-base64$(EXES
  check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT))) += tests/test-crypto-pbkdf$(EXESUF)
  check-unit-$(CONFIG_BLOCK) += tests/test-crypto-ivgen$(EXESUF)
  check-unit-$(CONFIG_BLOCK)  += tests/test-crypto-afsplit$(EXESUF)
 -check-unit-$(if $(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF)
 +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF)
  check-unit-$(CONFIG_BLOCK)  += tests/test-crypto-block$(EXESUF)
  check-unit-y += tests/test-logging$(EXESUF)
  check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_REPLICATION)) += tests/test-replication$(EXESUF)
@@@ -794,7 -794,7 +794,7 @@@ tests/ide-test$(EXESUF): tests/ide-test
  tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF)
  tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
  tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
- tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
+ tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o $(libqos-obj-y)
  tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
  tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y)
  tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \