diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-10-31 15:57:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-31 15:57:30 +0000 |
| commit | b7c9a7f353c0e260519bf735ff0d4aa01e72784b (patch) | |
| tree | 31a17115c4c8d69c97cafae71a4455e1ec8981db /tests/Makefile.include | |
| parent | f3cad9c6dbd4b9877232c44bf2dd877353a73209 (diff) | |
| parent | dc237c45aee52f268369dc6a485c623f1232e1d3 (diff) | |
| download | qemu-b7c9a7f353c0e260519bf735ff0d4aa01e72784b.zip qemu-b7c9a7f353c0e260519bf735ff0d4aa01e72784b.tar.gz qemu-b7c9a7f353c0e260519bf735ff0d4aa01e72784b.tar.bz2 | |
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) <jsnow@redhat.com>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile.include')
| -rw-r--r-- | tests/Makefile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 7715d8c..56f73b4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -794,7 +794,7 @@ tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y) 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 \ |