diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-14 17:07:15 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-14 17:07:16 +0000 |
| commit | 682df581c65ed2c1b9e77093e332214ecaa1ee93 (patch) | |
| tree | 01fc6625a98800b3a800637b4189a17582246c47 /block | |
| parent | a77beb0fcbf419aa1e8e32b7df3609664f74c928 (diff) | |
| parent | 22381d4180fa71614ad195b54fe81e0ffb77b01e (diff) | |
| download | qemu-682df581c65ed2c1b9e77093e332214ecaa1ee93.zip qemu-682df581c65ed2c1b9e77093e332214ecaa1ee93.tar.gz qemu-682df581c65ed2c1b9e77093e332214ecaa1ee93.tar.bz2 | |
Merge remote-tracking branch 'jsnow/tags/ide-pull-request' into staging
# gpg: Signature made Mon 14 Nov 2016 04:16:48 PM GMT
# gpg: using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# 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
* jsnow/tags/ide-pull-request:
ahci-test: add QMP tray test for ATAPI
libqos/ahci: Add get_sense and test_ready
libqos/ahci: Add ATAPI tray macros
libqos/ahci: Support expected errors
libqtest: add qmp_eventwait_ref
block-backend: Always notify on blk_eject
ahci-test: test atapi read_cd with bcl, nb_sectors = 0
ahci-test: Create smaller test ISO images
atapi: classify read_cd as conditionally returning data
Message-id: 1479140746-22142-1-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 27a7f6f..efbf398 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1393,13 +1393,14 @@ void blk_eject(BlockBackend *blk, bool eject_flag) if (bs) { bdrv_eject(bs, eject_flag); - - id = blk_get_attached_dev_id(blk); - qapi_event_send_device_tray_moved(blk_name(blk), id, - eject_flag, &error_abort); - g_free(id); - } + + /* Whether or not we ejected on the backend, + * the frontend experienced a tray event. */ + id = blk_get_attached_dev_id(blk); + qapi_event_send_device_tray_moved(blk_name(blk), id, + eject_flag, &error_abort); + g_free(id); } int blk_get_flags(BlockBackend *blk) |